Merge remote-tracking branch 'upstream/dev' into dev

LiuYi0526 · Oct 26, 2024 · 41d8c62 · 41d8c62
2 parents 7e19e70 + ab96a81
commit 41d8c62
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
@@ -3737,7 +3737,7 @@ private void createSenderSelectView() {
                     if (chatFull != null) {
 
                         var chat = controller.getChat(chatFull.id);
-                        if (chat != null && chat.creator) {
+                        if (chat != null && ChatObject.isMegagroup(chat) && chat.creator) {
                             var self = UserConfig.getInstance(currentAccount).getCurrentUser();
 
                             if (peer.channel_id == chat.id) {

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/DeleteMessagesBottomSheet.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/DeleteMessagesBottomSheet.java
@@ -253,13 +253,9 @@ void forEach(Utilities.IndexedConsumer<TLObject> action) {
             }
         }
 
-        boolean checkOption(TLObject object) {
-            for (int i = 0; i < totalCount; i++) {
-                if (object == options.get(i)) {
-                    return checks[i] && (filter == null || filter[i]);
-                }
-            }
-            return false;
+        boolean checkOption(int i) {
+            if (i > totalCount) return false;
+            return checks[i] && (filter == null || filter[i]);
         }
     }
 
@@ -1009,8 +1005,8 @@ private void performDelete() {
 
         applyInCommonGroup.forEachSelected((participant, i) -> {
             if (participant instanceof TLRPC.User) {
-                boolean needBan = banOrRestrict.checkOption(participant);
-                boolean needDelete = banOrRestrict.checkOption(participant);
+                boolean needBan = banOrRestrict.checkOption(i);
+                boolean needDelete = deleteAll.checkOption(i);
                 if (!needBan && !needDelete) {
                     return;
                 }
@@ -1034,9 +1030,9 @@ private void performDelete() {
                         if (canBan && needBan) {
                             if (restrict) {
                                 TLRPC.TL_chatBannedRights rights = bannedRightsOr(bannedRights, participantsBannedRights.get(i));
-                                MessagesController.getInstance(currentAccount).setParticipantBannedRole(chat_.id, (TLRPC.User) participant, null, rights, false, getBaseFragment());
+                                MessagesController.getInstance(currentAccount).setParticipantBannedRole(chat_.id, userFinal, null, rights, false, getBaseFragment());
                             } else {
-                                MessagesController.getInstance(currentAccount).deleteParticipantFromChat(chat_.id, (TLRPC.User) participant, null, false, false);
+                                MessagesController.getInstance(currentAccount).deleteParticipantFromChat(chat_.id, userFinal, null, false, false);
                             }
                         }
                         if (canDelete && needDelete) {

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SenderSelectPopup.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SenderSelectPopup.java
@@ -148,7 +148,7 @@ protected int getSuggestedMinimumWidth() {
 
         if (NaConfig.INSTANCE.getQuickToggleAnonymous().Bool()) {
             var chat = messagesController.getChat(chatFull.id);
-            if (chat != null && chat.creator) {
+            if (chat != null && ChatObject.isMegagroup(chat) && chat.creator) {
                 if (peers.stream().noneMatch(peer -> peer.peer.channel_id == chat.id)) {
                     peers.add(peers.size() >= 1 ? 1 : 0, new TLRPC.TL_sendAsPeer() {{
                         peer = new TLRPC.TL_peerChannel() {{ channel_id = chat.id; }};

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
@@ -1482,7 +1482,7 @@ public SharedMediaLayout(Context context, long did, SharedMediaPreloader preload
             this.initialTab = TAB_BOT_PREVIEWS;
         } else if (userInfo != null && userInfo.bot_info != null && userInfo.bot_info.has_preview_medias) {
             this.initialTab = TAB_STORIES;
-        } else if (NaConfig.INSTANCE.getDisableStories().Bool() && (userInfo != null && userInfo.stories_pinned_available || chatInfo != null && chatInfo.stories_pinned_available || isStoriesView())) {
+        } else if (!NaConfig.INSTANCE.getDisableStories().Bool() && (userInfo != null && userInfo.stories_pinned_available || chatInfo != null && chatInfo.stories_pinned_available || isStoriesView())) {
             this.initialTab = getInitialTab();
         } else if (userInfo != null && userInfo.stargifts_count > 0) {
             this.initialTab = TAB_GIFTS;

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
@@ -9319,10 +9319,10 @@ private void updateRowsIds() {
                     setAvatarSectionRow = rowCount++;
                 }
                 numberSectionRow = rowCount++;
-                setUsernameRow = rowCount++;
                 if (!hideNumber) {
                     numberRow = rowCount++;
                 }
+                setUsernameRow = rowCount++;
                 bioRow = rowCount++;
 
                 settingsSectionRow = rowCount++;