Further fixing emoji picker

(cherry picked from commit fce250676b)

git/release/output-metadata.json

@@ -4,7 +4,7 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "de.monocles.chat.beta",
+  "applicationId": "de.monocles.chat",
   "variantName": "gitRelease",
   "elements": [
     {
@@ -41,19 +41,6 @@
       "versionName": "1.7.8.5",
       "outputFile": "monocles chat-1.7.8.5-git-x86_64-release.apk"
     },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "arm64-v8a"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 15604,
-      "versionName": "1.7.8.5",
-      "outputFile": "monocles chat-1.7.8.5-git-arm64-v8a-release.apk"
-    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -66,6 +53,19 @@
       "versionCode": 15601,
       "versionName": "1.7.8.5",
       "outputFile": "monocles chat-1.7.8.5-git-armeabi-v7a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "arm64-v8a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 15604,
+      "versionName": "1.7.8.5",
+      "outputFile": "monocles chat-1.7.8.5-git-arm64-v8a-release.apk"
     }
   ],
   "elementType": "File"

src/main/AndroidManifest.xml

@@ -243,7 +243,7 @@
             android:launchMode="singleTask"
             android:minWidth="336dp"
             android:minHeight="480dp"
-            android:windowSoftInputMode="stateHidden|adjustNothing" />
+            android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".ui.ScanActivity"
             android:screenOrientation="portrait"

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -4262,10 +4262,8 @@ public class ConversationFragment extends XmppFragment
                 } else if (activity != null && binding.emojiButton.getVisibility() == VISIBLE) {
                     binding.emojiPicker.setVisibility(GONE);
                     binding.keyboardButton.setVisibility(GONE);
-                } else if (activity != null) {
-                    getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
                 }
-                if (activity.xmppConnectionService != null && isKeyboardVisible && activity.xmppConnectionService.showTextFormatting()) {
+                if (activity != null && activity.xmppConnectionService != null && isKeyboardVisible && activity.xmppConnectionService.showTextFormatting()) {
                     showTextFormat(me);
                 } else {
                     hideTextFormat();