Watch for ASB kill

swap/src/asb/event_loop.rs

@@ -18,6 +18,7 @@ use std::collections::HashMap;
 use std::convert::{Infallible, TryInto};
 use std::fmt::Debug;
 use std::sync::Arc;
+use std::time::Duration;
 use jni::JNIEnv;
 use tokio::sync::mpsc;
 use uuid::Uuid;
@@ -171,6 +172,7 @@ where
             }
 
             tokio::select! {
+                biased;
                 swarm_event = self.swarm.select_next_some() => {
                     match swarm_event {
                         SwarmEvent::Behaviour(OutEvent::SwapSetupInitiated { mut send_wallet_snapshot }) => {
@@ -329,6 +331,11 @@ where
                 Some(response_channel) = self.inflight_encrypted_signatures.next() => {
                     let _ = self.swarm.behaviour_mut().encrypted_signature.send_response(response_channel, ());
                 }
+                asb_kill = watch_for_asb_kill(&env.unwrap()) => {
+                    let _ = self.monero_wallet.store();
+                    self.monero_wallet.close();
+                    break;
+                }
             }
         }
     }
@@ -566,3 +573,15 @@ impl<T> Default for MpscChannels<T> {
         MpscChannels { sender, receiver }
     }
 }
+
+pub async fn watch_for_asb_kill(env: &JNIEnv<'_>) -> Result<()> {
+    wait_for_asb_client_kill(env)
+        .await
+}
+
+pub async fn wait_for_asb_client_kill(env: &JNIEnv<'_>) -> Result<()> {
+    while util::get_running_asb(env) {
+        tokio::time::sleep(Duration::from_secs(5)).await;
+    }
+    Ok(())
+}

swap/src/util.rs

@@ -325,4 +325,14 @@ pub fn get_running_swap(env: &JNIEnv) -> bool {
         return running;
     }
     return false;
+}
+
+pub fn get_running_asb(env: &JNIEnv) -> bool {
+    let listener = get_asb_listener(&env);
+    if let JValue::Object(listener) = listener {
+        let result = env.call_method(listener, "getRunningAsb", "()Z", &[]);
+        let running = result.unwrap().z().unwrap();
+        return running;
+    }
+    return false;
 }