Merge branch 'master' into msglst

Author: CoBC

ChangeLog.txt

@@ -13,6 +13,7 @@ Default Qt Client
 - Option to choose bitween text or emoji for user and channel info in channel list
 - Last login time shown in "User Accounts" dialog
 - Ability to sort by "Last Login Time" in "User Accounts" dialog
+- Ability to send toast notifications on Linux and Windows
 - Chat history replaced by list
 - WebRTC updated from r4332 to r6818
 - Qt updated to 6.9.0beta3 on macOS and Windows
@@ -21,6 +22,8 @@ Default Qt Client
 - Fixed language not set at first start
 - Fixed OPUS DTX mode sending too big packets when variable bitrate mode (VBR) was disabled
 Android Client
+- Broadcast messages are now shown in the chat tab
+- Added the ability to send broadcast messages
 - Redesigned server list dialog to remove the old remove server button and make it to use popup menus, results in a more clear and modern dialog, and fast navigating for screenreader users
 - IP Address and status message is now shown in User Properties dialog
 - Ability to select/deselect user for move to other channel

Client/TeamTalkAndroid/src/main/java/dk/bearware/backend/TeamTalkService.java

@@ -1065,6 +1065,10 @@ public void onCmdUserTextMessage(TextMessage textmessage) {
                 getUserTextMsgs(textmessage.nFromUserID).add(newmsg);
                 break;
             }
+            case TextMsgType.MSGTYPE_BROADCAST : {
+                getChatLogTextMsgs().add(newmsg);
+                break;
+            }
             case TextMsgType.MSGTYPE_CHANNEL : {
                 getChatLogTextMsgs().add(newmsg);
                 break;

Client/TeamTalkAndroid/src/main/java/dk/bearware/data/TextMessageAdapter.java

@@ -149,6 +149,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         switch(txtmsg.nMsgType) {
             case TextMsgType.MSGTYPE_CHANNEL :
+            case TextMsgType.MSGTYPE_BROADCAST :
             case TextMsgType.MSGTYPE_USER : {
                 if(convertView == null ||
                    convertView.findViewById(R.id.item_textmsg) == null)

Client/TeamTalkAndroid/src/main/java/dk/bearware/gui/MainActivity.java

@@ -297,18 +297,21 @@ public boolean onPrepareOptionsMenu(Menu menu) {
         }
 
         boolean uploadRight = (myuseraccount.uUserRights & UserRight.USERRIGHT_UPLOAD_FILES) != UserRight.USERRIGHT_NONE;
+        boolean broadcastRight = (myuseraccount.uUserRights & UserRight.USERRIGHT_TEXTMESSAGE_BROADCAST) != UserRight.USERRIGHT_NONE;
         boolean isEditable = curchannel != null;
         boolean isJoinable = (ttclient != null) && (curchannel != null) && (ttclient.getMyChannelID() != curchannel.nChannelID) && (curchannel.nMaxUsers > 0);
         boolean isMyChannel = (ttclient != null) && (curchannel != null) && (ttclient.getMyChannelID() == curchannel.nChannelID);
         menu.findItem(R.id.action_edit).setEnabled(isEditable).setVisible(isEditable);
         menu.findItem(R.id.action_join).setEnabled(isJoinable).setVisible(isJoinable);
         menu.findItem(R.id.action_upload).setEnabled(uploadRight).setVisible(uploadRight);
+        menu.findItem(R.id.action_broadcast).setEnabled(broadcastRight).setVisible(broadcastRight);
         menu.findItem(R.id.action_stream).setEnabled(isMyChannel).setVisible(isMyChannel);
         return super.onPrepareOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        AlertDialog.Builder alert = new AlertDialog.Builder(this);
         switch(item.getItemId()) {
             case R.id.action_join : {
                 if (curchannel != null)
@@ -323,6 +326,16 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 }
             }
             break;
+            case R.id.action_broadcast:
+                alert.setTitle(R.string.action_broadcast);
+                alert.setMessage(R.string.text_broadcast_message);
+                final EditText input = new EditText(this);
+                input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+                alert.setPositiveButton(android.R.string.yes, (dialog, whichButton) -> ttclient.doTextMessage(new TextMessage() {{ nMsgType = TextMsgType.MSGTYPE_BROADCAST; szMessage = input.getText().toString(); }}));
+                alert.setNegativeButton(android.R.string.no, null);
+                alert.setView(input);
+                alert.show();
+                break;
             case R.id.action_stream : {
                 int flags = ttclient.getFlags();
                 if ((flags & ClientFlag.CLIENT_STREAM_AUDIO) == ClientFlag.CLIENT_STREAM_AUDIO || (flags & ClientFlag.CLIENT_STREAM_VIDEO) == ClientFlag.CLIENT_STREAM_VIDEO) {
@@ -369,7 +382,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     channelsAdapter.notifyDataSetChanged();
                 }
                 else if (filesAdapter.getActiveTransfersCount() > 0) {
-                    AlertDialog.Builder alert = new AlertDialog.Builder(this);
                     alert.setMessage(R.string.disconnect_alert);
                     alert.setPositiveButton(android.R.string.ok, (dialog, whichButton) -> {
                         filesAdapter.cancelAllTransfers();
@@ -2171,6 +2183,7 @@ else if (textmessage.nFromUserID == ttservice.getTTInstance().getMyUserID()) {
                 String name = Utils.getDisplayName(getBaseContext(), sender);
                 ttsWrapper.speak(getString(R.string.text_tts_broadcast_message, (sender != null) ? name : "", textmessage.szMessage));
             }
+            Log.d(TAG, "Broadcast message in " + this.hashCode());
             break;
         case TextMsgType.MSGTYPE_USER :
             if (sounds.get(SOUND_USERMSG) != 0)

Client/TeamTalkAndroid/src/main/res/menu/main.xml

@@ -16,6 +16,10 @@
         android:id="@+id/action_upload"
         app:showAsAction="ifRoom|withText"
         android:title="@string/action_upload"/>
+    <item
+        android:id="@+id/action_broadcast"
+        app:showAsAction="ifRoom|withText"
+        android:title="@string/action_broadcast"/>
     <item
         android:id="@+id/action_stream"
         app:showAsAction="ifRoom|withText"

Client/TeamTalkAndroid/src/main/res/values-fr/strings.xml

@@ -395,5 +395,7 @@
     <string name="text_operator_password">Entrer le mot de passe de l\'opérateur du canal</string>
     <string name="action_editsrv">Éditer le serveur</string>
     <string name="action_removesrv">Supprimer le serveur</string>
+    <string name="action_broadcast">Message Diffusé</string>
+    <string name="text_broadcast_message">Entrer le message à diffuser</string>
 
 </resources>

Client/TeamTalkAndroid/src/main/res/values/strings.xml

@@ -150,6 +150,7 @@
     <string name="action_editsrv">Edit server</string>
     <string name="action_removesrv">Remove server</string>
     <string name="action_upload">Upload File</string>
+    <string name="action_broadcast">Broadcast Message</string>
     <string name="action_stream">Stream a media file</string>
     <string name="button_select_media_file">Browse</string>
     <string name="button_stream_media_file">Stream</string>
@@ -406,6 +407,7 @@
     <string name="action_make_operator">Grant Operator</string>
     <string name="action_revoke_operator">Revoke Operator</string>
     <string name="text_operator_password">Enter channel operator password</string>
+    <string name="text_broadcast_message">Enter broadcast message</string>
 
 
 </resources>