Catch NetworkOnMainThreadException when reading or saving files

MarcusWolschon · Sep 25, 2023 · 76c1dc5 · 76c1dc5
1 parent 07d5b1a
commit 76c1dc5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/src/main/java/de/blau/android/util/SelectFile.java b/src/main/java/de/blau/android/util/SelectFile.java
@@ -17,6 +17,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.os.NetworkOnMainThreadException;
 import android.provider.DocumentsContract;
 import android.util.Log;
 import android.view.View;
@@ -233,30 +234,35 @@ public static void handleResult(int code, @NonNull Intent data) {
             uri = Uri.fromFile(com.nononsenseapps.filepicker.Utils.getFileForUri(data.getData()));
         }
         ContentResolverUtil.persistPermissions(activity, data.getFlags(), uri);
-        if (code == SAVE_FILE) {
-            File file = new File(uri.getPath());
-            if (file.exists()) {
-                Snack.barWarning(activity, activity.getResources().getString(R.string.toast_file_exists, file.getName()), R.string.overwrite, v -> {
-                    synchronized (saveCallbackLock) {
-                        if (saveCallback != null) {
-                            saveCallback.save(uri);
+        try {
+            if (code == SAVE_FILE) {
+                File file = new File(uri.getPath());
+                if (file.exists()) {
+                    Snack.barWarning(activity, activity.getResources().getString(R.string.toast_file_exists, file.getName()), R.string.overwrite, v -> {
+                        synchronized (saveCallbackLock) {
+                            if (saveCallback != null) {
+                                saveCallback.save(uri);
+                            }
                         }
+                    });
+                }
+                synchronized (saveCallbackLock) {
+                    if (saveCallback != null) {
+                        Log.d(DEBUG_TAG, "saving to " + uri);
+                        saveCallback.save(uri);
                     }
-                });
-            }
-            synchronized (saveCallbackLock) {
-                if (saveCallback != null) {
-                    Log.d(DEBUG_TAG, "saving to " + uri);
-                    saveCallback.save(uri);
                 }
-            }
-        } else if (code == READ_FILE) {
-            synchronized (readCallbackLock) {
-                if (readCallback != null) {
-                    Log.d(DEBUG_TAG, "reading " + uri);
-                    readCallback.read(uri);
+            } else if (code == READ_FILE) {
+                synchronized (readCallbackLock) {
+                    if (readCallback != null) {
+                        Log.d(DEBUG_TAG, "reading " + uri);
+                        readCallback.read(uri);
+                    }
                 }
             }
+        } catch (NetworkOnMainThreadException nex) {
+            Log.e(DEBUG_TAG, "Got exception for " + " uri " + nex.getMessage());
+            Snack.toastTopError(activity, activity.getString(R.string.toast_network_file_not_supported, nex.getMessage()));
         }
     }
 

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -612,6 +612,7 @@
     <string name="toast_no_coverage">%1$s has no coverage here</string>
     <string name="toast_tile_layer_errors">The imagery source \'%1$s\' is erroring</string>
     <string name="toast_file_exists">%1$s file exists.</string>
+    <string name="toast_network_file_not_supported">Access to this file over the network is not supported, copy to local storage.\n%1$s</string>
     <string name="toast_needs_resurvey">Object may be out of date</string>
     <string name="toast_missing_key">%1$s key missing</string>
     <string name="toast_invalid_object">Invalid object</string>