From 1a9206fdbe9620e941310e1311bd625d25866e3d Mon Sep 17 00:00:00 2001
From: Konstantin Ullrich <konstantinullrich12@gmail.com>
Date: Wed, 4 Mar 2020 16:31:10 +0100
Subject: [PATCH] Move cleanupOrphanedAttachments before restart

---
 js/background.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/js/background.js b/js/background.js
index 7761fbe94..1cda5ea4d 100644
--- a/js/background.js
+++ b/js/background.js
@@ -398,6 +398,13 @@
     await storage.put('version', currentVersion);
 
     if (newVersion) {
+
+      await window.Signal.Data.cleanupOrphanedAttachments();
+
+      window.log.info(
+        `New version detected: ${currentVersion}; previous: ${lastVersion}`
+      );
+
       if (
         lastVersion &&
         window.isBeforeVersion(lastVersion, 'v1.15.0-beta.5')
@@ -405,10 +412,6 @@
         await window.Signal.Logs.deleteAll();
         window.restart();
       }
-
-      window.log.info(
-        `New version detected: ${currentVersion}; previous: ${lastVersion}`
-      );
     }
 
     if (isIndexedDBPresent) {
@@ -431,10 +434,6 @@
 
     Views.Initialization.setMessage(window.i18n('optimizingApplication'));
 
-    if (newVersion) {
-      await window.Signal.Data.cleanupOrphanedAttachments();
-    }
-
     Views.Initialization.setMessage(window.i18n('loading'));
 
     idleDetector = new IdleDetector();