mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix a bug with SyncedFolderProvider

Browse source
This commit is contained in:
Mario Danic 2017-02-05 00:07:10 +01:00 committed by AndyScherzinger
parent 1973705356
commit 4e90222439
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/owncloud/android/datamodel/SyncedFolderProvider.java
View file

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

14
src/com/owncloud/android/ui/activity/FolderSyncActivity.java
View file

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