소스 검색

ChooseTemplateDialogFragment: check selectedTemplate is not null before attempting to get the extension

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 년 전
부모
커밋
8200b41225
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt

+ 5 - 1
app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.kt

@@ -251,7 +251,11 @@ class ChooseTemplateDialogFragment : DialogFragment(), View.OnClickListener, Tem
         if (positiveButton != null) {
             val selectedTemplate = adapter!!.selectedTemplate
             val name = binding.filename.text.toString().trim()
-            val isNameEmpty = name.isEmpty() || name.equals(DOT + selectedTemplate.extension, ignoreCase = true)
+            val isNameJustExtension = selectedTemplate != null && name.equals(
+                DOT + selectedTemplate.extension,
+                ignoreCase = true
+            )
+            val isNameEmpty = name.isEmpty() || isNameJustExtension
             val state = selectedTemplate != null && !isNameEmpty && !fileNames.contains(name)
 
             positiveButton?.isEnabled = state