From 6d947a90088c97eba5ae750a2a0e8e5e11485929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Sat, 6 Aug 2022 22:27:55 +0100
Subject: [PATCH] Check the mount state of all external storage directories

---
 .../freeyourgadget/gadgetbridge/util/FileUtils.java        | 7 +++----
 app/src/main/res/values/strings.xml                        | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
index 505eb6fee..93b05e573 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
@@ -264,11 +264,10 @@ public class FileUtils {
                 continue;
             }
 
-            // the first directory is also the primary external storage, i.e. the same as Environment.getExternalFilesDir()
-            // TODO: check the mount state of *all* dirs when switching to later API level
             if (!GBEnvironment.env().isLocalTest()) { // don't do this with robolectric
-                if (i == 0 && !Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
-                    GB.log("ignoring unmounted external storage dir: " + dir, GB.INFO, null);
+                final String storageState = Environment.getExternalStorageState(dir);
+                if (!Environment.MEDIA_MOUNTED.equals(storageState)) {
+                    GB.log("ignoring '" +  storageState + "' external storage dir: " + dir, GB.INFO, null);
                     continue;
                 }
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 226df4279..b979cd076 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -480,7 +480,7 @@
     <string name="watch9_pairing_tap_hint">When your watch vibrates, shake the device or press its button.</string>
     <string name="title_activity_sleepmonitor">Sleep monitor</string>
     <string name="pref_write_logfiles">Write log files</string>
-    <string name="pref_write_logfiles_not_available">File logging initialization failed, writing log files is not available</string>
+    <string name="pref_write_logfiles_not_available">File logging initialization failed, writing log files is currently not available. Restart the application to attempt to initialize the log files again.</string>
     <string name="initializing">Initializing</string>
     <string name="busy_task_fetch_activity_data">Fetching activity data</string>
     <string name="sleep_activity_date_range">From %1$s to %2$s</string>