Codacy stuff

Signed-off-by: Mario Danic <mario@lovelyhq.com>

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

@@ -72,7 +72,7 @@ public class FilesSyncJob extends Job {
 
         PersistableBundleCompat bundle = params.getExtras();
         final boolean skipCustom = bundle.getBoolean(SKIP_CUSTOM, false);
-        
+
         FilesSyncHelper.restartJobsIfNeeded();
         FilesSyncHelper.insertAllDBEntries(skipCustom);
 
@@ -81,66 +81,64 @@ public class FilesSyncJob extends Job {
         SyncedFolderProvider syncedFolderProvider = new SyncedFolderProvider(contentResolver);
 
         for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
-            if (syncedFolder.isEnabled()) {
-                if (!skipCustom || MediaFolder.CUSTOM != syncedFolder.getType()) {
-                    for (String path : filesystemDataProvider.getFilesForUpload(syncedFolder.getLocalPath(),
-                            Long.toString(syncedFolder.getId()))) {
-                        if (JobManager.instance().getAllJobRequests().size() < 80) {
-                            File file = new File(path);
-
-                            Long lastModificationTime = file.lastModified();
-                            final Locale currentLocale = context.getResources().getConfiguration().locale;
-
-                            if (MediaFolder.IMAGE == syncedFolder.getType()) {
-                                String mimetypeString = FileStorageUtils.getMimeTypeFromName(file.getAbsolutePath());
-                                if ("image/jpeg".equalsIgnoreCase(mimetypeString) || "image/tiff".
-                                        equalsIgnoreCase(mimetypeString)) {
-                                    try {
-                                        ExifInterface exifInterface = new ExifInterface(file.getAbsolutePath());
-                                        String exifDate = exifInterface.getAttribute(ExifInterface.TAG_DATETIME);
-                                        if (!TextUtils.isEmpty(exifDate)) {
-                                            ParsePosition pos = new ParsePosition(0);
-                                            SimpleDateFormat sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss",
-                                                    currentLocale);
-                                            sFormatter.setTimeZone(TimeZone.getTimeZone(TimeZone.getDefault().getID()));
-                                            Date dateTime = sFormatter.parse(exifDate, pos);
-                                            lastModificationTime = dateTime.getTime();
-                                        }
-
-                                    } catch (IOException e) {
-                                        Log_OC.d(TAG, "Failed to get the proper time " + e.getLocalizedMessage());
+            if ((syncedFolder.isEnabled()) && (!skipCustom || MediaFolder.CUSTOM != syncedFolder.getType())) {
+                for (String path : filesystemDataProvider.getFilesForUpload(syncedFolder.getLocalPath(),
+                        Long.toString(syncedFolder.getId()))) {
+                    if (JobManager.instance().getAllJobRequests().size() < 80) {
+                        File file = new File(path);
+
+                        Long lastModificationTime = file.lastModified();
+                        final Locale currentLocale = context.getResources().getConfiguration().locale;
+
+                        if (MediaFolder.IMAGE == syncedFolder.getType()) {
+                            String mimetypeString = FileStorageUtils.getMimeTypeFromName(file.getAbsolutePath());
+                            if ("image/jpeg".equalsIgnoreCase(mimetypeString) || "image/tiff".
+                                    equalsIgnoreCase(mimetypeString)) {
+                                try {
+                                    ExifInterface exifInterface = new ExifInterface(file.getAbsolutePath());
+                                    String exifDate = exifInterface.getAttribute(ExifInterface.TAG_DATETIME);
+                                    if (!TextUtils.isEmpty(exifDate)) {
+                                        ParsePosition pos = new ParsePosition(0);
+                                        SimpleDateFormat sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss",
+                                                currentLocale);
+                                        sFormatter.setTimeZone(TimeZone.getTimeZone(TimeZone.getDefault().getID()));
+                                        Date dateTime = sFormatter.parse(exifDate, pos);
+                                        lastModificationTime = dateTime.getTime();
                                     }
+
+                                } catch (IOException e) {
+                                    Log_OC.d(TAG, "Failed to get the proper time " + e.getLocalizedMessage());
                                 }
                             }
-
-                            boolean needsCharging = syncedFolder.getChargingOnly();
-                            boolean needsWifi = syncedFolder.getWifiOnly();
-
-                            String mimeType = MimeTypeUtil.getBestMimeTypeByFilename(file.getAbsolutePath());
-
-                            Account account = AccountUtils.getOwnCloudAccountByName(context, syncedFolder.getAccount());
-
-                            requester.uploadFileWithOverwrite(
-                                    context,
-                                    account,
-                                    file.getAbsolutePath(),
-                                    FileStorageUtils.getInstantUploadFilePath(
-                                            currentLocale,
-                                            syncedFolder.getRemotePath(), file.getName(),
-                                            lastModificationTime,
-                                            syncedFolder.getSubfolderByDate()),
-                                    syncedFolder.getUploadAction(),
-                                    mimeType,
-                                    true,           // create parent folder if not existent
-                                    UploadFileOperation.CREATED_AS_INSTANT_PICTURE,
-                                    needsWifi,
-                                    needsCharging,
-                                    true
-                            );
-
-                            filesystemDataProvider.updateFilesystemFileAsSentForUpload(path,
-                                    Long.toString(syncedFolder.getId()));
                         }
+
+                        boolean needsCharging = syncedFolder.getChargingOnly();
+                        boolean needsWifi = syncedFolder.getWifiOnly();
+
+                        String mimeType = MimeTypeUtil.getBestMimeTypeByFilename(file.getAbsolutePath());
+
+                        Account account = AccountUtils.getOwnCloudAccountByName(context, syncedFolder.getAccount());
+
+                        requester.uploadFileWithOverwrite(
+                                context,
+                                account,
+                                file.getAbsolutePath(),
+                                FileStorageUtils.getInstantUploadFilePath(
+                                        currentLocale,
+                                        syncedFolder.getRemotePath(), file.getName(),
+                                        lastModificationTime,
+                                        syncedFolder.getSubfolderByDate()),
+                                syncedFolder.getUploadAction(),
+                                mimeType,
+                                true,           // create parent folder if not existent
+                                UploadFileOperation.CREATED_AS_INSTANT_PICTURE,
+                                needsWifi,
+                                needsCharging,
+                                true
+                        );
+
+                        filesystemDataProvider.updateFilesystemFileAsSentForUpload(path,
+                                Long.toString(syncedFolder.getId()));
                     }
                 }
             }

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

@@ -38,21 +38,19 @@ public class NContentObserverJob extends JobService {
     public boolean onStartJob(JobParameters params) {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            if (params.getJobId() == FilesSyncHelper.ContentSyncJobId) {
+            if (params.getJobId() == FilesSyncHelper.ContentSyncJobId && params.getTriggeredContentAuthorities()
+                    != null && params.getTriggeredContentUris() != null
+                    && params.getTriggeredContentUris().length > 0) {
 
-                if (params.getTriggeredContentAuthorities() != null && params.getTriggeredContentUris() != null
-                        && params.getTriggeredContentUris().length > 0) {
+                PersistableBundleCompat persistableBundleCompat = new PersistableBundleCompat();
+                persistableBundleCompat.putBoolean(FilesSyncJob.SKIP_CUSTOM, true);
 
-                    PersistableBundleCompat persistableBundleCompat = new PersistableBundleCompat();
-                    persistableBundleCompat.putBoolean(FilesSyncJob.SKIP_CUSTOM, true);
-
-                    new JobRequest.Builder(FilesSyncJob.TAG)
-                            .setExecutionWindow(1, TimeUnit.SECONDS.toMillis(2))
-                            .setBackoffCriteria(TimeUnit.SECONDS.toMillis(5), JobRequest.BackoffPolicy.LINEAR)
-                            .setUpdateCurrent(false)
-                            .build()
-                            .schedule();
-                }
+                new JobRequest.Builder(FilesSyncJob.TAG)
+                        .setExecutionWindow(1, TimeUnit.SECONDS.toMillis(2))
+                        .setBackoffCriteria(TimeUnit.SECONDS.toMillis(5), JobRequest.BackoffPolicy.LINEAR)
+                        .setUpdateCurrent(false)
+                        .build()
+                        .schedule();
             }
 
             FilesSyncHelper.scheduleNJobs(true);

src/main/java/com/owncloud/android/utils/FilesSyncHelper.java

@@ -95,7 +95,7 @@ public class FilesSyncHelper {
                         currentTimeString);
             } else {
                 FilesSyncHelper.insertContentIntoDB(android.provider.MediaStore.Video.Media.INTERNAL_CONTENT_URI,
-                         syncedFolder);
+                        syncedFolder);
                 FilesSyncHelper.insertContentIntoDB(MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
                         syncedFolder);
             }
@@ -146,8 +146,7 @@ public class FilesSyncHelper {
         SyncedFolderProvider syncedFolderProvider = new SyncedFolderProvider(contentResolver);
 
         for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
-            if (syncedFolder.isEnabled()) {
-                if (!skipCustom || MediaFolder.CUSTOM != syncedFolder.getType())
+            if ((syncedFolder.isEnabled()) && ((MediaFolder.CUSTOM != syncedFolder.getType()) || !skipCustom)) {
                     insertAllDBEntriesForSyncedFolder(syncedFolder);
             }
         }
@@ -253,15 +252,12 @@ public class FilesSyncHelper {
                 getContentResolver());
 
 
-        boolean hasCustomFolders = false;
         boolean hasVideoFolders = false;
         boolean hasImageFolders = false;
 
         if (syncedFolderProvider.getSyncedFolders() != null) {
             for (SyncedFolder syncedFolder : syncedFolderProvider.getSyncedFolders()) {
-                if (MediaFolder.CUSTOM == syncedFolder.getType()) {
-                    hasCustomFolders = true;
-                } else if (MediaFolder.VIDEO == syncedFolder.getType()) {
+                if (MediaFolder.VIDEO == syncedFolder.getType()) {
                     hasVideoFolders = true;
                 } else if (MediaFolder.IMAGE == syncedFolder.getType()) {
                     hasImageFolders = true;
@@ -306,27 +302,25 @@ public class FilesSyncHelper {
                                        boolean force) {
         JobScheduler jobScheduler = MainApp.getAppContext().getSystemService(JobScheduler.class);
 
-        if ((android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) && (hasImageFolders || hasVideoFolders)) {
-            if (!isContentObserverJobScheduled() || force) {
-                JobInfo.Builder builder = new JobInfo.Builder(ContentSyncJobId, new ComponentName(MainApp.getAppContext(),
-                        NContentObserverJob.class.getName()));
-                builder.addTriggerContentUri(new JobInfo.TriggerContentUri(android.provider.MediaStore.
-                        Images.Media.INTERNAL_CONTENT_URI,
-                        JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
-                builder.addTriggerContentUri(new JobInfo.TriggerContentUri(MediaStore.
-                        Images.Media.EXTERNAL_CONTENT_URI,
-                        JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
-                builder.addTriggerContentUri(new JobInfo.TriggerContentUri(android.provider.MediaStore.
-                        Video.Media.INTERNAL_CONTENT_URI,
-                        JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
-                builder.addTriggerContentUri(new JobInfo.TriggerContentUri(MediaStore.
-                        Video.Media.EXTERNAL_CONTENT_URI,
-                        JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
-                builder.setTriggerContentMaxDelay(1500);
-                jobScheduler.schedule(builder.build());
-            }
+        if (((android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) && (hasImageFolders || hasVideoFolders)) &&
+                (!isContentObserverJobScheduled() || force)) {
+            JobInfo.Builder builder = new JobInfo.Builder(ContentSyncJobId, new ComponentName(MainApp.getAppContext(),
+                    NContentObserverJob.class.getName()));
+            builder.addTriggerContentUri(new JobInfo.TriggerContentUri(android.provider.MediaStore.
+                    Images.Media.INTERNAL_CONTENT_URI,
+                    JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
+            builder.addTriggerContentUri(new JobInfo.TriggerContentUri(MediaStore.
+                    Images.Media.EXTERNAL_CONTENT_URI,
+                    JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
+            builder.addTriggerContentUri(new JobInfo.TriggerContentUri(android.provider.MediaStore.
+                    Video.Media.INTERNAL_CONTENT_URI,
+                    JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
+            builder.addTriggerContentUri(new JobInfo.TriggerContentUri(MediaStore.
+                    Video.Media.EXTERNAL_CONTENT_URI,
+                    JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS));
+            builder.setTriggerContentMaxDelay(1500);
+            jobScheduler.schedule(builder.build());
         }
-
     }
 }