Add existing field to db table synced folders creation

Signed-off-by: Alice Gaudon <alice@gaudon.pro>
nextcloud · Nov 19, 2019 · 0b1c6e1 · 0b1c6e1
1 parent 56e7615
commit 0b1c6e1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/main/java/com/owncloud/android/providers/FileContentProvider.java b/src/main/java/com/owncloud/android/providers/FileContentProvider.java
@@ -828,6 +828,7 @@ private void createSyncedFoldersTable(SQLiteDatabase db) {
                        + ProviderTableMeta.SYNCED_FOLDER_REMOTE_PATH + " TEXT, "          // remote path
                        + ProviderTableMeta.SYNCED_FOLDER_WIFI_ONLY + " INTEGER, "         // wifi_only
                        + ProviderTableMeta.SYNCED_FOLDER_CHARGING_ONLY + " INTEGER, "     // charging only
+                       + ProviderTableMeta.SYNCED_FOLDER_EXISTING + " INTEGER, "          // existing
                        + ProviderTableMeta.SYNCED_FOLDER_ENABLED + " INTEGER, "           // enabled
                        + ProviderTableMeta.SYNCED_FOLDER_ENABLED_TIMESTAMP_MS + " INTEGER, "           // enable date
                        + ProviderTableMeta.SYNCED_FOLDER_SUBFOLDER_BY_DATE + " INTEGER, " // subfolder by date

diff --git a/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java b/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java
@@ -618,9 +618,6 @@ public void onSaveSyncedFolderPreference(SyncedFolderParcelable syncedFolder) {
                 if (newCustomFolder.isEnabled()) {
                     FilesSyncHelper.insertAllDBEntriesForSyncedFolder(newCustomFolder);
                 }
-                if (newCustomFolder.isEnabled()) {
-                    FilesSyncHelper.insertAllDBEntriesForSyncedFolder(newCustomFolder);
-                }
             }
             mAdapter.addSyncFolderItem(newCustomFolder);
         } else {
@@ -637,19 +634,13 @@ public void onSaveSyncedFolderPreference(SyncedFolderParcelable syncedFolder) {
                     if (item.isEnabled()) {
                         FilesSyncHelper.insertAllDBEntriesForSyncedFolder(item);
                     }
-                    if (item.isEnabled()) {
-                        FilesSyncHelper.insertAllDBEntriesForSyncedFolder(item);
-                    }
                 }
             } else {
                 // existing synced folder setup to be updated
                 mSyncedFolderProvider.updateSyncFolder(item);
                 if (item.isEnabled()) {
                     FilesSyncHelper.insertAllDBEntriesForSyncedFolder(item);
                 }
-                if (item.isEnabled()) {
-                    FilesSyncHelper.insertAllDBEntriesForSyncedFolder(item);
-                }
             }
 
             mAdapter.setSyncFolderItem(syncedFolder.getSection(), item);

diff --git a/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java b/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java
@@ -174,6 +174,7 @@ private SyncedFolderDisplayItem create(String folderName, Boolean enabled) {
                                            true,
                                            true,
                                            true,
+                                           true,
                                            "test@nextcloud.com",
                                            1,
                                            enabled,
-Original file line number
+Diff line change
@@ Expand Up @@
                                                true,
                                                true,
                                                true,
+                                               true,
                                                "test@nextcloud.com",
 ,
                                                enabled,
@@ Expand Down @@