5 files changed, 93 insertions, 50 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/BrowseDirectoriesFragment.kt
index 1c436a3..abc7ffc 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/configure/BrowseDirectoriesFragment.kt
@@ -1,6 +1,6 @@
 /*
  * Tinc Mesh VPN: Android client and user interface
- * Copyright (C) 2017-2018 Euxane P. TRAN-GIRARD
+ * Copyright (C) 2017-2024 Euxane P. TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,19 +22,31 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import org.pacien.tincapp.R
 import org.pacien.tincapp.activities.BaseFragment
-import org.pacien.tincapp.context.AppPaths
-import org.pacien.tincapp.databinding.ConfigureToolsPathInfoFragmentBinding
+import org.pacien.tincapp.databinding.ConfigureBrowseDirectoriesFragmentBinding
+import org.pacien.tincapp.storageprovider.BrowseFilesIntents
 
 /**
  * @author euxane
  */
-class PathInfoFragment : BaseFragment() {
-  private val appPaths = AppPaths
-
+class BrowseDirectoriesFragment : BaseFragment() {
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-    val binding = ConfigureToolsPathInfoFragmentBinding.inflate(inflater, container, false)
-    binding.appPaths = appPaths
+    val binding = ConfigureBrowseDirectoriesFragmentBinding.inflate(inflater, container, false)
+    binding.openDirectoryTree = { openDocumentTree(it) }
     return binding.root
   }
-}
+
+  private fun openDocumentTree(documentId: String) {
+    try {
+      BrowseFilesIntents.openDocumentTree(requireContext(), documentId)
+    } catch (e: RuntimeException) {
+      parentActivity.runOnUiThread {
+        parentActivity.showErrorDialog(
+          R.string.configure_browse_directories_error_no_file_browser,
+          docTopic = "browse-files",
+        )
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/pacien/tincapp/storageprovider/BrowseFilesIntents.kt b/app/src/main/java/org/pacien/tincapp/storageprovider/BrowseFilesIntents.kt
new file mode 100644
index 0000000..3ebd501
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/storageprovider/BrowseFilesIntents.kt
@@ -0,0 +1,47 @@
+/*
+ * Tinc Mesh VPN: Android client and user interface
+ * Copyright (C) 2017-2024 Euxane P. TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.pacien.tincapp.storageprovider
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.DocumentsContract
+import android.provider.DocumentsContract.Document
+import org.pacien.tincapp.BuildConfig
+
+object BrowseFilesIntents {
+  private const val URI_AUTHORITY = BuildConfig.APPLICATION_ID + ".files"
+
+  fun openDocumentTree(context: Context, documentId: String) {
+    val contentUri = DocumentsContract.buildDocumentUri(URI_AUTHORITY, documentId)
+    openDocumentTree(context, contentUri)
+  }
+
+  fun openDocumentTree(context: Context, contentUri: Uri) {
+    val intent = Intent(Intent.ACTION_VIEW).apply {
+      setDataAndType(contentUri, Document.MIME_TYPE_DIR)
+      addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+    }
+
+    if (intent.resolveActivity(context.packageManager) == null)
+      throw RuntimeException("No opener found for " + Document.MIME_TYPE_DIR)
+
+    context.startActivity(intent)
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml
index dfb47c2..67a35d2 100644
--- a/app/src/main/res/layout/configure_activity.xml
+++ b/app/src/main/res/layout/configure_activity.xml
@@ -28,23 +28,23 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <TextView
+                <TextView
                         style="@style/AppTheme.SectionTitle"
-                        android:text="@string/configure_activity_title_tools"/>
+                        android:text="@string/configure_activity_title_directories"/>
 
                 <fragment
-                        android:id="@+id/configure_activity_tools_fragment"
-                        android:name="org.pacien.tincapp.activities.configure.ToolsFragment"
+                        android:id="@+id/configure_activity_path_info_fragment"
+                        android:name="org.pacien.tincapp.activities.configure.BrowseDirectoriesFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"/>
 
                 <TextView
                         style="@style/AppTheme.SectionTitle"
-                        android:text="@string/configure_activity_title_internal_paths_info"/>
+                        android:text="@string/configure_activity_title_tools"/>
 
                 <fragment
-                        android:id="@+id/configure_activity_path_info_fragment"
-                        android:name="org.pacien.tincapp.activities.configure.PathInfoFragment"
+                        android:id="@+id/configure_activity_tools_fragment"
+                        android:name="org.pacien.tincapp.activities.configure.ToolsFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"/>
 
diff --git a/app/src/main/res/layout/configure_tools_path_info_fragment.xml b/app/src/main/res/layout/configure_browse_directories_fragment.xml
index 5704a0f..e0fc64a 100644
--- a/app/src/main/res/layout/configure_tools_path_info_fragment.xml
+++ b/app/src/main/res/layout/configure_browse_directories_fragment.xml
@@ -2,7 +2,7 @@
 
 <!--
  * Tinc Mesh VPN: Android client and user interface
- * Copyright (C) 2017-2018 Euxane P. TRAN-GIRARD
+ * Copyright (C) 2017-2024 Euxane P. TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,50 +22,34 @@
 
         <data>
 
+                <import
+                        type="org.pacien.tincapp.storageprovider.FilesDocumentsProvider"/>
+
                 <variable
-                        name="appPaths"
-                        type="org.pacien.tincapp.context.AppPaths"/>
+                        name="openDirectoryTree"
+                        type="kotlin.jvm.functions.Function1&lt;String, kotlin.Unit>"/>
 
         </data>
 
         <LinearLayout style="@style/AppTheme.List">
 
-                <LinearLayout style="@style/AppTheme.ListBlock">
+                <LinearLayout
+                        style="@style/AppTheme.ListBlock.Clickable"
+                        android:onClick="@{() -> openDirectoryTree.invoke(FilesDocumentsProvider.VIRTUAL_ROOT_NETWORKS)}">
 
                         <TextView