Create `get_method_id` helper method

1 files changed, 17 insertions, 8 deletions

diff --git a/mullvad-jni/src/jni_event_listener.rs b/mullvad-jni/src/jni_event_listener.rs
index 7beb7ae844..e24d3885c5 100644
--- a/mullvad-jni/src/jni_event_listener.rs
+++ b/mullvad-jni/src/jni_event_listener.rs
@@ -1,6 +1,6 @@
 use crate::{get_class, into_java::IntoJava};
 use jni::{
-    objects::{JMethodID, JObject, JValue},
+    objects::{GlobalRef, JMethodID, JObject, JValue},
     signature::{JavaType, Primitive},
     AttachGuard, JNIEnv,
 };
@@ -83,13 +83,12 @@ impl<'env> JniEventHandler<'env> {
         events: mpsc::Receiver<TunnelStateTransition>,
     ) -> Result<Self, Error> {
         let class = get_class("net/mullvad/mullvadvpn/MullvadDaemon");
-        let notify_tunnel_event = env
-            .get_method_id(
-                &class,
-                "notifyTunnelStateEvent",
-                "(Lnet/mullvad/mullvadvpn/model/TunnelStateTransition;)V",
-            )
-            .map_err(|error| Error::FindMethod("notifyTunnelStateEvent", error))?;
+        let notify_tunnel_event = Self::get_method_id(
+            &env,
+            &class,
+            "notifyTunnelStateEvent",
+            "(Lnet/mullvad/mullvadvpn/model/TunnelStateTransition;)V",
+        )?;
 
         Ok(JniEventHandler {
             env,
@@ -99,6 +98,16 @@ impl<'env> JniEventHandler<'env> {
         })
     }
 
+    fn get_method_id(
+        env: &AttachGuard<'env>,
+        class: &GlobalRef,
+        method: &'static str,
+        signature: &str,
+    ) -> Result<JMethodID<'env>, Error> {
+        env.get_method_id(class, method, signature)
+            .map_err(|error| Error::FindMethod(method, error))
+    }
+
     fn run(&mut self) {
         while let Ok(event) = self.events.recv() {
             self.handle_tunnel_event(event);