Fix media sync comparison and a consequent DB error

mooingcat · Jan 2, 2017 · e2b07c5 · e2b07c5
1 parent 3db873f
commit e2b07c5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.java b/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.java
@@ -151,12 +151,7 @@ private void logout() {
         editor.putString("hkey", "");
         editor.commit();
         //  force media resync on deauth
-        try {
-            getCol().getMedia().forceResync();
-        } catch (SQLiteException e) {
-            Timber.e("MyAccount.logout()  reinitializing media db due to sqlite error");
-            getCol().getMedia()._initDB();
-        }
+        getCol().getMedia().forceResync();
         switchToState(STATE_LOG_IN);
     }
 

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Media.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Media.java
@@ -770,7 +770,8 @@ public int dirtyCount() {
     public void forceResync() {
         mDb.execute("delete from media");
         mDb.execute("update meta set lastUsn=0,dirMod=0");
-        mDb.execute("vacuum analyze");
+        mDb.execute("vacuum");
+        mDb.execute("analyze");
         mDb.commit();
     }
 

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/sync/MediaSyncer.java b/AnkiDroid/src/main/java/com/ichi2/libanki/sync/MediaSyncer.java
@@ -151,7 +151,7 @@ public String sync() throws UnknownHttpResponseException, MediaSyncException {
 
                     } else if (!TextUtils.isEmpty(lsum)) {
                         // deleted remotely
-                        if (ldirty != 0) {
+                        if (ldirty == 0) {
                             mCol.log("delete local");
                             mCol.getMedia().syncDelete(fname);
                         } else {