getIntent

Author: MarijnS95

src/intent.rs

@@ -1,28 +1,79 @@
-use jni::{
-    errors::Error,
-    objects::{JObject, JString},
-    JNIEnv,
-};
-
-struct Inner<'env> {
-    env: JNIEnv<'env>,
-    object: JObject<'env>,
-}
+use jni::{errors::Error, objects::JObject, JNIEnv};
 
-/// A messaging object you can use to request an action from another android app component.
 #[must_use]
 pub struct Intent<'env> {
-    inner: Result<Inner<'env>, Error>,
+    pub(crate) env: JNIEnv<'env>,
+    pub(crate) object: JObject<'env>,
+}
+
+impl Intent<'_> {
+    // TODO: Could also return a borrowed JString
+    pub fn action(&self) -> std::io::Result<String> {
+        let action = self
+            .env
+            .call_method(self.object, "getAction", "()Ljava/lang/String;", &[])
+            .map_err(std::io::Error::other)?
+            .l()
+            .map_err(std::io::Error::other)?;
+        dbg!(action);
+        let action = self
+            .env
+            .get_string(action.into())
+            .map_err(std::io::Error::other)?;
+        Ok(action.into())
+    }
+
+    pub fn data_string(&self) -> std::io::Result<String> {
+        let data_string = self
+            .env
+            .call_method(self.object, "getDataString", "()Ljava/lang/String;", &[])
+            .map_err(std::io::Error::other)?
+            .l()
+            .map_err(std::io::Error::other)?;
+        let data_string = self
+            .env
+            .get_string(data_string.into())
+            .map_err(std::io::Error::other)?;
+        Ok(data_string.into())
+    }
+
+    /// <https://developer.android.com/reference/android/content/Intent#getStringExtra(java.lang.String)>
+    pub fn string_extra(&self, name: &str) -> std::io::Result<String> {
+        let name = self.env.new_string(name).map_err(std::io::Error::other)?;
+
+        let extra = self
+            .env
+            .call_method(
+                self.object,
+                "getStringExtra",
+                "(Ljava/lang/String;)Ljava/lang/String;",
+                &[name.into()],
+            )
+            .map_err(std::io::Error::other)?
+            .l()
+            .map_err(std::io::Error::other)?;
+        let extra = self
+            .env
+            .get_string(extra.into())
+            .map_err(std::io::Error::other)?;
+        Ok(extra.into())
+    }
+}
+
+/// A messaging object you can use to request an action from another Android app component.
+#[must_use]
+pub struct IntentBuilder<'env> {
+    inner: Result<Intent<'env>, Error>,
 }
 
-impl<'env> Intent<'env> {
+impl<'env> IntentBuilder<'env> {
     pub fn from_object(env: JNIEnv<'env>, object: JObject<'env>) -> Self {
         Self {
-            inner: Ok(Inner { env, object }),
+            inner: Ok(Intent { env, object }),
         }
     }
 
-    fn from_fn(f: impl FnOnce() -> Result<Inner<'env>, Error>) -> Self {
+    fn from_fn(f: impl FnOnce() -> Result<Intent<'env>, Error>) -> Self {
         let inner = f();
         Self { inner }
     }
@@ -33,10 +84,9 @@ impl<'env> Intent<'env> {
             let action_view =
                 env.get_static_field(intent_class, action.as_ref(), "Ljava/lang/String;")?;
 
-            let intent =
-                env.new_object(intent_class, "(Ljava/lang/String;)V", &[action_view.into()])?;
+            let intent = env.new_object(intent_class, "(Ljava/lang/String;)V", &[action_view])?;
 
-            Ok(Inner {
+            Ok(Intent {
                 env,
                 object: intent,
             })
@@ -51,7 +101,7 @@ impl<'env> Intent<'env> {
                 uri_class,
                 "parse",
                 "(Ljava/lang/String;)Landroid/net/Uri;",
-                &[JString::from(url_string).into()],
+                &[url_string.into()],
             )?;
 
             let intent_class = env.find_class("android/content/Intent")?;
@@ -61,10 +111,10 @@ impl<'env> Intent<'env> {
             let intent = env.new_object(
                 intent_class,
                 "(Ljava/lang/String;Landroid/net/Uri;)V",
-                &[action_view.into(), uri.into()],
+                &[action_view, uri],
             )?;
 
-            Ok(Inner {
+            Ok(Intent {
                 env,
                 object: intent,
             })
@@ -80,7 +130,11 @@ impl<'env> Intent<'env> {
     /// intent.set_class_name("com.excample", "IntentTarget")
     /// # })
     /// ```
-    pub fn set_class_name(self, package_name: impl AsRef<str>, class_name: impl AsRef<str>) -> Self {
+    pub fn set_class_name(
+        self,
+        package_name: impl AsRef<str>,
+        class_name: impl AsRef<str>,
+    ) -> Self {
         self.and_then(|inner| {
             let package_name = inner.env.new_string(package_name)?;
             let class_name = inner.env.new_string(class_name)?;
@@ -195,7 +249,7 @@ impl<'env> Intent<'env> {
         })
     }
 
-    fn and_then(mut self, f: impl FnOnce(Inner) -> Result<Inner, Error>) -> Self {
+    fn and_then(mut self, f: impl FnOnce(Intent) -> Result<Intent, Error>) -> Self {
         self.inner = self.inner.and_then(f);
         self
     }

src/lib.rs

@@ -5,14 +5,44 @@ mod extra;
 pub use extra::Extra;
 
 mod intent;
-pub use intent::Intent;
-use jni::{JNIEnv, JavaVM};
+pub use intent::{Intent, IntentBuilder};
+use jni::{objects::JObject, JNIEnv, JavaVM};
 
 /// Run 'f' with the current [`JNIEnv`] from [`ndk_context`].
 pub fn with_current_env(f: impl FnOnce(JNIEnv)) {
+    // XXX: Pass AndroidActivity?
     let cx = ndk_context::android_context();
     let vm = unsafe { JavaVM::from_raw(cx.vm().cast()) }.unwrap();
     let env = vm.attach_current_thread().unwrap();
 
-    f(env.clone());
+    // TODO: Pass current activity?
+
+    f(*env);
+}
+
+/// Provides the intent from [`Activity#getIntent()`].
+///
+/// [`Activity#getIntent()`]: https://developer.android.com/reference/android/app/Activity#getIntent()
+pub fn with_current_intent<T>(f: impl FnOnce(Intent<'_>) -> T) -> std::io::Result<T> {
+    let cx = ndk_context::android_context();
+    let vm = unsafe { JavaVM::from_raw(cx.vm().cast()) }.unwrap();
+    let env = vm.attach_current_thread().unwrap();
+    let activity = unsafe { JObject::from_raw(cx.context() as jni::sys::jobject) };
+
+    let object = env
+        .call_method(
+            activity,
+            "getIntent",
+            "()Landroid/content/Intent;",
+            // &[JValue::from(&j_url)],
+            &[],
+        )
+        .unwrap()
+        .l()
+        .unwrap();
+    // dbg!(intent);
+
+    let intent = Intent { env: *env, object };
+
+    Ok(f(intent))
 }