fix further codacy issues

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

@@ -30,6 +30,7 @@ public class MediaFoldersModel {
      * default constructor.
      */
     public MediaFoldersModel() {
+        // keep default constructor for GSON
     }
 
     public MediaFoldersModel(List<String> imageMediaFolders, List<String> videoMediaFolders) {

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

@@ -103,7 +103,6 @@ public class MediaFoldersDetectionJob extends Job {
                     }
                 }
 
-
                 for (Account account : accountList) {
                     for (String imageMediaFolder : imageMediaFolderPaths) {
                         if (syncedFolderProvider.findByLocalPathAndAccount(imageMediaFolder,
@@ -158,7 +157,7 @@ public class MediaFoldersDetectionJob extends Job {
                 .setAutoCancel(true)
                 .setContentIntent(pendingIntent);
 
-        if ((android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O)) {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             notificationBuilder.setChannelId(NotificationUtils.NOTIFICATION_CHANNEL_GENERAL);
         }
 

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

@@ -1,4 +1,4 @@
-/**
+/*
  * Nextcloud Android client application
  *
  * @author Mario Danic
@@ -46,19 +46,7 @@ public class NContentObserverJob extends JobService {
                     != null && params.getTriggeredContentUris() != null
                     && params.getTriggeredContentUris().length > 0) {
 
-                SyncedFolderProvider syncedFolderProvider = new SyncedFolderProvider(getContentResolver());
-                if (!PowerUtils.isPowerSaveMode(getApplicationContext()) && syncedFolderProvider
-                        .countEnabledSyncedFolders() > 0) {
-                    PersistableBundleCompat persistableBundleCompat = new PersistableBundleCompat();
-                    persistableBundleCompat.putBoolean(FilesSyncJob.SKIP_CUSTOM, true);
-
-                    new JobRequest.Builder(FilesSyncJob.TAG)
-                            .startNow()
-                            .setExtras(persistableBundleCompat)
-                            .setUpdateCurrent(false)
-                            .build()
-                            .schedule();
-                }
+                checkAndStartFileSyncJob();
 
                 new JobRequest.Builder(MediaFoldersDetectionJob.TAG)
                         .startNow()
@@ -74,6 +62,21 @@ public class NContentObserverJob extends JobService {
         return true;
     }
 
+    private void checkAndStartFileSyncJob() {
+        if (!PowerUtils.isPowerSaveMode(getApplicationContext()) &&
+                new SyncedFolderProvider(getContentResolver()).countEnabledSyncedFolders() > 0) {
+            PersistableBundleCompat persistableBundleCompat = new PersistableBundleCompat();
+            persistableBundleCompat.putBoolean(FilesSyncJob.SKIP_CUSTOM, true);
+
+            new JobRequest.Builder(FilesSyncJob.TAG)
+                    .startNow()
+                    .setExtras(persistableBundleCompat)
+                    .setUpdateCurrent(false)
+                    .build()
+                    .schedule();
+        }
+    }
+
     @Override
     public boolean onStopJob(JobParameters params) {
         return false;

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

@@ -165,9 +165,10 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
         String account;
         Account currentAccount;
         if (getIntent() != null && getIntent().getExtras() != null) {
-            if ((account = getIntent().getExtras().getString(NotificationJob.KEY_NOTIFICATION_ACCOUNT)) != null &&
-                    (currentAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext())) != null &&
-                    !account.equalsIgnoreCase(currentAccount.name)) {
+            account = getIntent().getExtras().getString(NotificationJob.KEY_NOTIFICATION_ACCOUNT);
+            currentAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
+
+            if (account != null && currentAccount != null && !account.equalsIgnoreCase(currentAccount.name)) {
                 AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), account);
                 setAccount(AccountUtils.getCurrentOwnCloudAccount(this));
             }
@@ -265,9 +266,9 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
         }
         setListShown(false);
         final List<MediaFolder> mediaFolders = MediaProvider.getImageFolders(getContentResolver(),
-                perFolderMediaItemLimit, SyncedFoldersActivity.this, false);
+                perFolderMediaItemLimit, this, false);
         mediaFolders.addAll(MediaProvider.getVideoFolders(getContentResolver(), perFolderMediaItemLimit,
-                SyncedFoldersActivity.this, false));
+                this, false));
 
         List<SyncedFolder> syncedFolderArrayList = mSyncedFolderProvider.getSyncedFolders();
         List<SyncedFolder> currentAccountSyncedFoldersList = new ArrayList<>();
@@ -286,11 +287,10 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
         setListShown(true);
 
         if (!TextUtils.isEmpty(path)) {
-            for (int i = 0; i < syncFolderItems.size(); i++) {
-                SyncedFolderDisplayItem syncedFolderDisplayItem = syncFolderItems.get(i);
-                if (syncedFolderDisplayItem.getLocalPath().equalsIgnoreCase(path) &&
-                        syncedFolderDisplayItem.getType().getId().equals(type)) {
-                    onSyncFolderSettingsClick(1, syncedFolderDisplayItem);
+            for(SyncedFolderDisplayItem syncFolderItem : syncFolderItems) {
+                if (syncFolderItem.getLocalPath().equalsIgnoreCase(path) &&
+                        syncFolderItem.getType().getId().equals(type)) {
+                    onSyncFolderSettingsClick(1, syncFolderItem);
                 }
             }
         }