code formatting

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

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

@@ -76,8 +76,20 @@ public class SyncedFolder implements Serializable, Cloneable {
                         long timestampMs,
                         MediaFolderType type,
                         boolean hidden) {
-        this(UNPERSISTED_ID, localPath, remotePath, wifiOnly, chargingOnly, existing, subfolderByDate, account,
-             uploadAction, nameCollisionPolicy, enabled, timestampMs, type, hidden);
+        this(UNPERSISTED_ID,
+             localPath,
+             remotePath,
+             wifiOnly,
+             chargingOnly,
+             existing,
+             subfolderByDate,
+             account,
+             uploadAction,
+             nameCollisionPolicy,
+             enabled,
+             timestampMs,
+             type,
+             hidden);
     }
 
     /**

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

@@ -68,8 +68,20 @@ public class SyncedFolderDisplayItem extends SyncedFolder {
                                    long numberOfFiles,
                                    MediaFolderType type,
                                    boolean hidden) {
-        super(id, localPath, remotePath, wifiOnly, chargingOnly, existing, subfolderByDate, account, uploadAction,
-              nameCollisionPolicy, enabled, timestampMs, type, hidden);
+        super(id,
+              localPath,
+              remotePath,
+              wifiOnly,
+              chargingOnly,
+              existing,
+              subfolderByDate,
+              account,
+              uploadAction,
+              nameCollisionPolicy,
+              enabled,
+              timestampMs,
+              type,
+              hidden);
         this.filePaths = filePaths;
         this.folderName = folderName;
         this.numberOfFiles = numberOfFiles;
@@ -87,9 +99,23 @@ public class SyncedFolderDisplayItem extends SyncedFolder {
                                    int nameCollisionPolicy,
                                    boolean enabled,
                                    long timestampMs,
-                                   String folderName, MediaFolderType type, boolean hidden) {
-        super(id, localPath, remotePath, wifiOnly, chargingOnly, existing, subfolderByDate, account, uploadAction,
-              nameCollisionPolicy, enabled, timestampMs, type, hidden);
+                                   String folderName,
+                                   MediaFolderType type,
+                                   boolean hidden) {
+        super(id,
+              localPath,
+              remotePath,
+              wifiOnly,
+              chargingOnly,
+              existing,
+              subfolderByDate,
+              account,
+              uploadAction,
+              nameCollisionPolicy,
+              enabled,
+              timestampMs,
+              type,
+              hidden);
         this.folderName = folderName;
     }
 

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

@@ -361,9 +361,20 @@ public class SyncedFolderProvider extends Observable {
             boolean hidden = cursor.getInt(cursor.getColumnIndex(
                 ProviderMeta.ProviderTableMeta.SYNCED_FOLDER_HIDDEN)) == 1;
 
-            syncedFolder = new SyncedFolder(id, localPath, remotePath, wifiOnly, chargingOnly, existing,
-                                            subfolderByDate, accountName, uploadAction, nameCollisionPolicy, enabled,
-                                            enabledTimestampMs, type, hidden);
+            syncedFolder = new SyncedFolder(id,
+                                            localPath,
+                                            remotePath,
+                                            wifiOnly,
+                                            chargingOnly,
+                                            existing,
+                                            subfolderByDate,
+                                            accountName,
+                                            uploadAction,
+                                            nameCollisionPolicy,
+                                            enabled,
+                                            enabledTimestampMs,
+                                            type,
+                                            hidden);
         }
         return syncedFolder;
     }

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

@@ -172,11 +172,9 @@ public class FilesSyncJob extends Job {
         }
         User user = optionalUser.get();
 
-        ArbitraryDataProvider arbitraryDataProvider;
+        ArbitraryDataProvider arbitraryDataProvider = null;
         if (lightVersion) {
             arbitraryDataProvider = new ArbitraryDataProvider(context.getContentResolver());
-        } else {
-            arbitraryDataProvider = null;
         }
 
         String remotePath;

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

@@ -583,10 +583,21 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
             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, true,
-                    false, getAccount().name, FileUploader.LOCAL_BEHAVIOUR_FORGET,
-                    FileUploader.NameCollisionPolicy.ASK_USER.serialize(), false,
-                    clock.getCurrentTime(), null, MediaFolderType.CUSTOM, false);
+                    SyncedFolder.UNPERSISTED_ID,
+                    null,
+                    null,
+                    true,
+                    false,
+                    true,
+                    false,
+                    getAccount().name,
+                    FileUploader.LOCAL_BEHAVIOUR_FORGET,
+                    FileUploader.NameCollisionPolicy.ASK_USER.serialize(),
+                    false,
+                    clock.getCurrentTime(),
+                    null,
+                    MediaFolderType.CUSTOM,
+                    false);
                 onSyncFolderSettingsClick(0, emptyCustomFolder);
             }
 
@@ -715,26 +726,41 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
         // so triggering a refresh
         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.isExisting(), syncedFolder.isSubfolderByDate(), syncedFolder.getAccount(),
-                    syncedFolder.getUploadAction(), syncedFolder.getNameCollisionPolicy().serialize(),
-                    syncedFolder.isEnabled(), clock.getCurrentTime(), new File(syncedFolder.getLocalPath()).getName(),
-                    syncedFolder.getType(), syncedFolder.isHidden());
+                SyncedFolder.UNPERSISTED_ID,
+                syncedFolder.getLocalPath(),
+                syncedFolder.getRemotePath(),
+                syncedFolder.isWifiOnly(),
+                syncedFolder.isChargingOnly(),
+                syncedFolder.isExisting(),
+                syncedFolder.isSubfolderByDate(),
+                syncedFolder.getAccount(),
+                syncedFolder.getUploadAction(),
+                syncedFolder.getNameCollisionPolicy().serialize(),
+                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.isExisting(),
-                                   syncedFolder.isSubfolderByDate(), syncedFolder.getUploadAction(),
-                                   syncedFolder.getNameCollisionPolicy().serialize(), syncedFolder.isEnabled());
+            updateSyncedFolderItem(item,
+                                   syncedFolder.getId(),
+                                   syncedFolder.getLocalPath(),
+                                   syncedFolder.getRemotePath(),
+                                   syncedFolder.isWifiOnly(),
+                                   syncedFolder.isChargingOnly(),
+                                   syncedFolder.isExisting(),
+                                   syncedFolder.isSubfolderByDate(),
+                                   syncedFolder.getUploadAction(),
+                                   syncedFolder.getNameCollisionPolicy().serialize(),
+                                   syncedFolder.isEnabled());
 
             saveOrUpdateSyncedFolder(item);
 
-            // TODO test if notifiyItemChanged is suffiecient (should improve performance)
+            // TODO test if notifyItemChanged is sufficient (should improve performance)
             adapter.notifyDataSetChanged();
         }