Browse Source

codacy: avoid using redundant field initializer

AndyScherzinger 6 years ago
parent
commit
df18d6eccc
20 changed files with 34 additions and 41 deletions
  1. 1 1
      src/main/java/com/owncloud/android/MainApp.java
  2. 2 2
      src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
  3. 2 2
      src/main/java/com/owncloud/android/authentication/PassCodeManager.java
  4. 2 2
      src/main/java/com/owncloud/android/media/MediaService.java
  5. 2 5
      src/main/java/com/owncloud/android/operations/GetServerInfoOperation.java
  6. 1 2
      src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java
  7. 2 2
      src/main/java/com/owncloud/android/operations/UploadFileOperation.java
  8. 6 8
      src/main/java/com/owncloud/android/services/OperationsService.java
  9. 1 1
      src/main/java/com/owncloud/android/ui/ExtendedListView.java
  10. 3 3
      src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
  11. 1 1
      src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
  12. 0 1
      src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java
  13. 1 1
      src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java
  14. 1 1
      src/main/java/com/owncloud/android/ui/dialog/SslValidatorDialog.java
  15. 3 3
      src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
  16. 1 1
      src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
  17. 1 1
      src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
  18. 2 2
      src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java
  19. 1 1
      src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
  20. 1 1
      src/main/java/com/owncloud/android/utils/BitmapUtils.java

+ 1 - 1
src/main/java/com/owncloud/android/MainApp.java

@@ -109,7 +109,7 @@ public class MainApp extends MultiDexApplication {
 
     private static String storagePath;
 
-    private static boolean mOnlyOnDevice = false;
+    private static boolean mOnlyOnDevice;
 
     private SharedPreferences appPrefs;
     @SuppressWarnings("unused")

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

@@ -196,8 +196,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
     /// activity-level references / state
     private final Handler mHandler = new Handler();
-    private ServiceConnection mOperationsServiceConnection = null;
-    private OperationsServiceBinder mOperationsServiceBinder = null;
+    private ServiceConnection mOperationsServiceConnection;
+    private OperationsServiceBinder mOperationsServiceBinder;
     private AccountManager mAccountMgr;
     private Uri mNewCapturedUriFromOAuth2Redirection;
 

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

@@ -53,10 +53,10 @@ public class PassCodeManager {
     private static final int PASS_CODE_TIMEOUT = 1000;
         // keeping a "low" positive value is the easiest way to prevent the pass code is requested on rotations
 
-    private static PassCodeManager passCodeManagerInstance = null;
+    private static PassCodeManager passCodeManagerInstance;
 
     private Long timestamp = 0L;
-    private int visibleActivitiesCounter = 0;
+    private int visibleActivitiesCounter;
 
     public static PassCodeManager getPassCodeManager() {
         if (passCodeManagerInstance == null) {

+ 2 - 2
src/main/java/com/owncloud/android/media/MediaService.java

@@ -100,10 +100,10 @@ public class MediaService extends Service implements OnCompletionListener, OnPre
     private static final float DUCK_VOLUME = 0.1f;
 
     /** Media player instance */
-    private MediaPlayer mPlayer = null;
+    private MediaPlayer mPlayer;
 
     /** Reference to the system AudioManager */
-    private AudioManager mAudioManager = null;
+    private AudioManager mAudioManager;
 
 
     /** Values to indicate the state of the service */

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

@@ -49,7 +49,6 @@ public class GetServerInfoOperation extends RemoteOperation {
     
     private String mUrl;
     private Context mContext;
-    
     private ServerInfo mResultData;
 
     /** 
@@ -62,11 +61,9 @@ public class GetServerInfoOperation extends RemoteOperation {
     public GetServerInfoOperation(String url, Context context) {
         mUrl = trimWebdavSuffix(url);
         mContext = context;
-        
         mResultData = new ServerInfo();
     }
     
-    
     /**
      * Performs the operation
      * 
@@ -143,10 +140,10 @@ public class GetServerInfoOperation extends RemoteOperation {
     
     
     public static class ServerInfo {
-        public OwnCloudVersion mVersion = null;
+        public OwnCloudVersion mVersion;
         public String mBaseUrl = "";
         public AuthenticationMethod mAuthMethod = AuthenticationMethod.UNKNOWN;
-        public boolean mIsSslConn = false;
+        public boolean mIsSslConn;
     }
 	
 }

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

@@ -50,8 +50,7 @@ public class SynchronizeFileOperation extends SyncOperation {
     private Account mAccount;
     private boolean mSyncFileContents;
     private Context mContext;
-
-    private boolean mTransferWasRequested = false;
+    private boolean mTransferWasRequested;
 
     /**
      * When 'false', uploads to the server are not done; only downloads or conflict detection.

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

@@ -127,7 +127,7 @@ public class UploadFileOperation extends SyncOperation {
     /**
      * Local path to file which is to be uploaded (before any possible renaming or moving).
      */
-    private String mOriginalStoragePath = null;
+    private String mOriginalStoragePath;
     private Set<OnDatatransferProgressListener> mDataTransferListeners = new HashSet<>();
     private OnRenameListener mRenameUploadListener;
 
@@ -138,7 +138,7 @@ public class UploadFileOperation extends SyncOperation {
 
     private UploadRemoteFileOperation mUploadOperation;
 
-    protected RequestEntity mEntity = null;
+    protected RequestEntity mEntity;
 
     private Account mAccount;
     private OCUpload mUpload;

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

@@ -269,10 +269,9 @@ public class OperationsService extends Service {
          * Map of listeners that will be reported about the end of operations from a
          * {@link OperationsServiceBinder} instance
          */
-        private final ConcurrentMap<OnRemoteOperationListener, Handler> mBoundListeners =
-                new ConcurrentHashMap<OnRemoteOperationListener, Handler>();
+        private final ConcurrentMap<OnRemoteOperationListener, Handler> mBoundListeners = new ConcurrentHashMap<>();
 
-        private ServiceHandler mServiceHandler = null;
+        private ServiceHandler mServiceHandler;
 
         public OperationsServiceBinder(ServiceHandler serviceHandler) {
             mServiceHandler = serviceHandler;
@@ -399,10 +398,10 @@ public class OperationsService extends Service {
 
 
         private ConcurrentLinkedQueue<Pair<Target, RemoteOperation>> mPendingOperations =
-                new ConcurrentLinkedQueue<Pair<Target, RemoteOperation>>();
-        private RemoteOperation mCurrentOperation = null;
-        private Target mLastTarget = null;
-        private OwnCloudClient mOwnCloudClient = null;
+                new ConcurrentLinkedQueue<>();
+        private RemoteOperation mCurrentOperation;
+        private Target mLastTarget;
+        private OwnCloudClient mOwnCloudClient;
         private FileDataStorageManager mStorageManager;
         
         
@@ -420,7 +419,6 @@ public class OperationsService extends Service {
             Log_OC.d(TAG, "Stopping after command with id " + msg.arg1);
             mService.stopSelf(msg.arg1);
         }
-
         
         /**
          * Performs the next operation in the queue

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

@@ -36,7 +36,7 @@ public class ExtendedListView extends ListView {
 
     private static final String TAG = ExtendedListView.class.getSimpleName();
 
-    private int mPositionToSetAndCenter = 0;
+    private int mPositionToSetAndCenter;
 
     public ExtendedListView(Context context) {
         super(context);

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

@@ -84,9 +84,9 @@ public class UploadFilesActivity extends FileActivity implements
     private static final String SORT_ORDER_DIALOG_TAG = "SORT_ORDER_DIALOG";
 
     private ArrayAdapter<String> mDirectories;
-    private File mCurrentDir = null;
-    private boolean mSelectAll = false;
-    private boolean mLocalFolderPickerMode = false;
+    private File mCurrentDir;
+    private boolean mSelectAll;
+    private boolean mLocalFolderPickerMode;
     private LocalFileListFragment mFileListFragment;
     protected Button mUploadBtn;
     private Spinner mBehaviourSpinner;

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

@@ -68,7 +68,7 @@ public class LocalFileListAdapter extends RecyclerView.Adapter<RecyclerView.View
     private List<File> mFiles = new ArrayList<>();
     private List<File> mFilesAll = new ArrayList<>();
     private boolean mLocalFolderPicker;
-    private boolean gridView = false;
+    private boolean gridView;
     private LocalFileListFragmentInterface localFileListFragmentInterface;
     private Set<File> checkedFiles;
 

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

@@ -16,7 +16,6 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 package com.owncloud.android.ui.adapter;
 

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

@@ -48,7 +48,7 @@ public class SortingOrderDialogFragment extends DialogFragment {
     public static final String SORTING_ORDER_FRAGMENT = "SORTING_ORDER_FRAGMENT";
     private static final String KEY_SORT_ORDER = "SORT_ORDER";
 
-    private View mView = null;
+    private View mView;
     private View[] mTaggedViews;
     private AppCompatButton mCancel;
     private String mCurrentSortOrderName;

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

@@ -54,7 +54,7 @@ public class SslValidatorDialog extends Dialog {
     private final static String TAG = SslValidatorDialog.class.getSimpleName();
 
     private OnSslValidatorListener mListener;
-    private CertificateCombinedException mException = null;
+    private CertificateCombinedException mException;
     private View mView;
     
     

+ 3 - 3
src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -101,7 +101,7 @@ public class ExtendedListFragment extends Fragment
     private int maxColumnSizePortrait = 5;
     private int maxColumnSizeLandscape = 10;
 
-    private ScaleGestureDetector mScaleGestureDetector = null;
+    private ScaleGestureDetector mScaleGestureDetector;
     protected SwipeRefreshLayout mRefreshListLayout;
     protected LinearLayout mEmptyListContainer;
     protected TextView mEmptyListMessage;
@@ -115,9 +115,9 @@ public class ExtendedListFragment extends Fragment
     private ArrayList<Integer> mIndexes;
     private ArrayList<Integer> mFirstPositions;
     private ArrayList<Integer> mTops;
-    private int mHeightCell = 0;
+    private int mHeightCell;
 
-    private SwipeRefreshLayout.OnRefreshListener mOnRefreshListener = null;
+    private SwipeRefreshLayout.OnRefreshListener mOnRefreshListener;
 
     private EmptyRecyclerView mRecyclerView;
 

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

@@ -676,7 +676,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
      * Helper class responsible for updating the progress bar shown for file downloading.
      */
     private class ProgressListener implements OnDatatransferProgressListener {
-        private int lastPercent = 0;
+        private int lastPercent;
         private WeakReference<ProgressBar> progressBarReference;
 
         ProgressListener(ProgressBar progressBar) {

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

@@ -434,7 +434,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
         /**
          * True when action mode is finished because the drawer was opened
          */
-        private boolean mActionModeClosedByDrawer = false;
+        private boolean mActionModeClosedByDrawer;
 
         /**
          * Selected items in list when action mode is closed by drawer

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

@@ -283,8 +283,8 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
      * Helper class responsible for updating the progress bar shown for file uploading or downloading
      */
     private class ProgressListener implements OnDatatransferProgressListener {
-        int mLastPercent = 0;
-        WeakReference<ProgressBar> mProgressBar = null;
+        int mLastPercent;
+        WeakReference<ProgressBar> mProgressBar;
 
         ProgressListener(ProgressBar progressBar) {
             mProgressBar = new WeakReference<>(progressBar);

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

@@ -113,7 +113,7 @@ public class PreviewImageFragment extends FileFragment {
 
     private boolean mIgnoreFirstSavedState;
 
-    private LoadBitmapTask mLoadBitmapTask = null;
+    private LoadBitmapTask mLoadBitmapTask;
 
     /**
      * Public factory method to create a new fragment that previews an image.

+ 1 - 1
src/main/java/com/owncloud/android/utils/BitmapUtils.java

@@ -382,7 +382,7 @@ public class BitmapUtils {
                 return bitmapDrawable.getBitmap();
             }
         }
-        
+
         Bitmap bitmap;
         if (drawable.getIntrinsicWidth() <= 0 || drawable.getIntrinsicHeight() <= 0) {
             bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);