fix codacy findings

src/com/owncloud/android/datamodel/OCFile.java

@@ -30,7 +30,6 @@ import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.v4.content.FileProvider;
-import android.webkit.MimeTypeMap;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.network.WebdavUtils;

src/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java

@@ -46,7 +46,7 @@ abstract class AbstractCommandLineStoragePoint extends AbstractStoragePointProvi
             return false;
         }
         return process != null && process.exitValue() == COMMAND_LINE_OK_RETURN_VALUE;
-    }
+    }#
 
     String getCommandLineResult() {
         StringBuilder s = new StringBuilder();

src/com/owncloud/android/operations/SynchronizeFileOperation.java

@@ -24,7 +24,6 @@ package com.owncloud.android.operations;
 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
@@ -41,7 +40,6 @@ import com.owncloud.android.utils.FileStorageUtils;
 /**
  * Remote operation performing the read of remote file in the ownCloud server.
  */
-
 public class SynchronizeFileOperation extends SyncOperation {
 
     private static final String TAG = SynchronizeFileOperation.class.getSimpleName();
@@ -71,7 +69,7 @@ public class SynchronizeFileOperation extends SyncOperation {
      * <p/>
      * Useful for direct synchronization of a single file.
      *
-     * @param
+     * @param remotePath       remote path of the file
      * @param account          ownCloud account holding the file.
      * @param syncFileContents When 'true', transference of data will be started by the
      *                         operation if needed and no conflict is detected.
@@ -206,7 +204,7 @@ public class SynchronizeFileOperation extends SyncOperation {
             if (mServerFile != null) {
 
                 /// check changes in server and local file
-                boolean serverChanged = false;
+                boolean serverChanged;
                 if (mLocalFile.getEtag() == null || mLocalFile.getEtag().length() == 0) {
                     // file uploaded (null) or downloaded ("") before upgrade to version 1.8.0; check the old condition
                     serverChanged = mServerFile.getModificationTimestamp() !=

src/com/owncloud/android/services/SyncFolderHandler.java

@@ -52,10 +52,9 @@ class SyncFolderHandler extends Handler {
     private static final String TAG = SyncFolderHandler.class.getSimpleName();
 
 
-    OperationsService mService;
+    private OperationsService mService;
 
-    private IndexedForest<SynchronizeFolderOperation> mPendingOperations =
-            new IndexedForest<SynchronizeFolderOperation>();
+    private IndexedForest<SynchronizeFolderOperation> mPendingOperations = new IndexedForest<>();
 
     private OwnCloudClient mOwnCloudClient = null;
     private Account mCurrentAccount = null;
@@ -123,9 +122,7 @@ class SyncFolderHandler extends Handler {
 
                 result = mCurrentSyncOperation.execute(mOwnCloudClient, mStorageManager);
 
-            } catch (AccountsException e) {
-                Log_OC.e(TAG, "Error while trying to get authorization", e);
-            } catch (IOException e) {
+            } catch (AccountsException | IOException e) {
                 Log_OC.e(TAG, "Error while trying to get authorization", e);
             } finally {
                 mPendingOperations.removePayload(account.name, remotePath);
@@ -202,6 +199,4 @@ class SyncFolderHandler extends Handler {
         finished.putExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, success);
         mService.sendStickyBroadcast(finished);
     }
-
-
 }

src/com/owncloud/android/ui/activity/LogHistoryActivity.java

@@ -42,7 +42,6 @@ import com.owncloud.android.utils.FileStorageUtils;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;

src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -60,7 +60,6 @@ import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;

src/com/owncloud/android/ui/activity/StorageMigration.java

@@ -45,18 +45,17 @@ import java.io.File;
 public class StorageMigration {
     private static final String TAG = StorageMigration.class.getName();
 
-    public interface StorageMigrationProgressListener {
-        void onStorageMigrationFinished(String storagePath, boolean succeed);
-        void onCancelMigration();
-    }
-
-    private ProgressDialog mProgressDialog;
     private Context mContext;
     private String mSourceStoragePath;
     private String mTargetStoragePath;
 
     private StorageMigrationProgressListener mListener;
 
+    public interface StorageMigrationProgressListener {
+        void onStorageMigrationFinished(String storagePath, boolean succeed);
+        void onCancelMigration();
+    }
+
     public StorageMigration(Context context, String sourcePath, String targetPath) {
         mContext = context;
         mSourceStoragePath = sourcePath;
@@ -291,7 +290,7 @@ public class StorageMigration {
                 this.mResId = resId;
             }
 
-            int getResId() { return mResId; }
+            private int getResId() { return mResId; }
         }
 
         public FileMigrationTask(Context context,
@@ -353,7 +352,7 @@ public class StorageMigration {
         }
 
 
-        void checkDestinationAvailability() throws MigrationException {
+        private void checkDestinationAvailability() throws MigrationException {
             File srcFile = new File(mStorageSource);
             File dstFile = new File(mStorageTarget);
 
@@ -374,14 +373,14 @@ public class StorageMigration {
             }
         }
 
-        void copyFiles() throws MigrationException {
+        private void copyFiles() throws MigrationException {
             File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
             File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
 
             copyDirs(srcFile, dstFile);
         }
 
-        void copyDirs(File src, File dst) throws MigrationException {
+        private void copyDirs(File src, File dst) throws MigrationException {
             if (!dst.mkdirs()) {
                 throw new MigrationException(R.string.file_migration_failed_while_coping);
             }
@@ -396,7 +395,7 @@ public class StorageMigration {
 
         }
 
-        void updateIndex(Context context) throws MigrationException {
+        private void updateIndex(Context context) throws MigrationException {
             FileDataStorageManager manager = new FileDataStorageManager(null, context.getContentResolver());
 
             try {
@@ -407,7 +406,7 @@ public class StorageMigration {
             }
         }
 
-        void cleanup() {
+        private void cleanup() {
             File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
             if (!deleteRecursive(srcFile)) {
                 Log_OC.w(TAG, "Migration cleanup step failed");
@@ -415,7 +414,7 @@ public class StorageMigration {
             srcFile.delete();
         }
 
-        boolean deleteRecursive(File f) {
+        private boolean deleteRecursive(File f) {
             boolean res = true;
             if (f.isDirectory()) {
                 for (File c : f.listFiles()) {
@@ -425,7 +424,7 @@ public class StorageMigration {
             return f.delete() && res;
         }
 
-        void rollback() {
+        private void rollback() {
             File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
             if (dstFile.exists() && !dstFile.delete()) {
                 Log_OC.w(TAG, "Rollback step failed");

src/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -52,10 +52,8 @@ import com.owncloud.android.ui.dialog.ShareLinkToDialog;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -496,8 +494,7 @@ public class FileOperationsHelper {
 
     public void sendDownloadedFile(OCFile file) {
         if (file != null) {
-            String storagePath = file.getStoragePath();
-            Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND);
+            Intent sendIntent = new Intent(Intent.ACTION_SEND);
             // set MimeType
             sendIntent.setType(file.getMimetype());
             sendIntent.putExtra(

src/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -27,7 +27,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
-import com.owncloud.android.lib.resources.shares.UpdateRemoteShareOperation;
 import com.owncloud.android.operations.CopyFileOperation;
 import com.owncloud.android.operations.CreateFolderOperation;
 import com.owncloud.android.operations.CreateShareViaLinkOperation;
@@ -309,12 +308,8 @@ public class ErrorMessageAdapter {
     }
 
     private static boolean isNetworkError(RemoteOperationResult.ResultCode code) {
-        if (code == ResultCode.WRONG_CONNECTION ||
+        return code == ResultCode.WRONG_CONNECTION ||
                 code == ResultCode.TIMEOUT ||
-                code == ResultCode.HOST_NOT_AVAILABLE) {
-            return true;
-        } else {
-            return false;
-        }
+                code == ResultCode.HOST_NOT_AVAILABLE;
     }
 }