浏览代码

fix folder migration

AndyScherzinger 7 年之前
父节点
当前提交
d10f981b0f

+ 7 - 1
src/main/java/com/owncloud/android/MainApp.java

@@ -354,6 +354,9 @@ public class MainApp extends MultiDexApplication {
             SyncedFolder newSyncedFolder;
             for (SyncedFolder syncedFolder : syncedFolders) {
                 idsToDelete.add(syncedFolder.getId());
+                Log_OC.i(TAG, "Migration check for synced_folders record: "
+                        + syncedFolder.getId() + " - " + syncedFolder.getLocalPath());
+
                 for (int i = 0; i < imageMediaFolders.size(); i++) {
                     if (imageMediaFolders.get(i).absolutePath.equals(syncedFolder.getLocalPath())) {
                         newSyncedFolder = (SyncedFolder) syncedFolder.clone();
@@ -377,7 +380,10 @@ public class MainApp extends MultiDexApplication {
                 }
             }
 
-            syncedFolderProvider.deleteSyncedFoldersInList(idsToDelete);
+            for (long id : idsToDelete) {
+                Log_OC.i(TAG, "Removing legacy synced_folders record: " + id);
+                syncedFolderProvider.deleteSyncedFolder(id);
+            }
 
             PreferenceManager.setAutoUploadSplitEntries(this, true);
         }

+ 0 - 11
src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java

@@ -269,17 +269,6 @@ public class SyncedFolderProvider extends Observable {
         return result;
     }
 
-    /**
-     * delete any records of synchronized folders that are withing the given list of ids.
-     */
-    public int deleteSyncedFoldersInList(ArrayList<Long> ids) {
-        return mContentResolver.delete(
-                ProviderMeta.ProviderTableMeta.CONTENT_URI_SYNCED_FOLDERS,
-                ProviderMeta.ProviderTableMeta._ID + " IN (?)",
-                new String[]{String.valueOf(ids)}
-        );
-    }
-
     /**
      * delete record of synchronized folder with the given id.
      */