fixup: Borrow JNIEnv mutably

Author: MarijnS95

src/intent.rs

@@ -5,7 +5,7 @@ use jni::{
 };
 
 struct Inner<'env> {
-    env: JNIEnv<'env>,
+    env: &'env mut JNIEnv<'env>,
     object: JObject<'env>,
 }
 
@@ -16,7 +16,7 @@ pub struct Intent<'env> {
 }
 
 impl<'env> Intent<'env> {
-    pub fn from_object(env: JNIEnv<'env>, object: JObject<'env>) -> Self {
+    pub fn from_object(env: &'env mut JNIEnv<'env>, object: JObject<'env>) -> Self {
         Self {
             inner: Ok(Inner { env, object }),
         }
@@ -27,7 +27,7 @@ impl<'env> Intent<'env> {
         Self { inner }
     }
 
-    pub fn new(mut env: JNIEnv<'env>, action: impl AsRef<str>) -> Self {
+    pub fn new(env: &'env mut JNIEnv<'env>, action: impl AsRef<str>) -> Self {
         Self::from_fn(|| {
             let intent_class = env.find_class("android/content/Intent")?;
             let action_view =
@@ -47,7 +47,7 @@ impl<'env> Intent<'env> {
     }
 
     pub fn new_with_uri(
-        mut env: JNIEnv<'env>,
+        env: &'env mut JNIEnv<'env>,
         action: impl AsRef<str>,
         uri: impl AsRef<str>,
     ) -> Self {
@@ -93,7 +93,7 @@ impl<'env> Intent<'env> {
         package_name: impl AsRef<str>,
         class_name: impl AsRef<str>,
     ) -> Self {
-        self.and_then(|mut inner| {
+        self.and_then(|inner| {
             let package_name = inner.env.new_string(package_name)?;
             let class_name = inner.env.new_string(class_name)?;
 
@@ -118,7 +118,7 @@ impl<'env> Intent<'env> {
     /// # })
     /// ```
     pub fn with_extra(self, key: impl AsRef<str>, value: impl AsRef<str>) -> Self {
-        self.and_then(|mut inner| {
+        self.and_then(|inner| {
             let key = inner.env.new_string(key)?;
             let value = inner.env.new_string(value)?;
 
@@ -177,7 +177,7 @@ impl<'env> Intent<'env> {
     /// # })
     /// ```
     pub fn with_type(self, type_name: impl AsRef<str>) -> Self {
-        self.and_then(|mut inner| {
+        self.and_then(|inner| {
             let jstring = inner.env.new_string(type_name)?;
 
             inner.env.call_method(
@@ -195,7 +195,7 @@ impl<'env> Intent<'env> {
         let cx = ndk_context::android_context();
         let activity = unsafe { JObject::from_raw(cx.context() as jni::sys::jobject) };
 
-        self.inner.and_then(|mut inner| {
+        self.inner.and_then(|inner| {
             inner.env.call_method(
                 activity,
                 "startActivity",

src/lib.rs

@@ -9,10 +9,10 @@ pub use intent::Intent;
 use jni::{JNIEnv, JavaVM};
 
 /// Run 'f' with the current [`JNIEnv`] from [`ndk_context`].
-pub fn with_current_env(f: impl FnOnce(&JNIEnv<'_>)) {
+pub fn with_current_env(f: impl FnOnce(&mut JNIEnv)) {
     let cx = ndk_context::android_context();
     let vm = unsafe { JavaVM::from_raw(cx.vm().cast()) }.unwrap();
-    let env = vm.attach_current_thread().unwrap();
+    let mut env = vm.attach_current_thread().unwrap();
 
-    f(&env);
+    f(&mut env);
 }