Merge branch 'master' into updates

Author: ItzNotABug

.github/workflows/build.yml

@@ -0,0 +1,29 @@
+name: Build source
+
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+    paths:
+      - "dfc/**"
+  push:
+    branches: [ master ]
+    paths:
+      - "dfc/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+          cache: "gradle"
+
+      - name: Build DFC
+        run: ./gradlew :dfc:assemble

.gitignore

@@ -5,6 +5,5 @@
 
 .idea
 build
-gradle
 .gradle
 local.properties

dfc/src/main/java/com/lazygeniouz/dfc/file/DocumentFileCompat.kt

@@ -240,5 +240,13 @@ abstract class DocumentFileCompat constructor(
         fun isDocument(context: Context, uri: Uri): Boolean {
             return isDocumentUri(context, uri)
         }
+
+        /**
+         * Return whether the given [uri] is a tree uri.
+         */
+        internal fun isTreeUri(uri: Uri): Boolean {
+            val paths = uri.pathSegments
+            return paths.size >= 2 && "tree" == paths[0]
+        }
     }
 }

dfc/src/main/java/com/lazygeniouz/dfc/file/internals/SingleDocumentFileCompat.kt

@@ -2,6 +2,7 @@ package com.lazygeniouz.dfc.file.internals
 
 import android.content.Context
 import android.net.Uri
+import android.provider.DocumentsContract
 import com.lazygeniouz.dfc.file.DocumentFileCompat
 import com.lazygeniouz.dfc.resolver.ResolverCompat
 
@@ -96,6 +97,9 @@ internal class SingleDocumentFileCompat(
          * Build a [SingleDocumentFileCompat] from a given [uri].
          */
         internal fun make(context: Context, self: Uri): SingleDocumentFileCompat? {
+            if (isTreeUri(self)) return null
+            if (!DocumentsContract.isDocumentUri(context, self)) return null
+
             ResolverCompat.getCursor(context, self, ResolverCompat.fullProjection)
                 ?.use { cursor ->
                     if (cursor.moveToFirst()) {

dfc/src/main/java/com/lazygeniouz/dfc/file/internals/TreeDocumentFileCompat.kt

@@ -103,14 +103,6 @@ internal class TreeDocumentFileCompat constructor(
 
     internal companion object {
 
-        /**
-         * Return whether the given [uri] is a tree uri.
-         */
-        private fun isTreeUri(uri: Uri): Boolean {
-            val paths = uri.pathSegments
-            return paths.size >= 2 && "tree" == paths[0]
-        }
-
         /**
          * Build the initial [TreeDocumentFileCompat] from a given [uri].
          */
@@ -120,9 +112,12 @@ internal class TreeDocumentFileCompat constructor(
             }
 
             // build a new tree uri if this is a first tree doc creation...
-            val treeUri = if (isInitial) DocumentsContract.buildDocumentUriUsingTree(
-                uri, DocumentsContract.getTreeDocumentId(uri)
-            ) else uri
+            // but only if the uri is not already a document uri to preserve subdir info.
+            val treeUri = if (isInitial && !DocumentsContract.isDocumentUri(context, uri)) {
+                DocumentsContract.buildDocumentUriUsingTree(
+                    uri, DocumentsContract.getTreeDocumentId(uri)
+                )
+            } else uri
 
             ResolverCompat.getCursor(context, treeUri, ResolverCompat.fullProjection)
                 ?.use { cursor ->

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists