浏览代码

Fix a bug with SyncedFolderProvider

Mario Danic 8 年之前
父节点
当前提交
4e90222439

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

@@ -165,7 +165,7 @@ public class SyncedFolderProvider extends Observable {
         Cursor cursor = mContentResolver.query(
                 ProviderMeta.ProviderTableMeta.CONTENT_URI_SYNCED_FOLDERS,
                 null,
-                ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_LOCAL_PATH + "==" + localPath,
+                ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_LOCAL_PATH + "== \"" + localPath + "\"",
                 null,
                 null
         );

+ 11 - 3
src/com/owncloud/android/ui/activity/FolderSyncActivity.java

@@ -323,9 +323,13 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
     @Override
     public void onSyncStatusToggleClick(int section, SyncedFolderDisplayItem syncedFolderDisplayItem) {
         if (syncedFolderDisplayItem.getId() > UNPERSISTED_ID) {
-            mSyncedFolderProvider.updateFolderSyncEnabled(syncedFolderDisplayItem.getId(), syncedFolderDisplayItem.isEnabled());
+            mSyncedFolderProvider.updateFolderSyncEnabled(syncedFolderDisplayItem.getId(),
+                    syncedFolderDisplayItem.isEnabled());
         } else {
-            mSyncedFolderProvider.storeFolderSync(syncedFolderDisplayItem);
+            long storedId = mSyncedFolderProvider.storeFolderSync(syncedFolderDisplayItem);
+            if (storedId != -1) {
+                syncedFolderDisplayItem.setId(storedId);
+            }
         }
     }
 
@@ -362,7 +366,11 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
 
         if (syncedFolder.getId() == UNPERSISTED_ID) {
             // newly set up folder sync config
-            mSyncedFolderProvider.storeFolderSync(item);
+            long storedId = mSyncedFolderProvider.storeFolderSync(item);
+            if (storedId != -1) {
+                item.setId(storedId);
+            }
+
         } else {
             // existing synced folder setup to be updated
             mSyncedFolderProvider.updateSyncFolder(item);