From 9fc0c378459d2cea6b244be9f8db74659c1e6f17 Mon Sep 17 00:00:00 2001
From: greenart7c3 <greenart7c3@proton.me>
Date: Mon, 20 Nov 2023 17:35:35 -0300
Subject: [PATCH] fix relay reconnecting when returning from external signer

---
 .../vitorpamplona/amethyst/ui/MainActivity.kt  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
index 5919c1f0d..11d4698f2 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
@@ -49,6 +49,8 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.net.URLEncoder
 import java.nio.charset.StandardCharsets
+import java.util.Timer
+import kotlin.concurrent.schedule
 
 class MainActivity : AppCompatActivity() {
     private val isOnMobileDataState = mutableStateOf(false)
@@ -108,6 +110,7 @@ class MainActivity : AppCompatActivity() {
         DefaultMutedSetting.value = true
 
         // Keep connection alive if it's calling the signer app
+        Log.d("shouldPauseService", "shouldPauseService onResume: $shouldPauseService")
         if (shouldPauseService) {
             GlobalScope.launch(Dispatchers.IO) {
                 serviceManager.justStart()
@@ -121,7 +124,9 @@ class MainActivity : AppCompatActivity() {
         (getSystemService(ConnectivityManager::class.java) as ConnectivityManager).registerDefaultNetworkCallback(networkCallback)
 
         // resets state until next External Signer Call
-        shouldPauseService = true
+        Timer().schedule(350) {
+            shouldPauseService = true
+        }
     }
 
     override fun onPause() {
@@ -134,6 +139,7 @@ class MainActivity : AppCompatActivity() {
         }
         // }
 
+        Log.d("shouldPauseService", "shouldPauseService onPause: $shouldPauseService")
         if (shouldPauseService) {
             GlobalScope.launch(Dispatchers.IO) {
                 serviceManager.pauseForGood()
@@ -171,8 +177,11 @@ class MainActivity : AppCompatActivity() {
         override fun onAvailable(network: Network) {
             super.onAvailable(network)
 
-            GlobalScope.launch(Dispatchers.IO) {
-                serviceManager.forceRestart()
+            Log.d("shouldPauseService", "shouldPauseService onAvailable: $shouldPauseService")
+            if (shouldPauseService) {
+                GlobalScope.launch(Dispatchers.IO) {
+                    serviceManager.forceRestart()
+                }
             }
         }
 
@@ -202,7 +211,8 @@ class MainActivity : AppCompatActivity() {
                     changedNetwork = true
                 }
 
-                if (changedNetwork) {
+                Log.d("shouldPauseService", "shouldPauseService onCapabilitiesChanged: $shouldPauseService")
+                if (changedNetwork && shouldPauseService) {
                     GlobalScope.launch(Dispatchers.IO) {
                         serviceManager.forceRestart()
                     }