Browse Source

Try to fix Tobias crash

Mario Danic 8 years ago
parent
commit
ead3c16ec4

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

@@ -121,7 +121,6 @@ public class MainApp extends Application {
             List<SyncedFolder> syncedFolderList = mProvider.getSyncedFolders();
             Map<Pair<String, String>, Pair<Long, Boolean>> syncedFolders = new HashMap<>();
             ArrayList<Long> ids = new ArrayList<>();
-            ArrayList<SyncedFolder> syncedFolderArrayList = new ArrayList<>();
             for (SyncedFolder syncedFolder : syncedFolderList) {
                 Pair<String, String> checkPair = new Pair(syncedFolder.getAccount(), syncedFolder.getLocalPath());
                 if (syncedFolders.containsKey(checkPair)) {
@@ -137,14 +136,9 @@ public class MainApp extends Application {
                 ids.add(pair.first);
             }
 
-            for (SyncedFolder syncedFolder : syncedFolderList) {
-                if (!ids.contains(syncedFolder.getId())) {
-                    syncedFolderArrayList.add(syncedFolder);
-                }
-            }
 
             if (ids.size() > 0) {
-                mProvider.deleteSyncFolders(mContext, syncedFolderArrayList, ids);
+                mProvider.deleteOtherSyncedFolders(mContext, ids);
             } else {
                 PreferenceManager.getDefaultSharedPreferences(mContext).edit().putBoolean("legacyClean", true).apply();
             }

+ 1 - 5
src/com/owncloud/android/datamodel/SyncedFolderProvider.java

@@ -188,7 +188,7 @@ public class SyncedFolderProvider extends Observable {
 
     }
 
-    public int deleteSyncFolders(Context context, ArrayList<SyncedFolder> syncedFolders, ArrayList<Long> ids) {
+    public int deleteOtherSyncedFolders(Context context, ArrayList<Long> ids) {
 
 
         int result = mContentResolver.delete(
@@ -198,10 +198,6 @@ public class SyncedFolderProvider extends Observable {
         );
 
         if (result > 0) {
-            for (SyncedFolder syncedFolder : syncedFolders) {
-                notifyFolderSyncObservers(syncedFolder);
-            }
-
             if (context != null) {
                 PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean("legacyClean", true).apply();
             }