Merge pull request #1248 from wordpress-mobile/fix_crash_in_account_s…

…ql_utils Add transaction to prevent other threads to overriding current account
wordpress-mobile · Jun 6, 2019 · 6f0a73b · 6f0a73b
2 parents 3a44520 + 453607d
commit 6f0a73b
Showing 1 changed file with 23 additions and 11 deletions.
diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/AccountSqlUtils.java b/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/AccountSqlUtils.java
@@ -1,6 +1,7 @@
 package org.wordpress.android.fluxc.persistence;
 
 import android.content.ContentValues;
+import android.database.sqlite.SQLiteDatabase;
 
 import androidx.annotation.NonNull;
 
@@ -25,18 +26,29 @@ public static int insertOrUpdateDefaultAccount(AccountModel account) {
     }
 
     public static int insertOrUpdateAccount(AccountModel account, int localId) {
-        if (account == null) return 0;
-        account.setId(localId);
-        List<AccountModel> accountResults = WellSql.select(AccountModel.class)
-                .where()
-                .equals(AccountModelTable.ID, localId)
-                .endWhere().getAsModel();
-        if (accountResults.isEmpty()) {
-            WellSql.insert(account).execute();
+        if (account == null) {
             return 0;
-        } else {
-            ContentValues cv = new UpdateAllExceptId<>(AccountModel.class).toCv(account);
-            return updateAccount(accountResults.get(0).getId(), cv);
+        }
+        account.setId(localId);
+        SQLiteDatabase db = WellSql.giveMeWritableDb();
+        db.beginTransaction();
+        try {
+            List<AccountModel> accountResults = WellSql.select(AccountModel.class)
+                                                       .where()
+                                                       .equals(AccountModelTable.ID, localId)
+                                                       .endWhere().getAsModel();
+            if (accountResults.isEmpty()) {
+                WellSql.insert(account).execute();
+                db.setTransactionSuccessful();
+                return 0;
+            } else {
+                ContentValues cv = new UpdateAllExceptId<>(AccountModel.class).toCv(account);
+                int result = updateAccount(accountResults.get(0).getId(), cv);
+                db.setTransactionSuccessful();
+                return result;
+            }
+        } finally {
+            db.endTransaction();
         }
     }