From b6038366fbc56f71d80937cde4f9d499f0e92b93 Mon Sep 17 00:00:00 2001 From: xtaodada Date: Mon, 28 Aug 2023 15:03:05 +0800 Subject: [PATCH] fix: import sticker list --- .../src/main/java/org/telegram/ui/ChatActivity.java | 2 +- .../src/main/java/org/telegram/ui/StickersActivity.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index da8a555d83..806ace444e 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -26053,7 +26053,7 @@ public void dismiss(boolean animated) { if (item != null) { item.setVisibility(View.VISIBLE); } - if (chatMode != MODE_SCHEDULED && NaConfig.INSTANCE.getShowNoQuoteForward().Bool()) + if (chatMode != MODE_SCHEDULED && actionModeOtherItem != null && NaConfig.INSTANCE.getShowNoQuoteForward().Bool()) actionModeOtherItem.showSubItem(nkbtn_forward_noquote); item = actionMode.getItem(delete); if (item != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java index d517469057..e546748018 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/StickersActivity.java @@ -630,7 +630,10 @@ public void processStickersFile(File file, boolean exitOnFail) { } - AlertDialog pro = new AlertDialog(getParentActivity(), 1); + AlertDialog pro = new AlertDialog(getParentActivity(), AlertDialog.ALERT_TYPE_MESSAGE); + pro.setMessage(LocaleController.getString("Loading", R.string.Loading)); + pro.setCanceledOnTouchOutside(true); + pro.setCancelable(true); pro.show(); UIUtil.runOnIoDispatcher(() -> {