From eb6a5fe63e0d722bc4c534996561f77036fd0ea0 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 19 Apr 2022 12:57:58 +0100
Subject: [PATCH] Try GET_CONTENT first, fall back to OPEN_DOCUMENT.

---
 .../briarproject/briar/android/util/UiUtils.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
index 9c59633aa..446d20e8a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
@@ -610,7 +610,13 @@ public class UiUtils {
 			@Nullable ActivityResultLauncher<String[]> docLauncher,
 			ActivityResultLauncher<String> contentLauncher,
 			String contentType) {
-		// Try OPEN_DOCUMENT if available, fall back to GET_CONTENT
+		// Try GET_CONTENT, fall back to OPEN_DOCUMENT if available
+		try {
+			contentLauncher.launch(contentType);
+			return;
+		} catch (ActivityNotFoundException e) {
+			logException(LOG, WARNING, e);
+		}
 		if (docLauncher != null) {
 			try {
 				docLauncher.launch(new String[] {contentType});
@@ -619,12 +625,6 @@ public class UiUtils {
 				logException(LOG, WARNING, e);
 			}
 		}
-		try {
-			contentLauncher.launch(contentType);
-		} catch (ActivityNotFoundException e) {
-			logException(LOG, WARNING, e);
-			Toast.makeText(ctx, R.string.error_start_activity,
-					LENGTH_LONG).show();
-		}
+		Toast.makeText(ctx, R.string.error_start_activity, LENGTH_LONG).show();
 	}
 }