|
@@ -402,7 +402,7 @@ class SyncedFoldersActivity :
|
|
files.size.toLong(),
|
|
files.size.toLong(),
|
|
syncedFolder.type,
|
|
syncedFolder.type,
|
|
syncedFolder.isHidden,
|
|
syncedFolder.isHidden,
|
|
- syncedFolder.subfolderRule,
|
|
|
|
|
|
+ syncedFolder.subfolderRule
|
|
)
|
|
)
|
|
}
|
|
}
|
|
|
|
|
|
@@ -432,7 +432,7 @@ class SyncedFoldersActivity :
|
|
mediaFolder.numberOfFiles,
|
|
mediaFolder.numberOfFiles,
|
|
mediaFolder.type,
|
|
mediaFolder.type,
|
|
syncedFolder.isHidden,
|
|
syncedFolder.isHidden,
|
|
- syncedFolder.subfolderRule,
|
|
|
|
|
|
+ syncedFolder.subfolderRule
|
|
)
|
|
)
|
|
}
|
|
}
|
|
|
|
|
|
@@ -461,7 +461,7 @@ class SyncedFoldersActivity :
|
|
mediaFolder.numberOfFiles,
|
|
mediaFolder.numberOfFiles,
|
|
mediaFolder.type,
|
|
mediaFolder.type,
|
|
false,
|
|
false,
|
|
- SubFolderRule.YEAR_MONTH,
|
|
|
|
|
|
+ SubFolderRule.YEAR_MONTH
|
|
)
|
|
)
|
|
}
|
|
}
|
|
|
|
|
|
@@ -553,7 +553,7 @@ class SyncedFoldersActivity :
|
|
null,
|
|
null,
|
|
MediaFolderType.CUSTOM,
|
|
MediaFolderType.CUSTOM,
|
|
false,
|
|
false,
|
|
- SubFolderRule.YEAR_MONTH,
|
|
|
|
|
|
+ SubFolderRule.YEAR_MONTH
|
|
)
|
|
)
|
|
onSyncFolderSettingsClick(0, emptyCustomFolder)
|
|
onSyncFolderSettingsClick(0, emptyCustomFolder)
|
|
} else {
|
|
} else {
|
|
@@ -663,7 +663,7 @@ class SyncedFoldersActivity :
|
|
File(syncedFolder.localPath).name,
|
|
File(syncedFolder.localPath).name,
|
|
syncedFolder.type,
|
|
syncedFolder.type,
|
|
syncedFolder.isHidden,
|
|
syncedFolder.isHidden,
|
|
- syncedFolder.subFolderRule,
|
|
|
|
|
|
+ syncedFolder.subFolderRule
|
|
)
|
|
)
|
|
saveOrUpdateSyncedFolder(newCustomFolder)
|
|
saveOrUpdateSyncedFolder(newCustomFolder)
|
|
adapter.addSyncFolderItem(newCustomFolder)
|
|
adapter.addSyncFolderItem(newCustomFolder)
|
|
@@ -681,7 +681,7 @@ class SyncedFoldersActivity :
|
|
syncedFolder.uploadAction,
|
|
syncedFolder.uploadAction,
|
|
syncedFolder.nameCollisionPolicy.serialize(),
|
|
syncedFolder.nameCollisionPolicy.serialize(),
|
|
syncedFolder.isEnabled,
|
|
syncedFolder.isEnabled,
|
|
- syncedFolder.subFolderRule,
|
|
|
|
|
|
+ syncedFolder.subFolderRule
|
|
)
|
|
)
|
|
saveOrUpdateSyncedFolder(item)
|
|
saveOrUpdateSyncedFolder(item)
|
|
|
|
|
|
@@ -762,7 +762,7 @@ class SyncedFoldersActivity :
|
|
uploadAction: Int,
|
|
uploadAction: Int,
|
|
nameCollisionPolicy: Int,
|
|
nameCollisionPolicy: Int,
|
|
enabled: Boolean,
|
|
enabled: Boolean,
|
|
- subFolderRule: SubFolderRule,
|
|
|
|
|
|
+ subFolderRule: SubFolderRule
|
|
) {
|
|
) {
|
|
item.id = id
|
|
item.id = id
|
|
item.localPath = localPath
|
|
item.localPath = localPath
|