android: Clear and describe Java exceptions in the core JNI calls

src/android/document_picker.rs

@@ -1,6 +1,6 @@
 //! Android Storage Access Framework bridge returning readable local files.
 
-use super::jni::{self as jni_helpers, JniExt};
+use super::jni::{self as jni_helpers, JniExt, JniResultExt as _};
 use anyhow::{anyhow, Result};
 use futures::channel::oneshot;
 use gpui::PathPromptOptions;
@@ -38,10 +38,7 @@ fn pick_files(multiple: bool) -> std::result::Result<Option<Vec<PathBuf>>, Strin
                 &[JValue::Object(&activity), JValue::Bool(multiple)],
             )
             .and_then(|value| value.l())
-            .map_err(|error| {
-                env.exception_clear();
-                error.to_string()
-            })?;
+            .or_clear(env)?;
         if result.is_null() {
             return Ok(None);
         }

src/android/host.rs

@@ -76,6 +76,7 @@ use gpui::{App, Application, ApplicationHandle};
 use jni::{objects::JObject, refs::Global};
 use ndk::native_window::NativeWindow;
 
+use super::jni::JniResultExt as _;
 use super::platform::{AndroidPlatform, SharedPlatform};
 use crate::android::{AndroidKeyEvent, TouchPoint};
 
@@ -577,18 +578,9 @@ pub fn set_activity(
     if super::jni::android_app().is_some() {
         return Ok(());
     }
-    match env.new_global_ref(activity) {
-        Ok(activity) => {
-            ACTIVITIES.lock().expect("poisoned").insert(host, activity);
-            Ok(())
-        }
-        Err(err) => {
-            if env.exception_check() {
-                env.exception_clear();
-            }
-            Err(err.to_string())
-        }
-    }
+    let activity = env.new_global_ref(activity).or_clear(env)?;
+    ACTIVITIES.lock().expect("poisoned").insert(host, activity);
+    Ok(())
 }
 
 /// Run `f` with `host`'s own Activity (a global `jobject`), or with the newest one if