Эх сурвалжийг харах

codacy: Avoid using redundant field initializer

AndyScherzinger 6 жил өмнө
parent
commit
c961b99b7b
41 өөрчлөгдсөн 109 нэмэгдсэн , 115 устгасан
  1. 2 2
      src/main/java/com/owncloud/android/authentication/AccountAuthenticatorActivity.java
  2. 5 5
      src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
  3. 3 3
      src/main/java/com/owncloud/android/files/services/FileDownloader.java
  4. 5 5
      src/main/java/com/owncloud/android/files/services/FileUploader.java
  5. 9 10
      src/main/java/com/owncloud/android/files/services/IndexedForest.java
  6. 1 1
      src/main/java/com/owncloud/android/media/MediaServiceBinder.java
  7. 2 2
      src/main/java/com/owncloud/android/operations/CheckCurrentCredentialsOperation.java
  8. 2 2
      src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
  9. 8 8
      src/main/java/com/owncloud/android/operations/UploadFileOperation.java
  10. 1 1
      src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java
  11. 3 3
      src/main/java/com/owncloud/android/services/OperationsService.java
  12. 1 1
      src/main/java/com/owncloud/android/services/SyncFolderHandler.java
  13. 1 1
      src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
  14. 1 1
      src/main/java/com/owncloud/android/syncadapter/FileSyncService.java
  15. 2 3
      src/main/java/com/owncloud/android/ui/CustomPopup.java
  16. 1 2
      src/main/java/com/owncloud/android/ui/EmptyRecyclerView.java
  17. 1 1
      src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java
  18. 2 2
      src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
  19. 1 1
      src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java
  20. 7 6
      src/main/java/com/owncloud/android/ui/activity/FileActivity.java
  21. 4 4
      src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
  22. 3 3
      src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java
  23. 1 1
      src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java
  24. 2 1
      src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java
  25. 1 1
      src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java
  26. 2 2
      src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java
  27. 2 2
      src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
  28. 5 7
      src/main/java/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java
  29. 1 1
      src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
  30. 3 3
      src/main/java/com/owncloud/android/ui/adapter/ProgressListener.java
  31. 1 1
      src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
  32. 2 2
      src/main/java/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java
  33. 5 5
      src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java
  34. 1 1
      src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java
  35. 2 2
      src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java
  36. 2 2
      src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
  37. 4 4
      src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java
  38. 1 1
      src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
  39. 2 5
      src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java
  40. 2 2
      src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
  41. 5 5
      src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java

+ 2 - 2
src/main/java/com/owncloud/android/authentication/AccountAuthenticatorActivity.java

@@ -34,8 +34,8 @@ import android.support.v7.app.AppCompatActivity;
 
 public class AccountAuthenticatorActivity extends AppCompatActivity {
 
-    private AccountAuthenticatorResponse mAccountAuthenticatorResponse = null;
-    private Bundle mResultBundle = null;
+    private AccountAuthenticatorResponse mAccountAuthenticatorResponse;
+    private Bundle mResultBundle;
 
 
     /**

+ 5 - 5
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -207,10 +207,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
     private TextWatcher mHostUrlInputWatcher;
     private String mServerStatusText = "";
-    private int mServerStatusIcon = 0;
+    private int mServerStatusIcon;
 
-    private boolean mServerIsChecked = false;
-    private boolean mServerIsValid = false;
+    private boolean mServerIsChecked;
+    private boolean mServerIsValid;
 
     private GetServerInfoOperation.ServerInfo mServerInfo = new GetServerInfoOperation.ServerInfo();
 
@@ -227,7 +227,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private WebView mLoginWebView;
 
     private String mAuthStatusText = "";
-    private int mAuthStatusIcon = 0;
+    private int mAuthStatusIcon;
 
     private String mAuthToken = "";
     private AuthenticatorAsyncTask mAsyncTask;
@@ -246,7 +246,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private String webViewPassword;
     private TextInputLayout mUsernameInputLayout;
     private TextInputLayout mPasswordInputLayout;
-    private boolean forceOldLoginMethod = false;
+    private boolean forceOldLoginMethod;
 
     /**
      * {@inheritDoc}

+ 3 - 3
src/main/java/com/owncloud/android/files/services/FileDownloader.java

@@ -91,13 +91,13 @@ public class FileDownloader extends Service
     private Looper mServiceLooper;
     private ServiceHandler mServiceHandler;
     private IBinder mBinder;
-    private OwnCloudClient mDownloadClient = null;
-    private Account mCurrentAccount = null;
+    private OwnCloudClient mDownloadClient;
+    private Account mCurrentAccount;
     private FileDataStorageManager mStorageManager;
 
     private IndexedForest<DownloadFileOperation> mPendingDownloads = new IndexedForest<>();
 
-    private DownloadFileOperation mCurrentDownload = null;
+    private DownloadFileOperation mCurrentDownload;
 
     private NotificationManager mNotificationManager;
     private NotificationCompat.Builder mNotificationBuilder;

+ 5 - 5
src/main/java/com/owncloud/android/files/services/FileUploader.java

@@ -169,18 +169,18 @@ public class FileUploader extends Service
     private Looper mServiceLooper;
     private ServiceHandler mServiceHandler;
     private IBinder mBinder;
-    private OwnCloudClient mUploadClient = null;
-    private Account mCurrentAccount = null;
+    private OwnCloudClient mUploadClient;
+    private Account mCurrentAccount;
     private FileDataStorageManager mStorageManager;
     //since there can be only one instance of an Android service, there also just one db connection.
-    private UploadsStorageManager mUploadsStorageManager = null;
+    private UploadsStorageManager mUploadsStorageManager;
 
-    private IndexedForest<UploadFileOperation> mPendingUploads = new IndexedForest<UploadFileOperation>();
+    private IndexedForest<UploadFileOperation> mPendingUploads = new IndexedForest<>();
 
     /**
      * {@link UploadFileOperation} object of ongoing upload. Can be null. Note: There can only be one concurrent upload!
      */
-    private UploadFileOperation mCurrentUpload = null;
+    private UploadFileOperation mCurrentUpload;
 
     private NotificationManager mNotificationManager;
     private NotificationCompat.Builder mNotificationBuilder;

+ 9 - 10
src/main/java/com/owncloud/android/files/services/IndexedForest.java

@@ -45,10 +45,10 @@ public class IndexedForest<V> {
 
     @SuppressWarnings("PMD.ShortClassName")
     private class Node<V> {
-        private String mKey = null;
-        private Node<V> mParent = null;
+        private String mKey;
+        private Node<V> mParent;
         private Set<Node<V>> mChildren = new HashSet<>();    // TODO be careful with hash()
-        private V mPayload = null;
+        private V mPayload;
 
         // payload is optional
         public Node(String key, V payload) {
@@ -113,8 +113,8 @@ public class IndexedForest<V> {
         } else {
             // value really added
             String currentPath = remotePath;
-            String parentPath = null;
-            String parentKey = null;
+            String parentPath;
+            String parentKey;
             Node<V> currentNode = valuedNode;
             Node<V> parentNode = null;
             boolean linked = false;
@@ -142,7 +142,7 @@ public class IndexedForest<V> {
                 linkedTo = parentNode.getKey().substring(accountName.length());
             }
 
-            return new Pair<String, String>(targetKey, linkedTo);
+            return new Pair<>(targetKey, linkedTo);
         }
     }
 
@@ -156,7 +156,7 @@ public class IndexedForest<V> {
                 return remove(accountName, remotePath);
             }
         }
-        return new Pair<V, String>(null, null);
+        return new Pair<>(null, null);
     }
 
 
@@ -186,10 +186,10 @@ public class IndexedForest<V> {
                 unlinkedFrom = parent.getKey().substring(accountName.length());
             }
 
-            return new Pair<V, String>(firstRemoved.getPayload(), unlinkedFrom);
+            return new Pair<>(firstRemoved.getPayload(), unlinkedFrom);
         }
 
-        return new Pair<V, String>(null, null);
+        return new Pair<>(null, null);
     }
 
     private void removeDescendants(Node<V> removed) {
@@ -246,5 +246,4 @@ public class IndexedForest<V> {
     private String buildKey(String accountName, String remotePath) {
         return accountName + remotePath;
     }
-
 }

+ 1 - 1
src/main/java/com/owncloud/android/media/MediaServiceBinder.java

@@ -43,7 +43,7 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP
     /**
      * {@link MediaService} instance to access with the binder
      */
-    private MediaService mService = null;
+    private MediaService mService;
 
     /**
      * Public constructor

+ 2 - 2
src/main/java/com/owncloud/android/operations/CheckCurrentCredentialsOperation.java

@@ -36,7 +36,7 @@ import java.util.ArrayList;
  */
 public class CheckCurrentCredentialsOperation extends SyncOperation {
 
-    private Account mAccount = null;
+    private Account mAccount;
 
     public CheckCurrentCredentialsOperation(Account account) {
         if (account == null) {
@@ -55,7 +55,7 @@ public class CheckCurrentCredentialsOperation extends SyncOperation {
         } else {
             RemoteOperation check = new ExistenceCheckRemoteOperation(OCFile.ROOT_PATH, false);
             result = check.execute(client);
-            ArrayList<Object> data = new ArrayList<Object>();
+            ArrayList<Object> data = new ArrayList<>();
             data.add(mAccount);
             result.setData(data);
         }

+ 2 - 2
src/main/java/com/owncloud/android/operations/DownloadFileOperation.java

@@ -56,8 +56,8 @@ public class DownloadFileOperation extends RemoteOperation {
     private OCFile mFile;
     private String mBehaviour;
     private Context mContext;
-    private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<OnDatatransferProgressListener>();
-    private long mModificationTimestamp = 0;
+    private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
+    private long mModificationTimestamp;
     private String mEtag = "";
     private final AtomicBoolean mCancellationRequested = new AtomicBoolean(false);
     

+ 8 - 8
src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -111,18 +111,18 @@ public class UploadFileOperation extends SyncOperation {
      * (if forceOverwrite==false and remote file already exists).
      */
     private OCFile mOldFile;
-    private String mRemotePath = null;
+    private String mRemotePath;
     private String mFolderUnlockToken;
-    private boolean mRemoteFolderToBeCreated = false;
-    private boolean mForceOverwrite = false;
+    private boolean mRemoteFolderToBeCreated;
+    private boolean mForceOverwrite;
     private int mLocalBehaviour = FileUploader.LOCAL_BEHAVIOUR_COPY;
     private int mCreatedBy = CREATED_BY_USER;
-    private boolean mOnWifiOnly = false;
-    private boolean mWhileChargingOnly = false;
-    private boolean mIgnoringPowerSaveMode = false;
+    private boolean mOnWifiOnly;
+    private boolean mWhileChargingOnly;
+    private boolean mIgnoringPowerSaveMode;
 
-    private boolean mWasRenamed = false;
-    private long mOCUploadId = -1;
+    private boolean mWasRenamed;
+    private long mOCUploadId;
     /**
      * Local path to file which is to be uploaded (before any possible renaming or moving).
      */

+ 1 - 1
src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java

@@ -66,7 +66,7 @@ public class DocumentsStorageProvider extends DocumentsProvider {
 
     private static final String TAG = "DocumentsStorageProvider";
 
-    private FileDataStorageManager mCurrentStorageManager = null;
+    private FileDataStorageManager mCurrentStorageManager;
     private static Map<Long, FileDataStorageManager> mRootIdToStorageManager;
 
     @Override

+ 3 - 3
src/main/java/com/owncloud/android/services/OperationsService.java

@@ -138,9 +138,9 @@ public class OperationsService extends Service {
             mUndispatchedFinishedOperations = new ConcurrentHashMap<>();
 
     private static class Target {
-        public Uri mServerUrl = null;
-        public Account mAccount = null;
-        public String mCookie = null;
+        public Uri mServerUrl;
+        public Account mAccount;
+        public String mCookie;
 
         public Target(Account account, Uri serverUrl, String cookie) {
             mAccount = account;

+ 1 - 1
src/main/java/com/owncloud/android/services/SyncFolderHandler.java

@@ -55,7 +55,7 @@ class SyncFolderHandler extends Handler {
 
     private IndexedForest<SynchronizeFolderOperation> mPendingOperations = new IndexedForest<>();
 
-    private Account mCurrentAccount = null;
+    private Account mCurrentAccount;
     private FileDataStorageManager mStorageManager;
     private SynchronizeFolderOperation mCurrentSyncOperation;
 

+ 1 - 1
src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java

@@ -52,7 +52,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
     private ContentProviderClient mContentProviderClient;
     private FileDataStorageManager mStoreManager;
 
-    private OwnCloudClient mClient = null;
+    private OwnCloudClient mClient;
 
     public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
         super(context, autoInitialize);

+ 1 - 1
src/main/java/com/owncloud/android/syncadapter/FileSyncService.java

@@ -33,7 +33,7 @@ import android.os.IBinder;
 public class FileSyncService extends Service {
     
     // Storage for an instance of the sync adapter
-    private static FileSyncAdapter sSyncAdapter = null;
+    private static FileSyncAdapter sSyncAdapter;
     // Object to use as a thread-safe lock
     private static final Object sSyncAdapterLock = new Object();
     

+ 2 - 3
src/main/java/com/owncloud/android/ui/CustomPopup.java

@@ -39,7 +39,7 @@ public class CustomPopup {
     protected final View mAnchor;
     protected final PopupWindow mWindow;
     private View root;
-    private Drawable background = null;
+    private Drawable background;
     protected final WindowManager mWManager;
 
     public CustomPopup(View anchor) {
@@ -57,8 +57,7 @@ public class CustomPopup {
             }
         });
 
-        mWManager = (WindowManager) anchor.getContext().getSystemService(
-                Context.WINDOW_SERVICE);
+        mWManager = (WindowManager) anchor.getContext().getSystemService(Context.WINDOW_SERVICE);
         onCreate();
     }
 

+ 1 - 2
src/main/java/com/owncloud/android/ui/EmptyRecyclerView.java

@@ -31,10 +31,9 @@ import android.view.View;
  * Extends RecyclerView to show a custom view if no data is available
  * Inspired by http://alexzh.com/tutorials/how-to-setemptyview-to-recyclerview
  */
-
 public class EmptyRecyclerView extends RecyclerView {
     private View mEmptyView;
-    private boolean hasFooter = false;
+    private boolean hasFooter;
 
     public EmptyRecyclerView(Context context) {
         super(context);

+ 1 - 1
src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java

@@ -35,7 +35,7 @@ public class ActivitiesPresenter implements ActivitiesContract.ActionListener {
     private final ActivitiesContract.View activitiesView;
     private final ActivitiesRepository activitiesRepository;
     private final FilesRepository filesRepository;
-    private boolean activityStopped = false;
+    private boolean activityStopped;
 
 
     ActivitiesPresenter(@NonNull ActivitiesRepository activitiesRepository,

+ 2 - 2
src/main/java/com/owncloud/android/ui/activity/BaseActivity.java

@@ -36,7 +36,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     /**
      * Flag to signal that the activity will is finishing to enforce the creation of an ownCloud {@link Account}.
      */
-    private boolean mRedirectingToSetupAccount = false;
+    private boolean mRedirectingToSetupAccount;
 
     /**
      * Flag to signal when the value of mAccount was set.
@@ -51,7 +51,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     /**
      * Access point to the cached database for the current ownCloud {@link Account}.
      */
-    private FileDataStorageManager mStorageManager = null;
+    private FileDataStorageManager mStorageManager;
 
     @Override
     protected void onNewIntent (Intent intent) {

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java

@@ -53,7 +53,7 @@ public class ExternalSiteWebView extends FileActivity {
 
     private static final String TAG = ExternalSiteWebView.class.getSimpleName();
 
-    private boolean showSidebar = false;
+    private boolean showSidebar;
     private int menuItemId;
     private WebView webview;
 

+ 7 - 6
src/main/java/com/owncloud/android/ui/activity/FileActivity.java

@@ -118,15 +118,16 @@ public abstract class FileActivity extends DrawerActivity
 
     private FileOperationsHelper mFileOperationsHelper;
 
-    private ServiceConnection mOperationsServiceConnection = null;
+    private ServiceConnection mOperationsServiceConnection;
 
-    private OperationsServiceBinder mOperationsServiceBinder = null;
+    private OperationsServiceBinder mOperationsServiceBinder;
 
-    private boolean mResumed = false;
+    private boolean mResumed;
 
-    protected FileDownloaderBinder mDownloaderBinder = null;
-    protected FileUploaderBinder mUploaderBinder = null;
-    private ServiceConnection mDownloadServiceConnection, mUploadServiceConnection = null;
+    protected FileDownloaderBinder mDownloaderBinder;
+    protected FileUploaderBinder mUploaderBinder;
+    private ServiceConnection mDownloadServiceConnection;
+    private ServiceConnection mUploadServiceConnection;
 
 
 

+ 4 - 4
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -158,7 +158,7 @@ public class FileDisplayActivity extends HookActivity
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadFinishReceiver mUploadFinishReceiver;
     private DownloadFinishReceiver mDownloadFinishReceiver;
-    private RemoteOperationResult mLastSslUntrustedServerResult = null;
+    private RemoteOperationResult mLastSslUntrustedServerResult;
 
     private boolean mDualPane;
     private View mLeftFragmentContainer;
@@ -192,14 +192,14 @@ public class FileDisplayActivity extends HookActivity
 
     private OCFile mWaitingToPreview;
 
-    private boolean mSyncInProgress = false;
+    private boolean mSyncInProgress;
 
     private OCFile mWaitingToSend;
 
     private Collection<MenuItem> mDrawerMenuItemstoShowHideList;
 
-    private MediaServiceBinder mMediaServiceBinder =  null;
-    private MediaServiceConnection mMediaServiceConnection = null;
+    private MediaServiceBinder mMediaServiceBinder;
+    private MediaServiceConnection mMediaServiceConnection;
 
     private String searchQuery;
 

+ 3 - 3
src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -78,10 +78,10 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
 
     private static final String TAG_LIST_OF_FOLDERS = "LIST_OF_FOLDERS";
        
-    private boolean mSyncInProgress = false;
+    private boolean mSyncInProgress;
 
-    private boolean mSearchOnlyFolders = false;
-    private boolean mDoNotEnterEncryptedFolder = false;
+    private boolean mSearchOnlyFolders;
+    private boolean mDoNotEnterEncryptedFolder;
 
     protected Button mCancelBtn;
     protected Button mChooseBtn;

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java

@@ -62,7 +62,7 @@ public class LogHistoryActivity extends ToolbarActivity {
     private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
 
     private String mLogPath = Log_OC.getLogPath();
-    private File logDIR = null;
+    private File logDIR;
     private String mLogText;
 
 

+ 2 - 1
src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java

@@ -87,7 +87,8 @@ public class ManageAccountsActivity extends FileActivity
     private final Handler mHandler = new Handler();
     private String mAccountName;
     private AccountListAdapter mAccountListAdapter;
-    private ServiceConnection mDownloadServiceConnection, mUploadServiceConnection = null;
+    private ServiceConnection mDownloadServiceConnection;
+    private ServiceConnection mUploadServiceConnection;
     Set<String> mOriginalAccounts;
     String mOriginalCurrentAccount;
     private Drawable mTintedCheck;

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java

@@ -104,7 +104,7 @@ public class NotificationsActivity extends FileActivity {
     private Unbinder unbinder;
 
     private NotificationListAdapter adapter;
-    private Snackbar snackbar = null;
+    private Snackbar snackbar;
     private OwnCloudClient client;
     private Account currentAccount;
 

+ 2 - 2
src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java

@@ -46,7 +46,7 @@ import com.owncloud.android.utils.ThemeUtils;
 
 import java.util.Arrays;
 
-public class PassCodeActivity extends AppCompatActivity {
+public class    PassCodeActivity extends AppCompatActivity {
 
     private static final String TAG = PassCodeActivity.class.getSimpleName();
 
@@ -70,7 +70,7 @@ public class PassCodeActivity extends AppCompatActivity {
 
     private String [] mPassCodeDigits = {"","","",""};
     private static final String KEY_PASSCODE_DIGITS = "PASSCODE_DIGITS";
-    private boolean mConfirmingPassCode = false;
+    private boolean mConfirmingPassCode;
     private static final String KEY_CONFIRMING_PASSCODE = "CONFIRMING_PASSCODE";
 
     private boolean mBChange = true; // to control that only one blocks jump

+ 2 - 2
src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -139,14 +139,14 @@ public class ReceiveExternalFilesActivity extends FileActivity
     private OCFile mFile;
 
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
-    private boolean mSyncInProgress = false;
+    private boolean mSyncInProgress;
 
     private final static int REQUEST_CODE__SETUP_ACCOUNT = REQUEST_CODE__LAST_SHARED + 1;
 
     private final static String KEY_PARENTS = "PARENTS";
     private final static String KEY_FILE = "FILE";
 
-    private boolean mUploadFromTmpFile = false;
+    private boolean mUploadFromTmpFile;
     private String mSubjectText;
     private String mExtraText;
 

+ 5 - 7
src/main/java/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java

@@ -21,7 +21,6 @@
 package com.owncloud.android.ui.adapter;
 
 import android.view.View;
-import android.widget.TextView;
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
@@ -29,13 +28,12 @@ import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 
 /**
  * TODO
- *
  */
 public class CertificateCombinedExceptionViewAdapter implements SslUntrustedCertDialog.ErrorViewAdapter {
     
     //private final static String TAG = CertificateCombinedExceptionViewAdapter.class.getSimpleName();
     
-    private CertificateCombinedException mSslException = null;
+    private CertificateCombinedException mSslException;
     
     public CertificateCombinedExceptionViewAdapter(CertificateCombinedException sslException) {
         mSslException = sslException;
@@ -48,25 +46,25 @@ public class CertificateCombinedExceptionViewAdapter implements SslUntrustedCert
        
         /// refresh
         if (mSslException.getCertPathValidatorException() != null) {
-            ((TextView)dialogView.findViewById(R.id.reason_cert_not_trusted)).setVisibility(View.VISIBLE);
+            dialogView.findViewById(R.id.reason_cert_not_trusted).setVisibility(View.VISIBLE);
         } else {
             dialogView.findViewById(R.id.reason_cert_not_trusted).setVisibility(View.GONE);
         }
         
         if (mSslException.getCertificateExpiredException() != null) {
-            ((TextView)dialogView.findViewById(R.id.reason_cert_expired)).setVisibility(View.VISIBLE);
+            dialogView.findViewById(R.id.reason_cert_expired).setVisibility(View.VISIBLE);
         } else {
             dialogView.findViewById(R.id.reason_cert_expired).setVisibility(View.GONE);
         }
         
         if (mSslException.getCertificateNotYetValidException() != null) {
-            ((TextView)dialogView.findViewById(R.id.reason_cert_not_yet_valid)).setVisibility(View.VISIBLE);
+            dialogView.findViewById(R.id.reason_cert_not_yet_valid).setVisibility(View.VISIBLE);
         } else {
             dialogView.findViewById(R.id.reason_cert_not_yet_valid).setVisibility(View.GONE);
         }
 
         if (mSslException.getSslPeerUnverifiedException() != null) {
-            ((TextView)dialogView.findViewById(R.id.reason_hostname_not_verified)).setVisibility(View.VISIBLE);
+            dialogView.findViewById(R.id.reason_hostname_not_verified).setVisibility(View.VISIBLE);
         } else {
             dialogView.findViewById(R.id.reason_hostname_not_verified).setVisibility(View.GONE);
         }

+ 1 - 1
src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -91,7 +91,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private List<OCFile> mFilesAll = new ArrayList<>();
     private boolean mHideItemOptions;
     private boolean gridView;
-    private boolean multiSelect = false;
+    private boolean multiSelect;
     private HashSet<OCFile> checkedFiles;
 
     private FileDataStorageManager mStorageManager;

+ 3 - 3
src/main/java/com/owncloud/android/ui/adapter/ProgressListener.java

@@ -31,9 +31,9 @@ import java.lang.ref.WeakReference;
  * Progress listener for file transfers.
  */
 public class ProgressListener implements OnDatatransferProgressListener {
-    private int mLastPercent = 0;
-    private OCUpload mUpload = null;
-    private WeakReference<ProgressBar> mProgressBar = null;
+    private int mLastPercent;
+    private OCUpload mUpload;
+    private WeakReference<ProgressBar> mProgressBar;
 
     public ProgressListener(OCUpload upload, ProgressBar progressBar) {
         mUpload = upload;

+ 1 - 1
src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -73,7 +73,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
 
     private UploadsStorageManager mUploadsStorageManager;
 
-    private UploadGroup[] mUploadGroups = null;
+    private UploadGroup[] mUploadGroups;
 
     @Override
     public int getSectionCount() {

+ 2 - 2
src/main/java/com/owncloud/android/ui/dialog/CredentialsDialogFragment.java

@@ -45,8 +45,8 @@ import com.owncloud.android.authentication.AuthenticatorActivity;
 public class CredentialsDialogFragment extends DialogFragment
     implements DialogInterface.OnClickListener {
 
-    private WebView mWebView = null;
-    private HttpAuthHandler mHandler = null;
+    private WebView mWebView;
+    private HttpAuthHandler mHandler;
 
     private EditText mUsernameET;
     private EditText mPasswordET;

+ 5 - 5
src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java

@@ -57,12 +57,12 @@ public class SslUntrustedCertDialog extends DialogFragment {
     
     private final static String TAG = SslUntrustedCertDialog.class.getSimpleName();
     
-    protected View mView = null;
-    protected SslErrorHandler mHandler = null;
-    protected X509Certificate m509Certificate = null;
+    protected View mView;
+    protected SslErrorHandler mHandler;
+    protected X509Certificate m509Certificate;
 
-    private ErrorViewAdapter mErrorViewAdapter = null;
-    private CertificateViewAdapter mCertificateViewAdapter = null;
+    private ErrorViewAdapter mErrorViewAdapter;
+    private CertificateViewAdapter mCertificateViewAdapter;
     
     public static SslUntrustedCertDialog newInstanceForEmptySslError(SslError error, SslErrorHandler handler) {
         if (error == null) {

+ 1 - 1
src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java

@@ -65,7 +65,7 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
     public static final int REQUEST_CODE__SELECT_LOCAL_FOLDER = 1;
     private final static String TAG = SyncedFolderPreferencesDialogFragment.class.getSimpleName();
     private static final String BEHAVIOUR_DIALOG_STATE = "BEHAVIOUR_DIALOG_STATE";
-    protected View mView = null;
+    protected View mView;
     private CharSequence[] mUploadBehaviorItemStrings;
     private SwitchCompat mEnabledSwitch;
     private AppCompatCheckBox mUploadOnWifiCheckbox;

+ 2 - 2
src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java

@@ -49,10 +49,10 @@ public class LocalFileListFragment extends ExtendedListFragment implements Local
     private LocalFileListFragment.ContainerActivity mContainerActivity;
 
     /** Directory to show */
-    private File mDirectory = null;
+    private File mDirectory;
 
     /** Adapter to connect the data from the directory with the View object */
-    private LocalFileListAdapter mAdapter = null;
+    private LocalFileListAdapter mAdapter;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

+ 2 - 2
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -153,7 +153,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
     private FileFragment.ContainerActivity mContainerActivity;
 
-    private OCFile mFile = null;
+    private OCFile mFile;
     private OCFileListAdapter mAdapter;
     private boolean mOnlyFoldersClickable;
 
@@ -169,7 +169,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
     private BottomNavigationView bottomNavigationView;
 
     private SearchType currentSearchType;
-    private boolean searchFragment = false;
+    private boolean searchFragment;
     private SearchEvent searchEvent;
     private AsyncTask remoteOperationAsyncTask;
 

+ 4 - 4
src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java

@@ -129,22 +129,22 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
     /**
      * Listener for user actions to set, update or clear password on public link.
      */
-    private OnPasswordInteractionListener mOnPasswordInteractionListener = null;
+    private OnPasswordInteractionListener mOnPasswordInteractionListener;
 
     /**
      * Listener for user actions to set, update or clear expiration date on public link.
      */
-    private OnExpirationDateInteractionListener mOnExpirationDateInteractionListener = null;
+    private OnExpirationDateInteractionListener mOnExpirationDateInteractionListener;
 
     /**
      * Listener for user actions to set or unset edit permission on public link.
      */
-    private OnEditPermissionInteractionListener mOnEditPermissionInteractionListener = null;
+    private OnEditPermissionInteractionListener mOnEditPermissionInteractionListener;
 
     /**
      * Listener for user actions to set or unset hide file listing permission on public link.
      */
-    private OnHideFileListingPermissionInteractionListener mOnHideFileListingPermissionInteractionListener = null;
+    private OnHideFileListingPermissionInteractionListener mOnHideFileListingPermissionInteractionListener;
 
     /**
      * Public factory method to create new ShareFileFragment instances.

+ 1 - 1
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -89,7 +89,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
     @BindView(R.id.contacts_backup_now)
     public AppCompatButton backupNow;
 
-    private Date selectedDate = null;
+    private Date selectedDate;
     private boolean calendarPickerOpen;
 
     private DatePickerDialog datePickerDialog;

+ 2 - 5
src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java

@@ -75,13 +75,10 @@ public class PreviewImageActivity extends FileActivity implements
 
     private ViewPager mViewPager;
     private PreviewImagePagerAdapter mPreviewImagePagerAdapter;
-    private int mSavedPosition = 0;
-    private boolean mHasSavedPosition = false;
-    
+    private int mSavedPosition;
+    private boolean mHasSavedPosition;
     private boolean mRequestWaitingForBinder;
-    
     private DownloadFinishReceiver mDownloadFinishReceiver;
-    
     private View mFullScreenAnchorView;
 
     @Override

+ 2 - 2
src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -105,9 +105,9 @@ public class PreviewImageFragment extends FileFragment {
     private ImageView mMultiListIcon;
     private ProgressBar mMultiListProgress;
 
-    private Boolean mShowResizedImage = false;
+    private Boolean mShowResizedImage;
 
-    private Bitmap mBitmap = null;
+    private Bitmap mBitmap;
 
     private static final String TAG = PreviewImageFragment.class.getSimpleName();
 

+ 5 - 5
src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -110,11 +110,11 @@ public class PreviewMediaFragment extends FileFragment implements
     protected ImageView mMultiListIcon;
     protected ProgressBar mMultiListProgress;
 
-    private MediaServiceBinder mMediaServiceBinder = null;
-    private MediaControlView mMediaController = null;
-    private MediaServiceConnection mMediaServiceConnection = null;
+    private MediaServiceBinder mMediaServiceBinder;
+    private MediaControlView mMediaController;
+    private MediaServiceConnection mMediaServiceConnection;
     private boolean mAutoplay;
-    private static boolean mOnResume = false;
+    private static boolean mOnResume;
     public boolean mPrepared;
 
     private Uri mVideoUri;
@@ -128,7 +128,7 @@ public class PreviewMediaFragment extends FileFragment implements
 
     /**
      * Creates a fragment to preview a file.
-     * <p/>
+     *
      * When 'fileToDetail' or 'ocAccount' are null
      *
      * @param fileToDetail An {@link OCFile} to preview in the fragment