File tree Expand file tree Collapse file tree
TMessagesProj/src/main/java/org/telegram/ui Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -34643,7 +34643,7 @@ public boolean onBackPressed(boolean invoked) {
3464334643 } else if (actionBar != null && actionBar.isActionModeShowed()) {
3464434644 if (invoked) clearSelectionMode();
3464534645 return false;
34646- } else if (chatActivityEnterView != null && chatActivityEnterView.isPopupShowing ()) {
34646+ } else if (chatActivityEnterView != null && chatActivityEnterView.canHidePopupByBackButton ()) {
3464734647 if (invoked) chatActivityEnterView.hidePopup(true);
3464834648 return false;
3464934649// } else if (chatActivityEnterView != null && chatActivityEnterView.hasBotWebView() && chatActivityEnterView.botCommandsMenuIsShowing() && chatActivityEnterView.onBotWebViewBackPressed()) {
Original file line number Diff line number Diff line change @@ -13141,6 +13141,13 @@ public boolean isPopupShowing() {
1314113141 return emojiViewVisible || botKeyboardViewVisible;
1314213142 }
1314313143
13144+ public boolean canHidePopupByBackButton() {
13145+ if (!isPopupShowing()) {
13146+ return false;
13147+ }
13148+ return !(currentPopupContentType == POPUP_CONTENT_BOT_KEYBOARD && botReplyMarkup != null && botReplyMarkup.is_persistent && botButtonsMessageObject != null);
13149+ }
13150+
1314413151 public boolean closeCreationLinkDialog(boolean invoked) {
1314513152 return messageEditText != null && messageEditText.closeCreationLinkDialog(invoked);
1314613153 }
You can’t perform that action at this time.
0 commit comments