Fix backup restore crash.

signalapp · Mar 2, 2020 · 543a4ee · 543a4ee
1 parent fd2a464
commit 543a4ee
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseFactory.java
@@ -165,9 +165,14 @@ public static SQLiteDatabase getBackupDatabase(Context context) {
   }
 
   public static void upgradeRestored(Context context, SQLiteDatabase database){
-    getInstance(context).databaseHelper.onUpgrade(database, database.getVersion(), -1);
-    getInstance(context).databaseHelper.markCurrent(database);
-    getInstance(context).mms.trimEntriesForExpiredMessages();
+    synchronized (lock) {
+      getInstance(context).databaseHelper.onUpgrade(database, database.getVersion(), -1);
+      getInstance(context).databaseHelper.markCurrent(database);
+      getInstance(context).mms.trimEntriesForExpiredMessages();
+
+      instance.databaseHelper.close();
+      instance = null;
+    }
   }
 
   private DatabaseFactory(@NonNull Context context) {