Merge pull request #2185 from dallo28/fix/persistent-bot-keyboard-back

Fix system Back being ignored when a bot keyboard is persistent

Author: Arseny271

TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java

@@ -34770,7 +34770,7 @@ public boolean onBackPressed(boolean invoked) {
         } else if (actionBar != null && actionBar.isActionModeShowed()) {
             if (invoked) clearSelectionMode();
             return false;
-        } else if (chatActivityEnterView != null && chatActivityEnterView.isPopupShowing()) {
+        } else if (chatActivityEnterView != null && chatActivityEnterView.canHidePopupByBackButton()) {
             if (invoked) chatActivityEnterView.hidePopup(true);
             return false;
 //        } else if (chatActivityEnterView != null && chatActivityEnterView.hasBotWebView() && chatActivityEnterView.botCommandsMenuIsShowing() && chatActivityEnterView.onBotWebViewBackPressed()) {

TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java

@@ -13141,6 +13141,13 @@ public boolean isPopupShowing() {
         return emojiViewVisible || botKeyboardViewVisible;
     }
 
+    public boolean canHidePopupByBackButton() {
+        if (!isPopupShowing()) {
+            return false;
+        }
+        return !(currentPopupContentType == POPUP_CONTENT_BOT_KEYBOARD && botReplyMarkup != null && botReplyMarkup.is_persistent && botButtonsMessageObject != null);
+    }
+
     public boolean closeCreationLinkDialog(boolean invoked) {
         return messageEditText != null && messageEditText.closeCreationLinkDialog(invoked);
     }