ソースを参照

improve spotbug score

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 2 年 前
コミット
0d58f2d82c

+ 2 - 1
app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java

@@ -64,6 +64,7 @@ import com.owncloud.android.utils.theme.ViewThemeUtils;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.inject.Inject;
@@ -297,7 +298,7 @@ public class ChooseRichDocumentsTemplateDialogFragment extends DialogFragment im
 
     private void checkEnablingCreateButton() {
         Template selectedTemplate = adapter.getSelectedTemplate();
-        String name = binding.filename.getText().toString();
+        String name = Objects.requireNonNull(binding.filename.getText()).toString();
 
         positiveButton.setEnabled(selectedTemplate != null && !name.isEmpty() &&
                                       !name.equalsIgnoreCase(DOT + selectedTemplate.getExtension()));

+ 4 - 3
app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java

@@ -45,6 +45,7 @@ import com.owncloud.android.utils.KeyboardUtils;
 import com.owncloud.android.utils.theme.ViewThemeUtils;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.inject.Inject;
@@ -194,19 +195,19 @@ public class CreateFolderDialogFragment
                     .getText().toString().trim();
 
             if (TextUtils.isEmpty(newFolderName)) {
-                DisplayUtils.showSnackMessage(getActivity(), R.string.filename_empty);
+                DisplayUtils.showSnackMessage(requireActivity(), R.string.filename_empty);
                 return;
             }
 
             if (!FileUtils.isValidName(newFolderName)) {
-                DisplayUtils.showSnackMessage(getActivity(), R.string.filename_forbidden_charaters_from_server);
+                DisplayUtils.showSnackMessage(requireActivity(), R.string.filename_forbidden_charaters_from_server);
 
                 return;
             }
 
             String path = mParentFolder.getDecryptedRemotePath() + newFolderName + OCFile.PATH_SEPARATOR;
 
-            ((ComponentsGetter) getActivity()).getFileOperationsHelper().createFolder(path);
+            ((ComponentsGetter) requireActivity()).getFileOperationsHelper().createFolder(path);
         }
     }
 }

+ 6 - 6
app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java

@@ -163,7 +163,7 @@ public class SendShareDialog extends BottomSheetDialogFragment implements Inject
 
         List<SendButtonData> sendButtonDataList = setupSendButtonData(sendIntent);
 
-        if ("off".equalsIgnoreCase(getContext().getString(R.string.send_files_to_other_apps))) {
+        if ("off".equalsIgnoreCase(requireContext().getString(R.string.send_files_to_other_apps))) {
             sharePeopleText.setVisibility(View.GONE);
         }
 
@@ -184,13 +184,13 @@ public class SendShareDialog extends BottomSheetDialogFragment implements Inject
 
     private void shareByLink() {
         if (file.isSharedViaLink()) {
-            ((FileActivity) getActivity()).getFileOperationsHelper().getFileWithLink(file, viewThemeUtils);
+            ((FileActivity) requireActivity()).getFileOperationsHelper().getFileWithLink(file, viewThemeUtils);
         } else if (sharingPublicPasswordEnforced || sharingPublicAskForPassword) {
             // password enforced by server, request to the user before trying to create
             requestPasswordForShareViaLink();
         } else {
             // create without password if not enforced by server or we don't know if enforced;
-            ((FileActivity) getActivity()).getFileOperationsHelper().shareFileViaPublicShare(file, null);
+            ((FileActivity) requireActivity()).getFileOperationsHelper().shareFileViaPublicShare(file, null);
         }
 
         this.dismiss();
@@ -235,11 +235,11 @@ public class SendShareDialog extends BottomSheetDialogFragment implements Inject
                 // Obtain the file
                 if (file.isDown()) {
                     sendIntent.setComponent(new ComponentName(packageName, activityName));
-                    getActivity().startActivity(Intent.createChooser(sendIntent, getString(R.string.send)));
+                    requireActivity().startActivity(Intent.createChooser(sendIntent, getString(R.string.send)));
                 } else {  // Download the file
                     Log_OC.d(TAG, file.getRemotePath() + ": File must be downloaded");
-                    ((SendShareDialog.SendShareDialogDownloader) getActivity()).downloadFile(file, packageName,
-                            activityName);
+                    ((SendShareDialog.SendShareDialogDownloader) requireActivity())
+                        .downloadFile(file, packageName, activityName);
                 }
             }