From b81cc707f5ed916081885eef791df86da95e794d Mon Sep 17 00:00:00 2001
From: Arne <arne@monocles.de>
Date: Wed, 6 Dec 2023 08:08:01 +0100
Subject: [PATCH] too much sticker scanning

---
 git/release/output-metadata.json              | 38 +++++++++----------
 .../chat/DownloadDefaultStickers.java         |  1 -
 .../services/XmppConnectionService.java       |  2 +-
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/git/release/output-metadata.json b/git/release/output-metadata.json
index 2eeea8ef4..d0bafc61f 100644
--- a/git/release/output-metadata.json
+++ b/git/release/output-metadata.json
@@ -20,26 +20,13 @@
       "filters": [
         {
           "filterType": "ABI",
-          "value": "armeabi-v7a"
+          "value": "x86"
         }
       ],
       "attributes": [],
-      "versionCode": 15001,
+      "versionCode": 15002,
       "versionName": "1.7.8",
-      "outputFile": "monocles chat-1.7.8-git-armeabi-v7a-release.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "arm64-v8a"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 15004,
-      "versionName": "1.7.8",
-      "outputFile": "monocles chat-1.7.8-git-arm64-v8a-release.apk"
+      "outputFile": "monocles chat-1.7.8-git-x86-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -59,13 +46,26 @@
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
-      "versionCode": 15002,
+      "versionCode": 15004,
       "versionName": "1.7.8",
-      "outputFile": "monocles chat-1.7.8-git-x86-release.apk"
+      "outputFile": "monocles chat-1.7.8-git-arm64-v8a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "armeabi-v7a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 15001,
+      "versionName": "1.7.8",
+      "outputFile": "monocles chat-1.7.8-git-armeabi-v7a-release.apk"
     }
   ],
   "elementType": "File"
diff --git a/src/main/java/de/monocles/chat/DownloadDefaultStickers.java b/src/main/java/de/monocles/chat/DownloadDefaultStickers.java
index db0b9a237..b95f16590 100644
--- a/src/main/java/de/monocles/chat/DownloadDefaultStickers.java
+++ b/src/main/java/de/monocles/chat/DownloadDefaultStickers.java
@@ -147,7 +147,6 @@ public class DownloadDefaultStickers extends Service {
             w.write('\n');
             w.close();
         } catch (final Exception e) { }
-        xmppConnectionService.forceRescanStickers();
     }
 
     private void download() throws Exception {
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 6abbf8c4b..4016020f9 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1766,7 +1766,7 @@ public class XmppConnectionService extends Service {
         toggleForegroundService();
         setupPhoneStateListener();
         internalPingExecutor.scheduleAtFixedRate(this::manageAccountConnectionStatesInternal,10,10,TimeUnit.SECONDS);
-        forceRescanStickers();
+        rescanStickers();
         //start export log service every day at given time
         ScheduleAutomaticExport();
         // cancel scheduled exporter