Browse Source

spotbugs: remove redundant null checks

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 6 years ago
parent
commit
2c30e5e9f7

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

@@ -379,10 +379,7 @@ public class ShareFileFragment extends Fragment implements ShareUserListAdapter.
         @Override
         public void onClick(View expirationView) {
             if (mPublicShare != null && mPublicShare.getExpirationDate() > 0) {
-                long chosenDateInMillis = -1;
-                if (mPublicShare != null) {
-                    chosenDateInMillis = mPublicShare.getExpirationDate();
-                }
+                long chosenDateInMillis = mPublicShare.getExpirationDate();
                 ExpirationDatePickerDialogFragment dialog =
                         ExpirationDatePickerDialogFragment.newInstance(mFile, chosenDateInMillis);
                 dialog.show(

+ 3 - 6
src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -718,12 +718,9 @@ public class FileOperationsHelper {
 
         OCCapability capability = mFileActivity.getStorageManager().getCapability(mFileActivity.getAccount().name);
         SendShareDialog mSendShareDialog;
-        if (capability != null) {
-            mSendShareDialog = SendShareDialog.newInstance(file, hideNcSharingOptions,
-                    capability.getFilesSharingPublicPasswordEnforced().isTrue());
-        } else {
-            mSendShareDialog = SendShareDialog.newInstance(file, hideNcSharingOptions, false);
-        }
+
+        mSendShareDialog = SendShareDialog.newInstance(file, hideNcSharingOptions,
+                                                       capability.getFilesSharingPublicPasswordEnforced().isTrue());
         mSendShareDialog.setFileOperationsHelper(this);
         mSendShareDialog.show(ft, "TAG_SEND_SHARE_DIALOG");
     }