From ff43bd117bf7aa97e5243a1996c5e72f1184fa77 Mon Sep 17 00:00:00 2001
From: 12aw <arnev@gmx.de>
Date: Sat, 6 Jan 2024 20:43:59 +0100
Subject: [PATCH] Deactivate internal updater for app store releases

(cherry picked from commit 1570448f6ea20d9be6088d9200ecf10d761e6567)
---
 git/release/output-metadata.json             | 26 ++++++++++----------
 src/main/res/menu/activity_conversations.xml |  3 ++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/git/release/output-metadata.json b/git/release/output-metadata.json
index b0829eebf..8f7f8f241 100644
--- a/git/release/output-metadata.json
+++ b/git/release/output-metadata.json
@@ -41,19 +41,6 @@
       "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": "x86_64"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 15603,
-      "versionName": "1.7.8.5",
-      "outputFile": "monocles chat-1.7.8.5-git-x86_64-release.apk"
-    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -66,6 +53,19 @@
       "versionCode": 15604,
       "versionName": "1.7.8.5",
       "outputFile": "monocles chat-1.7.8.5-git-arm64-v8a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 15603,
+      "versionName": "1.7.8.5",
+      "outputFile": "monocles chat-1.7.8.5-git-x86_64-release.apk"
     }
   ],
   "elementType": "File"
diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml
index 97b68dd2f..ae94f6052 100644
--- a/src/main/res/menu/activity_conversations.xml
+++ b/src/main/res/menu/activity_conversations.xml
@@ -31,7 +31,8 @@
         android:id="@+id/action_check_updates"
         android:orderInCategory="850"
         android:title="@string/action_check_update"
-        app:showAsAction="never" />
+        app:showAsAction="never"
+        android:visible="@bool/show_combined_search_options" />
     <item
         android:id="@+id/action_invite_user"
         android:orderInCategory="100"