ADD: [instantupload] setting to also upload existing files

Signed-off-by: Chris Koying Browet <cbro@semperpax.com>

src/main/java/com/owncloud/android/MainApp.java

@@ -773,7 +773,7 @@ private static void initiateExistingAutoUploadEntries(Clock clock) {
 
                 for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
                     if (syncedFolder.isEnabled()) {
-                        FilesSyncHelper.insertAllDBEntriesForSyncedFolder(syncedFolder);
+                        FilesSyncHelper.insertAllDBEntriesForSyncedFolder(syncedFolder, true);
                     }
                 }
 

src/main/java/com/owncloud/android/datamodel/SyncedFolder.java

@@ -39,6 +39,7 @@ public class SyncedFolder implements Serializable, Cloneable {
     @Getter @Setter private String remotePath;
     @Getter @Setter private boolean wifiOnly;
     @Getter @Setter private boolean chargingOnly;
+    @Getter @Setter private boolean existing;
     @Getter @Setter private boolean subfolderByDate;
     @Getter @Setter private String account;
     @Getter @Setter private int uploadAction;
@@ -54,6 +55,7 @@ public class SyncedFolder implements Serializable, Cloneable {
      * @param remotePath      remote path
      * @param wifiOnly        upload on wifi only flag
      * @param chargingOnly    upload on charging only
+     * @param existing        upload existing files
      * @param subfolderByDate create sub-folders by date (month)
      * @param account         the account owning the synced folder
      * @param uploadAction    the action to be done after the upload
@@ -66,15 +68,16 @@ public SyncedFolder(String localPath,
                         String remotePath,
                         boolean wifiOnly,
                         boolean chargingOnly,
+                        boolean existing,
                         boolean subfolderByDate,
                         String account,
                         int uploadAction,
                         boolean enabled,
                         long timestampMs,
                         MediaFolderType type,
                         boolean hidden) {
-        this(UNPERSISTED_ID, localPath, remotePath, wifiOnly, chargingOnly, subfolderByDate, account, uploadAction,
-             enabled, timestampMs, type, hidden);
+        this(UNPERSISTED_ID, localPath, remotePath, wifiOnly, chargingOnly, existing, subfolderByDate, account,
+             uploadAction, enabled, timestampMs, type, hidden);
     }
 
     /**
@@ -87,6 +90,7 @@ protected SyncedFolder(long id,
                            String remotePath,
                            boolean wifiOnly,
                            boolean chargingOnly,
+                           boolean existing,
                            boolean subfolderByDate,
                            String account,
                            int uploadAction,
@@ -99,6 +103,7 @@ protected SyncedFolder(long id,
         this.remotePath = remotePath;
         this.wifiOnly = wifiOnly;
         this.chargingOnly = chargingOnly;
+        this.existing = existing;
         this.subfolderByDate = subfolderByDate;
         this.account = account;
         this.uploadAction = uploadAction;

src/main/java/com/owncloud/android/datamodel/SyncedFolderDisplayItem.java

@@ -45,6 +45,7 @@ public class SyncedFolderDisplayItem extends SyncedFolder {
      * @param remotePath      remote path
      * @param wifiOnly        upload on wifi only flag
      * @param chargingOnly    upload on charging only
+     * @param existing        also upload existing
      * @param subfolderByDate create sub-folders by date (month)
      * @param account         the account owning the synced folder
      * @param uploadAction    the action to be done after the upload
@@ -60,6 +61,7 @@ public SyncedFolderDisplayItem(long id,
                                    String remotePath,
                                    boolean wifiOnly,
                                    boolean chargingOnly,
+                                   boolean existing,
                                    boolean subfolderByDate,
                                    String account,
                                    int uploadAction,
@@ -70,8 +72,8 @@ public SyncedFolderDisplayItem(long id,
                                    long numberOfFiles,
                                    MediaFolderType type,
                                    boolean hidden) {
-        super(id, localPath, remotePath, wifiOnly, chargingOnly, subfolderByDate, account, uploadAction, enabled,
-              timestampMs, type, hidden);
+        super(id, localPath, remotePath, wifiOnly, chargingOnly, existing, subfolderByDate, account, uploadAction,
+              enabled, timestampMs, type, hidden);
         this.filePaths = filePaths;
         this.folderName = folderName;
         this.numberOfFiles = numberOfFiles;
@@ -82,14 +84,15 @@ public SyncedFolderDisplayItem(long id,
                                    String remotePath,
                                    boolean wifiOnly,
                                    boolean chargingOnly,
+                                   boolean existing,
                                    boolean subfolderByDate,
                                    String account,
                                    int uploadAction,
                                    boolean enabled,
                                    long timestampMs,
                                    String folderName, MediaFolderType type, boolean hidden) {
-        super(id, localPath, remotePath, wifiOnly, chargingOnly, subfolderByDate, account, uploadAction, enabled,
-              timestampMs, type, hidden);
+        super(id, localPath, remotePath, wifiOnly, chargingOnly, existing, subfolderByDate, account, uploadAction,
+              enabled, timestampMs, type, hidden);
         this.folderName = folderName;
     }
 }

src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java

@@ -342,6 +342,8 @@ private SyncedFolder createSyncedFolderFromCursor(Cursor cursor) {
                     ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_WIFI_ONLY)) == 1;
             boolean chargingOnly = cursor.getInt(cursor.getColumnIndex(
                     ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_CHARGING_ONLY)) == 1;
+            boolean existing = cursor.getInt(cursor.getColumnIndex(
+                    ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_EXISTING)) == 1;
             boolean subfolderByDate = cursor.getInt(cursor.getColumnIndex(
                     ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_SUBFOLDER_BY_DATE)) == 1;
             String accountName = cursor.getString(cursor.getColumnIndex(
@@ -357,8 +359,9 @@ private SyncedFolder createSyncedFolderFromCursor(Cursor cursor) {
             boolean hidden = cursor.getInt(cursor.getColumnIndex(
                 ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_HIDDEN)) == 1;
 
-            syncedFolder = new SyncedFolder(id, localPath, remotePath, wifiOnly, chargingOnly, subfolderByDate,
-                    accountName, uploadAction, enabled, enabledTimestampMs, type, hidden);
+            syncedFolder = new SyncedFolder(id, localPath, remotePath, wifiOnly, chargingOnly, existing,
+                                            subfolderByDate, accountName, uploadAction, enabled, enabledTimestampMs,
+                                            type, hidden);
         }
         return syncedFolder;
     }
@@ -376,6 +379,7 @@ private ContentValues createContentValuesFromSyncedFolder(SyncedFolder syncedFol
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_REMOTE_PATH, syncedFolder.getRemotePath());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_WIFI_ONLY, syncedFolder.isWifiOnly());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_CHARGING_ONLY, syncedFolder.isChargingOnly());
+        cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_EXISTING, syncedFolder.isExisting());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ENABLED, syncedFolder.isEnabled());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_ENABLED_TIMESTAMP_MS, syncedFolder.getEnabledTimestampMs());
         cv.put(ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_SUBFOLDER_BY_DATE, syncedFolder.isSubfolderByDate());

src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -31,7 +31,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 53;
+    public static final int DB_VERSION = 54;
 
     private ProviderMeta() {
         // No instance
@@ -223,6 +223,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String SYNCED_FOLDER_REMOTE_PATH = "remote_path";
         public static final String SYNCED_FOLDER_WIFI_ONLY = "wifi_only";
         public static final String SYNCED_FOLDER_CHARGING_ONLY = "charging_only";
+        public static final String SYNCED_FOLDER_EXISTING = "existing";
         public static final String SYNCED_FOLDER_ENABLED = "enabled";
         public static final String SYNCED_FOLDER_ENABLED_TIMESTAMP_MS = "enabled_timestamp_ms";
         public static final String SYNCED_FOLDER_TYPE = "type";

src/main/java/com/owncloud/android/jobs/FilesSyncJob.java

@@ -131,7 +131,7 @@ protected Result onRunJob(@NonNull Params params) {
                                             userAccountManager,
                                             connectivityService,
                                             powerManagementService);
-        FilesSyncHelper.insertAllDBEntries(preferences, clock, skipCustom);
+        FilesSyncHelper.insertAllDBEntries(preferences, clock, skipCustom, false);
 
         // Create all the providers we'll need
         final ContentResolver contentResolver = context.getContentResolver();

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -830,6 +830,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
@@ -2104,6 +2105,24 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             if (!upgraded) {
                 Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
             }
+
+            if(oldVersion < 54 && newVersion >= 54) {
+                Log_OC.i(SQL, "Entering in the #54 add synced.existing");
+                db.beginTransaction();
+                try {
+                    db.execSQL(ALTER_TABLE + ProviderTableMeta.SYNCED_FOLDERS_TABLE_NAME +
+                                   ADD_COLUMN + ProviderTableMeta.SYNCED_FOLDER_EXISTING + " INTEGER "); // boolean
+
+                    upgraded = true;
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+            }
+
+            if (!upgraded) {
+                Log_OC.i(SQL, String.format(Locale.ENGLISH, UPGRADE_VERSION_MSG, oldVersion, newVersion));
+            }
         }
     }
 }

src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java

@@ -416,6 +416,7 @@ private SyncedFolderDisplayItem createSyncedFolderWithoutMediaFolder(@NonNull Sy
                 syncedFolder.getRemotePath(),
                 syncedFolder.isWifiOnly(),
                 syncedFolder.isChargingOnly(),
+                syncedFolder.isExisting(),
                 syncedFolder.isSubfolderByDate(),
                 syncedFolder.getAccount(),
                 syncedFolder.getUploadAction(),
@@ -443,6 +444,7 @@ private SyncedFolderDisplayItem createSyncedFolder(@NonNull SyncedFolder syncedF
                 syncedFolder.getRemotePath(),
                 syncedFolder.isWifiOnly(),
                 syncedFolder.isChargingOnly(),
+                syncedFolder.isExisting(),
                 syncedFolder.isSubfolderByDate(),
                 syncedFolder.getAccount(),
                 syncedFolder.getUploadAction(),
@@ -470,6 +472,7 @@ private SyncedFolderDisplayItem createSyncedFolderFromMediaFolder(@NonNull Media
                 true,
                 false,
                 false,
+                false,
                 getAccount().name,
                 FileUploader.LOCAL_BEHAVIOUR_FORGET,
                 false,
@@ -577,7 +580,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_create_custom_folder: {
                 Log.d(TAG, "Show custom folder dialog");
                 SyncedFolderDisplayItem emptyCustomFolder = new SyncedFolderDisplayItem(
-                    SyncedFolder.UNPERSISTED_ID, null, null, true, false,
+                    SyncedFolder.UNPERSISTED_ID, null, null, true, false, false,
                     false, getAccount().name, FileUploader.LOCAL_BEHAVIOUR_FORGET, false,
                     clock.getCurrentTime(), null, MediaFolderType.CUSTOM, false);
                 onSyncFolderSettingsClick(0, emptyCustomFolder);
@@ -619,7 +622,7 @@ public void onSyncStatusToggleClick(int section, SyncedFolderDisplayItem syncedF
         }
 
         if (syncedFolderDisplayItem.isEnabled()) {
-            FilesSyncHelper.insertAllDBEntriesForSyncedFolder(syncedFolderDisplayItem);
+            FilesSyncHelper.insertAllDBEntriesForSyncedFolder(syncedFolderDisplayItem, true);
 
             showBatteryOptimizationInfo();
         }
@@ -709,18 +712,20 @@ public void onSaveSyncedFolderPreference(SyncedFolderParcelable syncedFolder) {
         if (MediaFolderType.CUSTOM == syncedFolder.getType() && syncedFolder.getId() == UNPERSISTED_ID) {
             SyncedFolderDisplayItem newCustomFolder = new SyncedFolderDisplayItem(
                     SyncedFolder.UNPERSISTED_ID, syncedFolder.getLocalPath(), syncedFolder.getRemotePath(),
-                    syncedFolder.isWifiOnly(), syncedFolder.isChargingOnly(), syncedFolder.isSubfolderByDate(),
-                    syncedFolder.getAccount(), syncedFolder.getUploadAction(), syncedFolder.isEnabled(),
-                    clock.getCurrentTime(), new File(syncedFolder.getLocalPath()).getName(), syncedFolder.getType(), syncedFolder.isHidden());
+                    syncedFolder.isWifiOnly(), syncedFolder.isChargingOnly(),
+                    syncedFolder.isExisting(), syncedFolder.isSubfolderByDate(), syncedFolder.getAccount(),
+                    syncedFolder.getUploadAction(), syncedFolder.isEnabled(), clock.getCurrentTime(),
+                    new File(syncedFolder.getLocalPath()).getName(), syncedFolder.getType(), syncedFolder.isHidden());
 
             saveOrUpdateSyncedFolder(newCustomFolder);
             adapter.addSyncFolderItem(newCustomFolder);
         } else {
             SyncedFolderDisplayItem item = adapter.get(syncedFolder.getSection());
             updateSyncedFolderItem(item, syncedFolder.getId(), syncedFolder.getLocalPath(),
-                                   syncedFolder.getRemotePath(), syncedFolder
-                    .isWifiOnly(), syncedFolder.isChargingOnly(), syncedFolder.isSubfolderByDate(), syncedFolder
-                    .getUploadAction(), syncedFolder.isEnabled());
+                                   syncedFolder.getRemotePath(), syncedFolder.isWifiOnly(),
+                                   syncedFolder.isChargingOnly(), syncedFolder.isExisting(),
+                                   syncedFolder.isSubfolderByDate(), syncedFolder.getUploadAction(),
+                                   syncedFolder.isEnabled());
 
             saveOrUpdateSyncedFolder(item);
 
@@ -743,7 +748,7 @@ private void saveOrUpdateSyncedFolder(SyncedFolderDisplayItem item) {
             // existing synced folder setup to be updated
             syncedFolderProvider.updateSyncFolder(item);
             if (item.isEnabled()) {
-                FilesSyncHelper.insertAllDBEntriesForSyncedFolder(item);
+                FilesSyncHelper.insertAllDBEntriesForSyncedFolder(item, true);
             } else {
                 String syncedFolderInitiatedKey = "syncedFolderIntitiated_" + item.getId();
 
@@ -761,7 +766,7 @@ private void storeSyncedFolder(SyncedFolderDisplayItem item) {
         if (storedId != -1) {
             item.setId(storedId);
             if (item.isEnabled()) {
-                FilesSyncHelper.insertAllDBEntriesForSyncedFolder(item);
+                FilesSyncHelper.insertAllDBEntriesForSyncedFolder(item, true);
             } else {
                 String syncedFolderInitiatedKey = "syncedFolderIntitiated_" + item.getId();
                 arbitraryDataProvider.deleteKeyForAccount("global", syncedFolderInitiatedKey);
@@ -788,6 +793,7 @@ public void onDeleteSyncedFolderPreference(SyncedFolderParcelable syncedFolder)
      * @param remotePath      the remote path
      * @param wifiOnly        upload on wifi only
      * @param chargingOnly    upload on charging only
+     * @param existing        also upload existing
      * @param subfolderByDate created sub folders
      * @param uploadAction    upload action
      * @param enabled         is sync enabled
@@ -798,6 +804,7 @@ private void updateSyncedFolderItem(SyncedFolderDisplayItem item,
                                                            String remotePath,
                                                            boolean wifiOnly,
                                                            boolean chargingOnly,
+                                                           boolean existing,
                                                            boolean subfolderByDate,
                                                            Integer uploadAction,
                                                            boolean enabled) {
@@ -806,6 +813,7 @@ private void updateSyncedFolderItem(SyncedFolderDisplayItem item,
         item.setRemotePath(remotePath);
         item.setWifiOnly(wifiOnly);
         item.setChargingOnly(chargingOnly);
+        item.setExisting(existing);
         item.setSubfolderByDate(subfolderByDate);
         item.setUploadAction(uploadAction);
         item.setEnabled(enabled, clock.getCurrentTime());