Update to 7.4.2 (2226)

TMessagesProj/build.gradle

@@ -290,7 +290,7 @@ android {
         }
     }
 
-    defaultConfig.versionCode = 2225
+    defaultConfig.versionCode = 2226
 
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
@@ -309,7 +309,7 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 29
-        versionName "7.4.1"
+        versionName "7.4.2"
 
         vectorDrawables.generatedDensities = ['mdpi', 'hdpi', 'xhdpi', 'xxhdpi']
 

TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java

@@ -66,10 +66,6 @@
 import android.text.method.LinkMovementMethod;
 import android.text.style.URLSpan;
 import android.text.util.Linkify;
-import android.transition.ChangeBounds;
-import android.transition.TransitionSet;
-import android.transition.TransitionValues;
-import android.transition.Visibility;
 import android.util.DisplayMetrics;
 import android.util.StateSet;
 import android.util.TypedValue;
@@ -112,14 +108,12 @@
 import org.telegram.tgnet.TLObject;
 import org.telegram.tgnet.TLRPC;
 import org.telegram.ui.ActionBar.ActionBarLayout;
-import org.telegram.ui.ActionBar.ActionBarMenuItem;
 import org.telegram.ui.ActionBar.AlertDialog;
 import org.telegram.ui.ActionBar.BaseFragment;
 import org.telegram.ui.ActionBar.BottomSheet;
 import org.telegram.ui.ActionBar.Theme;
 import org.telegram.ui.Cells.TextDetailSettingsCell;
 import org.telegram.ui.Components.BackgroundGradientDrawable;
-import org.telegram.ui.Components.CubicBezierInterpolator;
 import org.telegram.ui.Components.ForegroundColorSpanThemable;
 import org.telegram.ui.Components.ForegroundDetector;
 import org.telegram.ui.Components.LayoutHelper;
@@ -2196,10 +2190,8 @@ public static void startAppCenter(Activity context) {
             if (BuildVars.DEBUG_VERSION) {
                 Distribute.setEnabledForDebuggableBuild(true);
                 AppCenter.start(context.getApplication(), BuildVars.DEBUG_VERSION ? BuildVars.APPCENTER_HASH_DEBUG : BuildVars.APPCENTER_HASH, Distribute.class, Crashes.class);
-            } else {
-                AppCenter.start(context.getApplication(), BuildVars.DEBUG_VERSION ? BuildVars.APPCENTER_HASH_DEBUG : BuildVars.APPCENTER_HASH, Crashes.class);
+                AppCenter.setUserId("uid=" + UserConfig.getInstance(UserConfig.selectedAccount).clientUserId);
             }
-            AppCenter.setUserId("uid=" + UserConfig.getInstance(UserConfig.selectedAccount).clientUserId);
         } catch (Throwable e) {
             FileLog.e(e);
         }

TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java

@@ -18,7 +18,7 @@ public class BuildVars {
     public static boolean LOGS_ENABLED = false;
     public static boolean USE_CLOUD_STRINGS = true;
     public static boolean CHECK_UPDATES = true;
-    public static int BUILD_VERSION = 2225;
+    public static int BUILD_VERSION = 2226;
     public static String BUILD_VERSION_STRING = "7.4.0";
     public static int APP_ID = 4;
     public static String APP_HASH = "014b35b6184100b085b0d0572f9b5103";

TMessagesProj/src/main/java/org/telegram/messenger/ChatObject.java

@@ -436,10 +436,16 @@ public void processParticipantsUpdate(TLRPC.TL_updateGroupCallParticipants updat
                         invitedUsers.remove(id);
                     }
                     if (oldParticipant != null) {
-                        oldParticipant.flags = participant.flags;
                         oldParticipant.muted = participant.muted;
                         oldParticipant.muted_by_you = participant.muted_by_you;
-                        oldParticipant.volume = participant.volume;
+                        if (!participant.min) {
+                            oldParticipant.volume = participant.volume;
+                        } else {
+                            if ((participant.flags & 128) != 0 && (oldParticipant.flags & 128) == 0) {
+                                participant.flags &=~ 128;
+                            }
+                        }
+                        oldParticipant.flags = participant.flags;
                         oldParticipant.can_self_unmute = participant.can_self_unmute;
                         oldParticipant.date = participant.date;
                         oldParticipant.lastTypingDate = Math.max(oldParticipant.active_date, participant.active_date);

TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java

@@ -3031,7 +3031,7 @@ public void onStateChanged(boolean playWhenReady, int playbackState) {
                             } else {
                                 cleanupPlayer(true, true, messageObject != null && messageObject.isVoice(), false);
                             }
-                        } else if (seekToProgressPending != 0 && (playbackState == ExoPlayer.STATE_READY || playbackState == ExoPlayer.STATE_IDLE)) {
+                        } else if (audioPlayer != null && seekToProgressPending != 0 && (playbackState == ExoPlayer.STATE_READY || playbackState == ExoPlayer.STATE_IDLE)) {
                             int seekTo = (int) (audioPlayer.getDuration() * seekToProgressPending);
                             audioPlayer.seekTo(seekTo);
                             lastProgress = seekTo;

TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java

@@ -1423,6 +1423,9 @@ public void loadStickersByEmojiOrName(String name, boolean isEmoji, boolean cach
                 req.stickerset = inputStickerSetShortName;
             }
             getConnectionsManager().sendRequest(req, (response, error) -> AndroidUtilities.runOnUIThread(() -> {
+                if (BuildConfig.DEBUG && error != null) { //supress test backend warning
+                    return;
+                }
                 if (response instanceof TLRPC.TL_messages_stickerSet) {
                     processLoadedDiceStickers(name, isEmoji, (TLRPC.TL_messages_stickerSet) response, false, (int) (System.currentTimeMillis() / 1000));
                 } else {

TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java

@@ -12418,7 +12418,8 @@ public boolean processUpdateArray(ArrayList<TLRPC.Update> updates, final ArrayLi
                                 }
                                 if ((update.notify_settings.flags & 4) != 0) {
                                     editor.putInt("EnableGroup2", update.notify_settings.mute_until);
-                                    getNotificationsController().deleteNotificationChannelGlobal(NotificationsController.TYPE_GROUP);
+                                    editor.putBoolean("overwrite_group", true);
+                                    AndroidUtilities.runOnUIThread(() -> getNotificationsController().deleteNotificationChannelGlobal(NotificationsController.TYPE_GROUP));
                                 }
                             } else if (update.peer instanceof TLRPC.TL_notifyUsers) {
                                 if ((update.notify_settings.flags & 1) != 0) {
@@ -12433,7 +12434,8 @@ public boolean processUpdateArray(ArrayList<TLRPC.Update> updates, final ArrayLi
                                 }
                                 if ((update.notify_settings.flags & 4) != 0) {
                                     editor.putInt("EnableAll2", update.notify_settings.mute_until);
-                                    getNotificationsController().deleteNotificationChannelGlobal(NotificationsController.TYPE_PRIVATE);
+                                    editor.putBoolean("overwrite_private", true);
+                                    AndroidUtilities.runOnUIThread(() -> getNotificationsController().deleteNotificationChannelGlobal(NotificationsController.TYPE_PRIVATE));
                                 }
                             } else if (update.peer instanceof TLRPC.TL_notifyBroadcasts) {
                                 if ((update.notify_settings.flags & 1) != 0) {
@@ -12448,7 +12450,8 @@ public boolean processUpdateArray(ArrayList<TLRPC.Update> updates, final ArrayLi
                                 }
                                 if ((update.notify_settings.flags & 4) != 0) {
                                     editor.putInt("EnableChannel2", update.notify_settings.mute_until);
-                                    getNotificationsController().deleteNotificationChannelGlobal(NotificationsController.TYPE_CHANNEL);
+                                    editor.putBoolean("overwrite_channel", true);
+                                    AndroidUtilities.runOnUIThread(() -> getNotificationsController().deleteNotificationChannelGlobal(NotificationsController.TYPE_CHANNEL));
                                 }
                             }
                             getMessagesStorage().updateMutedDialogsFiltersCounters();

TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java

@@ -285,7 +285,14 @@ public void cleanup() {
                         NotificationChannel channel = list.get(a);
                         String id = channel.getId();
                         if (id.startsWith(keyStart)) {
-                            systemNotificationManager.deleteNotificationChannel(id);
+                            try {
+                                systemNotificationManager.deleteNotificationChannel(id);
+                            } catch (Exception e) {
+                                FileLog.e(e);
+                            }
+                            if (BuildVars.LOGS_ENABLED) {
+                                FileLog.d("delete channel cleanup " + id);
+                            }
                         }
                     }
                 } catch (Throwable e) {
@@ -2575,15 +2582,29 @@ private void deleteNotificationChannelInternal(long dialogId, int what) {
                 String channelId = preferences.getString(key, null);
                 if (channelId != null) {
                     editor.remove(key).remove(key + "_s");
-                    systemNotificationManager.deleteNotificationChannel(channelId);
+                    try {
+                        systemNotificationManager.deleteNotificationChannel(channelId);
+                    } catch (Exception e) {
+                        FileLog.e(e);
+                    }
+                    if (BuildVars.LOGS_ENABLED) {
+                        FileLog.d("delete channel internal " + channelId);
+                    }
                 }
             }
             if (what == 1 || what == -1) {
                 String key = "org.telegram.keyia" + dialogId;
                 String channelId = preferences.getString(key, null);
                 if (channelId != null) {
                     editor.remove(key).remove(key + "_s");
-                    systemNotificationManager.deleteNotificationChannel(channelId);
+                    try {
+                        systemNotificationManager.deleteNotificationChannel(channelId);
+                    } catch (Exception e) {
+                        FileLog.e(e);
+                    }
+                    if (BuildVars.LOGS_ENABLED) {
+                        FileLog.d("delete channel internal " + channelId);
+                    }
                 }
             }
             editor.commit();
@@ -2622,7 +2643,14 @@ public void deleteNotificationChannelGlobalInternal(int type, int what) {
                 String channelId = preferences.getString(key, null);
                 if (channelId != null) {
                     editor.remove(key).remove(key + "_s");
-                    systemNotificationManager.deleteNotificationChannel(channelId);
+                    try {
+                        systemNotificationManager.deleteNotificationChannel(channelId);
+                    } catch (Exception e) {
+                        FileLog.e(e);
+                    }
+                    if (BuildVars.LOGS_ENABLED) {
+                        FileLog.d("delete channel global internal " + channelId);
+                    }
                 }
             }
 
@@ -2638,9 +2666,25 @@ public void deleteNotificationChannelGlobalInternal(int type, int what) {
                 String channelId = preferences.getString(key, null);
                 if (channelId != null) {
                     editor.remove(key).remove(key + "_s");
-                    systemNotificationManager.deleteNotificationChannel(channelId);
+                    try {
+                        systemNotificationManager.deleteNotificationChannel(channelId);
+                    } catch (Exception e) {
+                        FileLog.e(e);
+                    }
+                    if (BuildVars.LOGS_ENABLED) {
+                        FileLog.d("delete channel global internal " + channelId);
+                    }
                 }
             }
+            String overwriteKey;
+            if (type == TYPE_CHANNEL) {
+                overwriteKey = "overwrite_channel";
+            } else if (type == TYPE_GROUP) {
+                overwriteKey = "overwrite_group";
+            } else {
+                overwriteKey = "overwrite_private";
+            }
+            editor.remove(overwriteKey);
             editor.commit();
         } catch (Exception e) {
             FileLog.e(e);
@@ -2667,7 +2711,11 @@ public void deleteAllNotificationChannels() {
                     String key = entry.getKey();
                     if (key.startsWith("org.telegram.key")) {
                         if (!key.endsWith("_s")) {
-                            systemNotificationManager.deleteNotificationChannel((String) entry.getValue());
+                            String id = (String) entry.getValue();
+                            systemNotificationManager.deleteNotificationChannel(id);
+                            if (BuildVars.LOGS_ENABLED) {
+                                FileLog.d("delete all channel " + id);
+                            }
                         }
                         editor.remove(key);
                     }
@@ -2824,19 +2872,25 @@ private String validateChannelId(long dialogId, String name, long[] vibrationPat
 
         String key;
         String groupId;
+        String overwriteKey;
         if (isSilent) {
             groupId = "other" + currentAccount;
+            overwriteKey = null;
         } else {
             if (type == TYPE_CHANNEL) {
                 groupId = "channels" + currentAccount;
+                overwriteKey = "overwrite_channel";
             } else if (type == TYPE_GROUP) {
                 groupId = "groups" + currentAccount;
+                overwriteKey = "overwrite_group";
             } else {
                 groupId = "private" + currentAccount;
+                overwriteKey = "overwrite_private";
             }
         }
 
         boolean secretChat = !isDefault && (int) dialogId == 0;
+        boolean shouldOverwrite = !isInApp && overwriteKey != null && preferences.getBoolean(overwriteKey, false);
 
         if (isSilent) {
             name = LocaleController.getString("NotificationsSilent", R.string.NotificationsSilent);
@@ -2864,8 +2918,11 @@ private String validateChannelId(long dialogId, String name, long[] vibrationPat
 
         if (channelId != null) {
             NotificationChannel existingChannel = systemNotificationManager.getNotificationChannel(channelId);
+            if (BuildVars.LOGS_ENABLED) {
+                FileLog.d("current channel for " + channelId + " = " + existingChannel);
+            }
             if (existingChannel != null) {
-                if (!isSilent) {
+                if (!isSilent && !shouldOverwrite) {
                     int channelImportance = existingChannel.getImportance();
                     Uri channelSound = existingChannel.getSound();
                     long[] channelVibrationPattern = existingChannel.getVibrationPattern();
@@ -2887,6 +2944,9 @@ private String validateChannelId(long dialogId, String name, long[] vibrationPat
                     if (!isDefault && secretChat) {
                         newSettings.append("secret");
                     }
+                    if (BuildVars.LOGS_ENABLED) {
+                        FileLog.d("current channel settings for " + channelId + " = " + newSettings + " old = " + settings);
+                    }
                     newSettingsHash = Utilities.MD5(newSettings.toString());
                     newSettings.setLength(0);
                     if (!newSettingsHash.equals(settings)) {
@@ -3047,7 +3107,10 @@ private String validateChannelId(long dialogId, String name, long[] vibrationPat
 
         if (edited && newSettingsHash != null) {
             preferences.edit().putString(key, channelId).putString(key + "_s", newSettingsHash).commit();
-        } else if (newSettingsHash == null || !isInApp || !isDefault) {
+            if (BuildVars.LOGS_ENABLED) {
+                FileLog.d("change edited channel " + channelId);
+            }
+        } else if (shouldOverwrite || newSettingsHash == null || !isInApp || !isDefault) {
             for (int a = 0; a < vibrationPattern.length; a++) {
                 newSettings.append(vibrationPattern[a]);
             }
@@ -3061,8 +3124,15 @@ private String validateChannelId(long dialogId, String name, long[] vibrationPat
             }
             newSettingsHash = Utilities.MD5(newSettings.toString());
 
-            if (!isSilent && channelId != null && !settings.equals(newSettingsHash)) {
-                systemNotificationManager.deleteNotificationChannel(channelId);
+            if (!isSilent && channelId != null && (shouldOverwrite || !settings.equals(newSettingsHash))) {
+                try {
+                    systemNotificationManager.deleteNotificationChannel(channelId);
+                } catch (Exception e) {
+                    FileLog.e(e);
+                }
+                if (BuildVars.LOGS_ENABLED) {
+                    FileLog.d("delete channel by settings change " + channelId);
+                }
                 channelId = null;
             }
         }
@@ -3096,6 +3166,9 @@ private String validateChannelId(long dialogId, String name, long[] vibrationPat
             } else {
                 notificationChannel.setSound(null, builder.build());
             }
+            if (BuildVars.LOGS_ENABLED) {
+                FileLog.d("create new channel " + channelId);
+            }
             systemNotificationManager.createNotificationChannel(notificationChannel);
             preferences.edit().putString(key, channelId).putString(key + "_s", newSettingsHash).commit();
         }