Merge pull request #12927 from nextcloud/bugfix/null-pointer-fix-file…

…name-on-template-dialog Use getFileNameText for nullable field
nextcloud · Apr 30, 2024 · a4f01de · a4f01de
2 parents 051754d + f84acd5
commit a4f01de
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/...c/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java b/...c/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java
@@ -56,7 +56,6 @@
 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;
@@ -245,9 +244,20 @@ public void setTemplateList(List<Template> templateList) {
         adapter.notifyDataSetChanged();
     }
 
+    private String getFileNameText() {
+        String result = "";
+        Editable text = binding.filename.getText();
+
+        if (text != null) {
+            result = text.toString();
+        }
+
+        return result;
+    }
+
     @Override
     public void onClick(View v) {
-        String name = binding.filename.getText().toString();
+        String name = getFileNameText();
         String path = parentFolder.getRemotePath() + name;
 
         Template selectedTemplate = adapter.getSelectedTemplate();
@@ -275,12 +285,13 @@ private void onTemplateChosen(Template template) {
     }
 
     private void prefillFilenameIfEmpty(Template template) {
-        String name = binding.filename.getText().toString();
+        String name = getFileNameText();
+
         if (name.isEmpty() || name.equalsIgnoreCase(DOT + template.getExtension())) {
             binding.filename.setText(String.format("%s.%s", template.getName(), template.getExtension()));
         }
 
-        final int dotIndex = binding.filename.getText().toString().lastIndexOf('.');
+        final int dotIndex = getFileNameText().lastIndexOf('.');
         if (dotIndex >= 0) {
             binding.filename.setSelection(dotIndex);
         }
@@ -289,7 +300,7 @@ private void prefillFilenameIfEmpty(Template template) {
     private void checkEnablingCreateButton() {
         if (positiveButton != null) {
             Template selectedTemplate = adapter.getSelectedTemplate();
-            String name = Objects.requireNonNull(binding.filename.getText()).toString();
+            String name = getFileNameText();
             boolean isNameJustExtension = selectedTemplate != null && name.equalsIgnoreCase(
                 DOT + selectedTemplate.getExtension());
             boolean isNameEmpty = name.isEmpty() || isNameJustExtension;