When querying DocumentProvider, the name returned included the file e…

…xtension, which always caused no matches to be found. Added utility to strip the file extension. Resolves #1
estasney · Nov 30, 2022 · c997287 · c997287
1 parent 2ed58ec
commit c997287
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/mindrefutils/src/main/java/org/estasney/android/MindRefFileData.java b/mindrefutils/src/main/java/org/estasney/android/MindRefFileData.java
@@ -321,7 +321,9 @@ public MindRefFileData getOrMakeChild(ContentResolver contentResolver, String ch
         )) {
             if (cursor != null) {
                 while (cursor.moveToNext() && matchedFile == null) {
+                    // childName may have an extension
                     String childName1 = cursor.getString(1);
+                    childName1 = MindRefFileUtils.stripFileExt(childName1);
                     if (!Objects.equals(childName1, childName)) {
                         continue;
                     }
@@ -335,13 +337,15 @@ public MindRefFileData getOrMakeChild(ContentResolver contentResolver, String ch
                 }
             }
         } catch (Exception e) {
-            Log.w(TAG, "Failed getChildren: " + e);
+            Log.w(TAG, "Failed getOrMakeChild: " + e);
         }
         if (matchedFile != null) {
+            Log.d(TAG, "getOrMakeChild: found match");
             return matchedFile;
         }
         Uri childTargetUri = DocumentsContract.createDocument(contentResolver, this.uri, childMime, childName);
         matchedFile = new MindRefFileData(this.uri, DocumentsContract.getDocumentId(childTargetUri), childName, childMime, 0);
+        Log.d(TAG, "getOrMakeChild: Match Not Found, Created New Document : " + childTargetUri);
         return matchedFile;
     }
 

diff --git a/mindrefutils/src/main/java/org/estasney/android/MindRefFileUtils.java b/mindrefutils/src/main/java/org/estasney/android/MindRefFileUtils.java
@@ -45,4 +45,16 @@ public static Path stringToPath(String path) {
         return FileSystems.getDefault().getPath(path);
     }
 
+    /**
+     * Returns the name (without extension) of a file
+     * @param fileName string filename
+     * @return String, fileName without extension
+     */
+    public static String stripFileExt(String fileName) {
+        if (!fileName.contains(".")) {
+            return fileName;
+        }
+        return fileName.split("\\.")[0];
+    }
+
 }