From d6f727a142b15259701693c4c0c36a4d498c487f Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Mon, 7 Mar 2022 12:58:46 +0100
Subject: [PATCH] Fix error message when creating volume on external SD card

---
 .../hardcore/droidfs/add_volume/SelectPathFragment.kt     | 8 +++++---
 app/src/main/res/layout/dialog_sdcard_error.xml           | 3 ++-
 app/src/main/res/values/strings.xml                       | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/sushi/hardcore/droidfs/add_volume/SelectPathFragment.kt b/app/src/main/java/sushi/hardcore/droidfs/add_volume/SelectPathFragment.kt
index 9cd49f2..4bde96d 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/add_volume/SelectPathFragment.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/add_volume/SelectPathFragment.kt
@@ -237,6 +237,7 @@ class SelectPathFragment: Fragment() {
                             dialog.setView(
                                 DialogSdcardErrorBinding.inflate(layoutInflater).apply {
                                     path.text = PathUtils.getPackageDataFolder(requireContext())
+                                    footer.text = getString(R.string.sdcard_error_add_footer)
                                 }.root
                             )
                         else
@@ -250,6 +251,7 @@ class SelectPathFragment: Fragment() {
         }
     }
 
+    // called when the user tries to create a volume in a non-writable directory
     private fun errorDirectoryNotWritable(volumePath: String) {
         val dialog = CustomAlertDialogBuilder(requireContext(), themeValue)
             .setTitle(R.string.error)
@@ -257,9 +259,9 @@ class SelectPathFragment: Fragment() {
         @SuppressLint("InflateParams")
         if (PathUtils.isPathOnExternalStorage(volumePath, requireContext()))
             dialog.setView(
-                layoutInflater.inflate(R.layout.dialog_sdcard_error, null).apply {
-                    findViewById<TextView>(R.id.path).text = PathUtils.getPackageDataFolder(requireContext())
-                }
+                DialogSdcardErrorBinding.inflate(layoutInflater).apply {
+                    path.text = PathUtils.getPackageDataFolder(requireContext())
+                }.root
             )
         else
             dialog.setMessage(R.string.create_cant_write_error_msg)
diff --git a/app/src/main/res/layout/dialog_sdcard_error.xml b/app/src/main/res/layout/dialog_sdcard_error.xml
index b0164cd..6d8717f 100644
--- a/app/src/main/res/layout/dialog_sdcard_error.xml
+++ b/app/src/main/res/layout/dialog_sdcard_error.xml
@@ -21,9 +21,10 @@
         android:layout_marginVertical="10dp"/>
 
     <TextView
+        android:id="@+id/footer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/add_read_only"
+        android:text="@string/sdcard_error_create_footer"
         android:textSize="@dimen/dialog_text_size"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa30e40..d42e912 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -130,9 +130,10 @@
     <string name="timer_empty_error_msg">Please enter a numeric value</string>
     <string name="path_error">Failed to retrieve the selected path.</string>
     <string name="create_cant_write_error_msg">DroidFS doesn\'t have write access to this path. Please try another location.</string>
-    <string name="add_read_only">Adding volume with read-only access.</string>
     <string name="add_cant_write_warning">DroidFS doesn\'t have write access to this path. Adding volume with read-only access.</string>
     <string name="sdcard_error_header">DroidFS can only write to removable SD cards under:</string>
+    <string name="sdcard_error_add_footer">Adding volume with read-only access.</string>
+    <string name="sdcard_error_create_footer">Please use a subdirectory of this path or internal storage.</string>
     <string name="slideshow_stopped">Slideshow stopped</string>
     <string name="slideshow_started">Slideshow started</string>
     <string name="ask_save_img_rotated">The image has been rotated. Do you want to save these changes and overwrite the original image ?</string>