Browse Source

codacy: remove useless parentheses

AndyScherzinger 6 years ago
parent
commit
10eb9d3920
24 changed files with 70 additions and 90 deletions
  1. 6 7
      src/main/java/com/owncloud/android/authentication/AccountUtils.java
  2. 2 2
      src/main/java/com/owncloud/android/datamodel/OCFile.java
  3. 1 1
      src/main/java/com/owncloud/android/db/OCUpload.java
  4. 2 4
      src/main/java/com/owncloud/android/files/FileMenuFilter.java
  5. 5 7
      src/main/java/com/owncloud/android/files/services/FileUploader.java
  6. 2 2
      src/main/java/com/owncloud/android/media/MediaService.java
  7. 2 4
      src/main/java/com/owncloud/android/media/MediaServiceBinder.java
  8. 1 2
      src/main/java/com/owncloud/android/operations/RenameFileOperation.java
  9. 1 4
      src/main/java/com/owncloud/android/services/OperationsService.java
  10. 7 7
      src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java
  11. 4 8
      src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
  12. 2 3
      src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java
  13. 10 11
      src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
  14. 2 2
      src/main/java/com/owncloud/android/ui/activity/ShareActivity.java
  15. 1 1
      src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
  16. 1 1
      src/main/java/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
  17. 2 3
      src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java
  18. 4 5
      src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
  19. 3 3
      src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
  20. 1 1
      src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java
  21. 1 1
      src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
  22. 1 1
      src/main/java/com/owncloud/android/utils/BitmapUtils.java
  23. 1 2
      src/main/java/com/owncloud/android/utils/DisplayUtils.java
  24. 8 8
      src/main/java/com/owncloud/android/utils/MimeTypeUtil.java

+ 6 - 7
src/main/java/com/owncloud/android/authentication/AccountUtils.java

@@ -15,7 +15,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.authentication;
@@ -34,12 +33,14 @@ import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.activity.ManageAccountsActivity;
 
-
-public class AccountUtils {
+/**
+ * Helper class for dealing with accounts.
+ */
+public final class AccountUtils {
     private static final String PREF_SELECT_OC_ACCOUNT = "select_oc_account";
 
     public static final int ACCOUNT_VERSION = 1;
-    public static final int ACCOUNT_VERSION_WITH_PROPER_ID = 2;
+    //public static final int ACCOUNT_VERSION_WITH_PROPER_ID = 2;
     public static final String ACCOUNT_USES_STANDARD_PASSWORD = "ACCOUNT_USES_STANDARD_PASSWORD";
 
     private AccountUtils() {
@@ -152,10 +153,8 @@ public class AccountUtils {
     public static boolean setCurrentOwnCloudAccount(final Context context, String accountName) {
         boolean result = false;
         if (accountName != null) {
-            boolean found;
             for (final Account account : getAccounts(context)) {
-                found = (account.name.equals(accountName));
-                if (found) {
+                if (accountName.equals(account.name)) {
                     SharedPreferences.Editor appPrefs = PreferenceManager.getDefaultSharedPreferences(context).edit();
                     appPrefs.putString(PREF_SELECT_OC_ACCOUNT, accountName);
                     appPrefs.apply();

+ 2 - 2
src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -466,8 +466,8 @@ public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterfa
         Log_OC.d(TAG, "OCFile name changing from " + mRemotePath);
         if (name != null && name.length() > 0 && !name.contains(PATH_SEPARATOR) &&
                 !mRemotePath.equals(ROOT_PATH)) {
-            String parent = (new File(this.getRemotePath())).getParent();
-            parent = (parent.endsWith(PATH_SEPARATOR)) ? parent : parent + PATH_SEPARATOR;
+            String parent = new File(this.getRemotePath()).getParent();
+            parent = parent.endsWith(PATH_SEPARATOR) ? parent : parent + PATH_SEPARATOR;
             mRemotePath = parent + name;
             if (isFolder()) {
                 mRemotePath += PATH_SEPARATOR;

+ 1 - 1
src/main/java/com/owncloud/android/db/OCUpload.java

@@ -353,7 +353,7 @@ public class OCUpload implements Parcelable {
                     (getLastResult() == null ? "null" : getLastResult().getValue());
         } catch (NullPointerException e) {
             Log_OC.d(TAG, "Exception " + e.toString());
-            return (e.toString());
+            return e.toString();
         }
     }
 

+ 2 - 4
src/main/java/com/owncloud/android/files/FileMenuFilter.java

@@ -363,11 +363,9 @@ public class FileMenuFilter {
             OperationsServiceBinder opsBinder = mComponentsGetter.getOperationsServiceBinder();
             FileUploaderBinder uploaderBinder = mComponentsGetter.getFileUploaderBinder();
             FileDownloaderBinder downloaderBinder = mComponentsGetter.getFileDownloaderBinder();
-            synchronizing = (
-                    anyFileSynchronizing(opsBinder) ||      // comparing local and remote
+            synchronizing = anyFileSynchronizing(opsBinder) ||      // comparing local and remote
                             anyFileDownloading(downloaderBinder) ||
-                            anyFileUploading(uploaderBinder)
-            );
+                            anyFileUploading(uploaderBinder);
         }
         return synchronizing;
     }

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

@@ -399,11 +399,10 @@ public class FileUploader extends Service
             boolean isPowerSaving = PowerUtils.isPowerSaveMode(context);
 
             for ( OCUpload failedUpload: failedUploads) {
-                accountMatch = (account == null || account.name.equals(failedUpload.getAccountName()));
-                resultMatch = ((uploadResult == null || uploadResult.equals(failedUpload.getLastResult())));
+                accountMatch = account == null || account.name.equals(failedUpload.getAccountName());
+                resultMatch = uploadResult == null || uploadResult.equals(failedUpload.getLastResult());
                 if (accountMatch && resultMatch) {
-                    if (currentAccount == null ||
-                            !currentAccount.name.equals(failedUpload.getAccountName())) {
+                    if (currentAccount == null || !currentAccount.name.equals(failedUpload.getAccountName())) {
                         currentAccount = failedUpload.getAccount(context);
                     }
 
@@ -1217,15 +1216,14 @@ public class FileUploader extends Service
             !uploadResult.getCode().equals(ResultCode.DELAYED_IN_POWER_SAVE_MODE) &&
             !uploadResult.getCode().equals(ResultCode.LOCK_FAILED)    ) {
 
-            int tickerId = (uploadResult.isSuccess()) ? R.string.uploader_upload_succeeded_ticker :
+            int tickerId = uploadResult.isSuccess() ? R.string.uploader_upload_succeeded_ticker :
                     R.string.uploader_upload_failed_ticker;
 
             String content;
 
             // check credentials error
             boolean needsToUpdateCredentials = ResultCode.UNAUTHORIZED.equals(uploadResult.getCode());
-            tickerId = (needsToUpdateCredentials) ?
-                    R.string.uploader_upload_failed_credentials_error : tickerId;
+            tickerId = needsToUpdateCredentials ? R.string.uploader_upload_failed_credentials_error : tickerId;
 
             mNotificationBuilder
                     .setTicker(getString(tickerId))

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

@@ -426,9 +426,9 @@ public class MediaService extends Service implements OnCompletionListener, OnPre
     private void tryToGetAudioFocus() {
         if (mAudioFocus != AudioFocus.FOCUS
                 && mAudioManager != null
-                && (AudioManager.AUDIOFOCUS_REQUEST_GRANTED == mAudioManager.requestAudioFocus(this,
+                && AudioManager.AUDIOFOCUS_REQUEST_GRANTED == mAudioManager.requestAudioFocus(this,
                 AudioManager.STREAM_MUSIC,
-                AudioManager.AUDIOFOCUS_GAIN))
+                AudioManager.AUDIOFOCUS_GAIN)
                 ) {
             mAudioFocus = AudioFocus.FOCUS;
         }

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

@@ -118,7 +118,7 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP
     @Override
     public boolean isPlaying() {
         MediaService.State currentState = mService.getState();
-        return (currentState == State.PLAYING || (currentState == State.PREPARING && mService.mPlayOnPrepared));
+        return currentState == State.PLAYING || (currentState == State.PREPARING && mService.mPlayOnPrepared);
     }
 
 
@@ -169,15 +169,13 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP
 
     public boolean isInPlaybackState() {
         MediaService.State currentState = mService.getState();
-        return (currentState == MediaService.State.PLAYING || currentState == MediaService.State.PAUSED);
+        return currentState == MediaService.State.PLAYING || currentState == MediaService.State.PAUSED;
     }
 
-
     @Override
     public int getAudioSessionId() {
         return 1; // not really used
     }
-
 }
 
 

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

@@ -82,8 +82,7 @@ public class RenameFileOperation extends SyncOperation {
                 return new RemoteOperationResult(ResultCode.INVALID_LOCAL_FILE_NAME);
             }
             String parent = (new File(mFile.getRemotePath())).getParent();
-            parent = (parent.endsWith(OCFile.PATH_SEPARATOR)) ? parent : parent +
-                    OCFile.PATH_SEPARATOR;
+            parent = parent.endsWith(OCFile.PATH_SEPARATOR) ? parent : parent + OCFile.PATH_SEPARATOR;
             mNewRemotePath =  parent + mNewName;
             if (mFile.isFolder()) {
                 mNewRemotePath += OCFile.PATH_SEPARATOR;

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

@@ -355,7 +355,6 @@ public class OperationsService extends Service {
             }
         }
 
-
         public boolean dispatchResultIfFinished(int operationId,
                                                 OnRemoteOperationListener listener) {
             Pair<RemoteOperation, RemoteOperationResult> undispatched = 
@@ -363,13 +362,11 @@ public class OperationsService extends Service {
             if (undispatched != null) {
                 listener.onRemoteOperationFinish(undispatched.first, undispatched.second);
                 return true;
-                //Log_OC.e(TAG, "Sending callback later");
             } else {
-                return (!mServiceHandler.mPendingOperations.isEmpty());
+                return !mServiceHandler.mPendingOperations.isEmpty();
             }
         }
         
-        
         /**
          * Returns True when the file described by 'file' in the ownCloud account 'account' is
          * downloading or waiting to download.

+ 7 - 7
src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -316,12 +316,12 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
      *                              synchronization
      */
     private boolean isFinisher(RemoteOperationResult failedResult) {
-        if  (failedResult != null) {
+        if (failedResult != null) {
             RemoteOperationResult.ResultCode code = failedResult.getCode();
-            return (code.equals(RemoteOperationResult.ResultCode.SSL_ERROR) ||
-                    code.equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) ||
-                    code.equals(RemoteOperationResult.ResultCode.BAD_OC_VERSION) ||
-                    code.equals(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED));
+            return code.equals(RemoteOperationResult.ResultCode.SSL_ERROR)
+                    || code.equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)
+                    || code.equals(RemoteOperationResult.ResultCode.BAD_OC_VERSION)
+                    || code.equals(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
         }
         return false;
     }
@@ -522,8 +522,8 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
      * @param builder
      */
     private void showNotification(int id, NotificationCompat.Builder builder) {
-        NotificationManager notificationManager = ((NotificationManager) getContext().
-                getSystemService(Context.NOTIFICATION_SERVICE));
+        NotificationManager notificationManager = (NotificationManager) getContext().
+                getSystemService(Context.NOTIFICATION_SERVICE);
 
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
             builder.setChannelId(NotificationUtils.NOTIFICATION_CHANNEL_FILE_SYNC);

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

@@ -704,8 +704,8 @@ public class FileDisplayActivity extends HookActivity
     protected void refreshSecondFragment(String downloadEvent, String downloadedRemotePath,
                                          boolean success) {
         FileFragment secondFragment = getSecondFragment();
-        boolean waitedPreview = (mWaitingToPreview != null &&
-                mWaitingToPreview.getRemotePath().equals(downloadedRemotePath));
+        boolean waitedPreview = mWaitingToPreview != null
+                && mWaitingToPreview.getRemotePath().equals(downloadedRemotePath);
         if (secondFragment instanceof FileDetailFragment) {
             FileDetailFragment detailsFragment = (FileDetailFragment) secondFragment;
             OCFile fileInFragment = detailsFragment.getFile();
@@ -745,7 +745,7 @@ public class FileDisplayActivity extends HookActivity
                     mWaitingToPreview = null;
                 }
                 if (!detailsFragmentChanged) {
-                    detailsFragment.updateFileDetails(false, (success));
+                    detailsFragment.updateFileDetails(false, success);
                 }
             }
         }
@@ -1497,12 +1497,8 @@ public class FileDisplayActivity extends HookActivity
         // TODO refactor this receiver, and maybe DownloadFinishReceiver; this method is duplicated :S
         private boolean isAscendant(String linkedToRemotePath) {
             OCFile currentDir = getCurrentDir();
-            return (
-                    currentDir != null &&
-                            currentDir.getRemotePath().startsWith(linkedToRemotePath)
-            );
+            return currentDir != null && currentDir.getRemotePath().startsWith(linkedToRemotePath);
         }
-
     }
 
 

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

@@ -315,8 +315,7 @@ public class    PassCodeActivity extends AppCompatActivity {
 
         boolean result = true;
         for (int i = 0; i < mPassCodeDigits.length && result; i++) {
-            result = (mPassCodeDigits[i] != null) &&
-                    mPassCodeDigits[i].equals(savedPassCodeDigits[i]);
+            result = mPassCodeDigits[i] != null && mPassCodeDigits[i].equals(savedPassCodeDigits[i]);
         }
         return result;
     }
@@ -332,7 +331,7 @@ public class    PassCodeActivity extends AppCompatActivity {
 
         boolean result = true;
         for (int i = 0; i < mPassCodeEditTexts.length && result; i++) {
-            result = ((mPassCodeEditTexts[i].getText().toString()).equals(mPassCodeDigits[i]));
+            result = (mPassCodeEditTexts[i].getText().toString()).equals(mPassCodeDigits[i]);
         }
         return result;
     }

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

@@ -526,7 +526,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
             inputText.setText(filename);
             int selectionStart = 0;
             int extensionStart = filename.lastIndexOf(".");
-            int selectionEnd = (extensionStart >= 0) ? extensionStart : filename.length();
+            int selectionEnd = extensionStart >= 0 ? extensionStart : filename.length();
             if (selectionEnd >= 0) {
                 inputText.setSelection(
                         Math.min(selectionStart, selectionEnd),
@@ -544,7 +544,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
         }
 
         private boolean isIntentStartWithUrl(String extraText) {
-            return (extraText.startsWith("http://") || extraText.startsWith("https://"));
+            return extraText.startsWith("http://") || extraText.startsWith("https://");
         }
 
         @Nullable
@@ -728,7 +728,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
         ListView mListView = findViewById(android.R.id.list);
 
         String current_dir = mParents.peek();
-        boolean notRoot = (mParents.size() > 1);
+        boolean notRoot = mParents.size() > 1;
 
         if (actionBar != null) {
             if ("".equals(current_dir)) {
@@ -1063,7 +1063,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
                 dialog.show(getSupportFragmentManager(), CreateFolderDialogFragment.CREATE_FOLDER_FRAGMENT);
                 break;
             case android.R.id.home:
-                if ((mParents.size() > 1)) {
+                if (mParents.size() > 1) {
                     onBackPressed();
                 }
                 break;
@@ -1115,8 +1115,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
                 String syncFolderRemotePath = intent.getStringExtra(FileSyncAdapter.EXTRA_FOLDER_PATH);
                 RemoteOperationResult syncResult = (RemoteOperationResult)
                         DataHolderUtil.getInstance().retrieve(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT));
-                boolean sameAccount = (getAccount() != null &&
-                        accountName.equals(getAccount().name) && getStorageManager() != null);
+                boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name)
+                        && getStorageManager() != null;
 
                 if (sameAccount) {
 
@@ -1150,13 +1150,12 @@ public class ReceiveExternalFilesActivity extends FileActivity
                             mFile = currentFile;
                         }
 
-                        mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
-                                !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event));
+                        mSyncInProgress = !FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
+                                !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event);
 
-                        if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
-                                equals(event) &&
+                        if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.equals(event)
                                 /// TODO refactor and make common
-                                syncResult != null && !syncResult.isSuccess()) {
+                                && syncResult != null && !syncResult.isSuccess()) {
 
                             if (syncResult.getCode() == ResultCode.UNAUTHORIZED ||
                                     (syncResult.isException() && syncResult.getException()

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

@@ -148,8 +148,8 @@ public class ShareActivity extends FileActivity implements ShareFragmentListener
             return OCShare.READ_PERMISSION_FLAG;    // minimum permissions
 
         } else if (isFederated) {
-                return (getFile().isFolder() ? OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9 :
-                        OCShare.FEDERATED_PERMISSIONS_FOR_FILE_AFTER_OC9);
+                return getFile().isFolder() ? OCShare.FEDERATED_PERMISSIONS_FOR_FOLDER_AFTER_OC9 :
+                        OCShare.FEDERATED_PERMISSIONS_FOR_FILE_AFTER_OC9;
         } else {
             return (getFile().isFolder() ? OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER :
                     OCShare.MAXIMUM_PERMISSIONS_FOR_FILE);

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

@@ -239,7 +239,7 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
     private void setBitmap(OCFile file, ImageView fileIcon, boolean isDetailView) {
         // No Folder
         if (!file.isFolder()) {
-            if ((MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file))) {
+            if (MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file)) {
                 int placeholder;
 
                 if (MimeTypeUtil.isImage(file)) {

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

@@ -194,7 +194,7 @@ public class SamlWebViewDialog extends DialogFragment {
         
         // Work around bug: http://code.google.com/p/android/issues/detail?id=17423
         Dialog dialog = getDialog();
-        if ((dialog != null)) {
+        if (dialog != null) {
             dialog.setOnDismissListener(null);
         }
         

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

@@ -165,8 +165,8 @@ public class ShareLinkToDialog  extends DialogFragment {
         }
         
         private View newView(ViewGroup parent) {
-            return(((LayoutInflater)getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).
-                    inflate(R.layout.activity_row, parent, false));
+            return((LayoutInflater)getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).
+                    inflate(R.layout.activity_row, parent, false);
         }
         
         private void bindView(int position, View row) {
@@ -176,5 +176,4 @@ public class ShareLinkToDialog  extends DialogFragment {
             icon.setImageDrawable(getItem(position).loadIcon(mPackageManager));
         }
     }
-    
 }

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

@@ -508,10 +508,9 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             // configure UI for depending upon local state of the file
             FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
             FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
-            if (transferring ||
-                    (downloaderBinder != null && downloaderBinder.isDownloading(account, file)) ||
-                    (uploaderBinder != null && uploaderBinder.isUploading(account, file))
-                    ) {
+            if (transferring
+                    || (downloaderBinder != null && downloaderBinder.isDownloading(account, file))
+                    || (uploaderBinder != null && uploaderBinder.isUploading(account, file))) {
                 setButtonsForTransferring();
 
             } else if (file.isDown()) {
@@ -544,7 +543,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
      * @return 'True' when the fragment is ready to show details of a file
      */
     private boolean readyToShow() {
-        return (getFile() != null && account != null && layout == R.layout.file_details_fragment);
+        return getFile() != null && account != null && layout == R.layout.file_details_fragment;
     }
 
     /**

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

@@ -306,14 +306,14 @@ public class OCFileListFragment extends ExtendedListFragment implements
         }
 
         Bundle args = getArguments();
-        mOnlyFoldersClickable = (args != null) && args.getBoolean(ARG_ONLY_FOLDERS_CLICKABLE, false);
-        boolean hideItemOptions = (args != null) && args.getBoolean(ARG_HIDE_ITEM_OPTIONS, false);
+        mOnlyFoldersClickable = args != null && args.getBoolean(ARG_ONLY_FOLDERS_CLICKABLE, false);
+        boolean hideItemOptions = args != null && args.getBoolean(ARG_HIDE_ITEM_OPTIONS, false);
 
         mAdapter = new OCFileListAdapter(getActivity(), mContainerActivity, this, hideItemOptions,
                 isGridViewPreferred(mFile));
         setRecyclerViewAdapter(mAdapter);
 
-        mHideFab = (args != null) && args.getBoolean(ARG_HIDE_FAB, false);
+        mHideFab = args != null && args.getBoolean(ARG_HIDE_FAB, false);
 
         if (mHideFab) {
             setFabEnabled(false);

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

@@ -145,7 +145,7 @@ public class PreviewImageActivity extends FileActivity implements
         mViewPager = findViewById(R.id.fragmentPager);
 
         int position = mHasSavedPosition ? mSavedPosition : mPreviewImagePagerAdapter.getFilePosition(getFile());
-        position = (position >= 0) ? position : 0;
+        position = position >= 0 ? position : 0;
 
         mViewPager.setAdapter(mPreviewImagePagerAdapter);
         mViewPager.addOnPageChangeListener(this);

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

@@ -804,7 +804,7 @@ public class PreviewMediaFragment extends FileFragment implements
      * @return 'True' if the file can be handled by the fragment.
      */
     public static boolean canBePreviewed(OCFile file) {
-        return (file != null && (MimeTypeUtil.isAudio(file) || MimeTypeUtil.isVideo(file)));
+        return file != null && (MimeTypeUtil.isAudio(file) || MimeTypeUtil.isVideo(file));
     }
 
 

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

@@ -257,7 +257,7 @@ public class BitmapUtils {
         }
 
         if (3 * h < 2) {
-            return p + ((q - p) * 6 * ((2.0f / 3.0f) - h));
+            return p + ((q - p) * 6 * (2.0f / 3.0f - h));
         }
 
         return p;

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

@@ -241,7 +241,6 @@ public class DisplayUtils {
      * @param toASCII if true converts from Unicode to ASCII, if false converts from ASCII to Unicode
      * @return the URL containing the converted domain name
      */
-    @TargetApi(Build.VERSION_CODES.GINGERBREAD)
     public static String convertIdn(String url, boolean toASCII) {
 
         String urlNoDots = url;
@@ -261,7 +260,7 @@ public class DisplayUtils {
 
         int hostEnd = url.substring(hostStart).indexOf("/");
         // Handle URL which doesn't have a path (path is implicitly '/')
-        hostEnd = (hostEnd == -1 ? urlNoDots.length() : hostStart + hostEnd);
+        hostEnd = hostEnd == -1 ? urlNoDots.length() : hostStart + hostEnd;
 
         String host = urlNoDots.substring(hostStart, hostEnd);
         host = toASCII ? IDN.toASCII(host) : IDN.toUnicode(host);

+ 8 - 8
src/main/java/com/owncloud/android/utils/MimeTypeUtil.java

@@ -1,4 +1,4 @@
-/**
+/*
  * ownCloud Android client application
  * <p>
  * Copyright (C) 2016 ownCloud Inc.
@@ -196,29 +196,29 @@ public class MimeTypeUtil {
      * @return 'True' if the mime type defines image
      */
     public static boolean isImage(String mimeType) {
-        return (mimeType != null && mimeType.toLowerCase(Locale.ROOT).startsWith("image/") &&
-                !mimeType.toLowerCase(Locale.ROOT).contains("djvu"));
+        return mimeType != null && mimeType.toLowerCase(Locale.ROOT).startsWith("image/") &&
+                !mimeType.toLowerCase(Locale.ROOT).contains("djvu");
     }
 
     /**
      * @return 'True' the mime type defines video
      */
     public static boolean isVideo(String mimeType) {
-        return (mimeType != null && mimeType.toLowerCase(Locale.ROOT).startsWith("video/"));
+        return mimeType != null && mimeType.toLowerCase(Locale.ROOT).startsWith("video/");
     }
 
     /**
      * @return 'True' the mime type defines audio
      */
     public static boolean isAudio(String mimeType) {
-        return (mimeType != null && mimeType.toLowerCase(Locale.ROOT).startsWith("audio/"));
+        return mimeType != null && mimeType.toLowerCase(Locale.ROOT).startsWith("audio/");
     }
 
     /**
      * @return 'True' if mime type defines text
      */
     public static boolean isText(String mimeType) {
-        return (mimeType != null && mimeType.toLowerCase(Locale.ROOT).startsWith("text/"));
+        return mimeType != null && mimeType.toLowerCase(Locale.ROOT).startsWith("text/");
     }
 
     /**
@@ -273,8 +273,8 @@ public class MimeTypeUtil {
      * @return 'True' if the file contains an image
      */
     public static boolean isImage(ServerFileInterface file) {
-        return (MimeTypeUtil.isImage(file.getMimeType())
-                || MimeTypeUtil.isImage(getMimeTypeFromPath(file.getRemotePath())));
+        return MimeTypeUtil.isImage(file.getMimeType())
+                || MimeTypeUtil.isImage(getMimeTypeFromPath(file.getRemotePath()));
     }
 
     /**