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

correctly persist newly created/configured custom folder and refresh list

Browse source
This commit is contained in:
AndyScherzinger 2017-05-28 01:31:14 +02:00
parent 127506baf3
commit 245bebf71a
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -468,33 +468,43 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
@Override
public void onSaveSyncedFolderPreference(SyncedFolderParcelable syncedFolder) {
SyncedFolderDisplayItem item = syncFolderItems.get(syncedFolder.getSection());
boolean dirty = item.isEnabled() != syncedFolder.getEnabled();
item = updateSyncedFolderItem(item, syncedFolder.getLocalPath(), syncedFolder.getRemotePath(), syncedFolder
.getWifiOnly(), syncedFolder.getChargingOnly(), syncedFolder.getSubfolderByDate(), syncedFolder
.getUploadAction(), syncedFolder.getEnabled());
if (syncedFolder.getId() == UNPERSISTED_ID) {
// newly set up folder sync config
long storedId = mSyncedFolderProvider.storeFolderSync(item);
// custom folders newly created aren't in the list already,
// so triggering a refresh
if (MediaFolder.CUSTOM.equals(syncedFolder.getType()) && syncedFolder.getId() == UNPERSISTED_ID) {
SyncedFolderDisplayItem newCustomFolder = new SyncedFolderDisplayItem(
SyncedFolder.UNPERSISTED_ID, syncedFolder.getLocalPath(), syncedFolder.getRemotePath(),
syncedFolder.getWifiOnly(), syncedFolder.getChargingOnly(), syncedFolder.getSubfolderByDate(),
syncedFolder.getAccount(), syncedFolder.getUploadAction(), syncedFolder.getEnabled(),
new File(syncedFolder.getLocalPath()).getName(), syncedFolder.getType());
long storedId = mSyncedFolderProvider.storeFolderSync(newCustomFolder);
if (storedId != -1) {
item.setId(storedId);
}
// custom folders newly created aren't in the list already,
// so triggering a refresh
if (MediaFolder.CUSTOM.equals(item.getType())) {
// TODO add item to the list and enforce a refresh
newCustomFolder.setId(storedId);
}
mAdapter.addSyncFolderItem(newCustomFolder);
} else {
// existing synced folder setup to be updated
mSyncedFolderProvider.updateSyncFolder(item);
}
mSyncedFolderPreferencesDialogFragment = null;
SyncedFolderDisplayItem item = syncFolderItems.get(syncedFolder.getSection());
boolean dirty = item.isEnabled() != syncedFolder.getEnabled();
item = updateSyncedFolderItem(item, syncedFolder.getLocalPath(), syncedFolder.getRemotePath(), syncedFolder
.getWifiOnly(), syncedFolder.getChargingOnly(), syncedFolder.getSubfolderByDate(), syncedFolder
.getUploadAction(), syncedFolder.getEnabled());
if (dirty) {
mAdapter.setSyncFolderItem(syncedFolder.getSection(), item);
if (syncedFolder.getId() == UNPERSISTED_ID) {
// newly set up folder sync config
long storedId = mSyncedFolderProvider.storeFolderSync(item);
if (storedId != -1) {
item.setId(storedId);
}
} else {
// existing synced folder setup to be updated
mSyncedFolderProvider.updateSyncFolder(item);
}
if(dirty) {
mAdapter.setSyncFolderItem(syncedFolder.getSection(), item);
}
}
mSyncedFolderPreferencesDialogFragment = null;
}
@Override

5
src/main/java/com/owncloud/android/ui/adapter/FolderSyncAdapter.java
View file

@ -81,6 +81,11 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter<FolderSyncAd
notifyDataSetChanged();
}
public void addSyncFolderItem(SyncedFolderDisplayItem syncFolderItem) {
mSyncFolderItems.add(syncFolderItem);
notifyDataSetChanged();
}
@Override
public int getSectionCount() {
return mSyncFolderItems.size();