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

LiuYi0526 · Nov 12, 2024 · be21779 · be21779
2 parents d701188 + 66dcb86
commit be21779
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java
@@ -419,9 +419,7 @@ public void startDocumentSelectActivity() {
 
         shareMenuItem = actionMode.addItemWithWidth(MENU_SHARE, R.drawable.msg_share, AndroidUtilities.dp(54));
         exportMenuItem = actionMode.addItemWithWidth(MENU_EXPORT, R.drawable.msg_download, AndroidUtilities.dp(54));
-        if (currentType != MediaDataController.TYPE_EMOJIPACKS) {
-            archiveMenuItem = actionMode.addItemWithWidth(MENU_ARCHIVE, R.drawable.msg_archive, AndroidUtilities.dp(54));
-        }
+        archiveMenuItem = actionMode.addItemWithWidth(MENU_ARCHIVE, R.drawable.msg_archive, AndroidUtilities.dp(54));
         deleteMenuItem = actionMode.addItemWithWidth(MENU_DELETE, R.drawable.msg_delete, AndroidUtilities.dp(54));
 
         ArrayList<TLRPC.TL_messages_stickerSet> sets;
@@ -923,7 +921,7 @@ public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
 
         if (currentType == MediaDataController.TYPE_IMAGE) {
             featuredRow = rowCount++;
-            masksRow = -1;
+            masksRow = rowCount++;
             if (mediaDataController.getArchivedStickersCount(currentType) != 0) {
                 boolean inserted = archivedRow == -1;
                 archivedRow = rowCount++;