Revert database condition on business.stop

ACINQ · Feb 22, 2024 · cfc3e45 · cfc3e45
1 parent 8872596
commit cfc3e45
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/services/ChannelsWatcher.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/services/ChannelsWatcher.kt
@@ -143,7 +143,7 @@ class ChannelsWatcher(context: Context, workerParams: WorkerParameters) : Corout
             return Result.failure()
         } finally {
             business.appConnectionsDaemon?.incrementDisconnectCount(AppConnectionsDaemon.ControlTarget.All)
-            business.stop(includingDatabase = false)
+            business.stop()
             log.info("stopped channels-watcher business")
         }
     }

diff --git a/phoenix-ios/phoenix-ios/officers/BusinessManager.swift b/phoenix-ios/phoenix-ios/officers/BusinessManager.swift
@@ -119,7 +119,7 @@ class BusinessManager {
 	public func stop() {
 
 		cancellables.removeAll()
-		business.stop(includingDatabase: true)
+		business.stop()
 		syncManager?.shutdown()
 	}
 

diff --git a/phoenix-ios/phoenix-notifySrvExt/PhoenixManager.swift b/phoenix-ios/phoenix-notifySrvExt/PhoenixManager.swift
@@ -180,7 +180,7 @@ class PhoenixManager {
 		}
 
 		if let prvBusiness = oldBusiness {
-			prvBusiness.stop(includingDatabase: true)
+			prvBusiness.stop()
 			oldBusiness = nil
 			oldCancellables.removeAll()
 		}
@@ -317,7 +317,7 @@ class PhoenixManager {
 			connections.electrum is Lightning_kmpConnection.CLOSED
 		{
 			if let prvBusiness = oldBusiness {
-				prvBusiness.stop(includingDatabase: true)
+				prvBusiness.stop()
 				oldBusiness = nil
 				oldCancellables.removeAll()
 			}

diff --git a/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/PhoenixBusiness.kt b/phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/PhoenixBusiness.kt
@@ -111,20 +111,16 @@ class PhoenixBusiness(
      * It's recommended that you close the network connections (electrum + peer)
      * BEFORE invoking this function, to ensure a clean disconnect from the server.
      */
-    fun stop(includingDatabase: Boolean = true) {
+    fun stop() {
         electrumClient.stop()
         electrumWatcher.stop()
         electrumWatcher.cancel()
         appConnectionsDaemon?.cancel()
-        if (includingDatabase) {
-            appDb.close()
-        }
+        appDb.close()
         networkMonitor.stop()
         walletManager.cancel()
         nodeParamsManager.cancel()
-        if (includingDatabase) {
-            databaseManager.close()
-        }
+        databaseManager.close()
         databaseManager.cancel()
         databaseManager.cancel()
         peerManager.cancel()