Add null checks

bpellin · Oct 7, 2022 · 8ea8bc7 · 8ea8bc7
1 parent a22a410
commit 8ea8bc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/java/com/keepassdroid/fileselect/RecentFileHistory.java b/app/src/main/java/com/keepassdroid/fileselect/RecentFileHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 Brian Pellin.
+ * Copyright 2013-2022 Brian Pellin.
  *     
  * This file is part of KeePassDroid.
  *
@@ -213,7 +213,11 @@ public void deleteFile(Uri uri, boolean save) {
 
         for (int i = 0; i < databases.size(); i++) {
             String entry = databases.get(i);
-            if (uriName.equals(entry) || fileName.equals(entry)) {
+            boolean delete;
+            delete = (uriName != null && uriName.equals((entry)) ||
+                    (fileName != null && fileName.equals(entry)));
+
+            if (delete) {
                 databases.remove(i);
                 keyfiles.remove(i);
                 break;

diff --git a/app/src/main/java/com/keepassdroid/utils/UriUtil.java b/app/src/main/java/com/keepassdroid/utils/UriUtil.java
@@ -190,6 +190,8 @@ public static String getFileName(Uri uri, Context context) {
 
             if (result == null) {
                 result = uri.getPath();
+                if (result == null) { return null; }
+
                 int cut = result.lastIndexOf('/');
                 if (cut != -1) {
                     result = result.substring(cut + 1);