feat: also collapse channel messages

NekoX-Dev · Apr 4, 2023 · d00e4ef · d00e4ef
1 parent cb64720
commit d00e4ef
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -28849,9 +28849,9 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                             } else if (currentChat != null) {
                                 long fromId = nextMessage.getFromChatId();
                                 pinnedBottom = fromId == message.getFromChatId();
-                                if (!pinnedBottomByGroup && pinnedBottom && fromId < 0 && currentChat.megagroup) {
-                                    pinnedBottom = false;
-                                }
+//                                if (!pinnedBottomByGroup && pinnedBottom && fromId < 0 && currentChat.megagroup) {
+//                                    pinnedBottom = false;
+//                                }
                             } else if (UserObject.isUserSelf(currentUser) || UserObject.isReplyUser(currentUser)) {
                                 if (message.isPrivateForward() || nextMessage.isPrivateForward()) {
                                     pinnedBottom = false;
@@ -28884,9 +28884,9 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                             } else if (currentChat != null) {
                                 long fromId = prevMessage.getFromChatId();
                                 pinnedTop = fromId == message.getFromChatId() && !message.isImportedForward() && !prevMessage.isImportedForward();
-                                if (!pinnedTopByGroup && pinnedTop && fromId < 0 && currentChat.megagroup) {
-                                    pinnedTop = false;
-                                }
+//                                if (!pinnedTopByGroup && pinnedTop && fromId < 0 && currentChat.megagroup) {
+//                                    pinnedTop = false;
+//                                }
                             } else if (UserObject.isUserSelf(currentUser) || UserObject.isReplyUser(currentUser)) {
                                 if (message.isPrivateForward() || prevMessage.isPrivateForward()) {
                                     pinnedTop = false;
@@ -28896,14 +28896,14 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                             }
                         }
                     }
-                    if (ChatObject.isChannel(currentChat) && currentChat.megagroup && message.getFromChatId() <= 0 && message.messageOwner.fwd_from != null && message.messageOwner.fwd_from.saved_from_peer instanceof TLRPC.TL_peerChannel) {
-                        if (!pinnedTopByGroup) {
-                            pinnedTop = false;
-                        }
-                        if (!pinnedBottomByGroup) {
-                            pinnedBottom = false;
-                        }
-                    }
+//                    if (ChatObject.isChannel(currentChat) && currentChat.megagroup && message.getFromChatId() <= 0 && message.messageOwner.fwd_from != null && message.messageOwner.fwd_from.saved_from_peer instanceof TLRPC.TL_peerChannel) {
+//                        if (!pinnedTopByGroup) {
+//                            pinnedTop = false;
+//                        }
+//                        if (!pinnedBottomByGroup) {
+//                            pinnedBottom = false;
+//                        }
+//                    }
 
                     message.updateTranslation(false);
                     if (groupedMessages != null) {