From 43ac1bf555336d29535eaf937f5e4121258d1424 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sun, 27 Aug 2023 12:10:12 -0400 Subject: [PATCH] Allows cleaning up on App Pause to perform separately from memory pruning functions --- .../main/java/com/vitorpamplona/amethyst/ServiceManager.kt | 6 +++++- .../main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt b/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt index a33cc2594..f1d896a91 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt @@ -115,7 +115,11 @@ object ServiceManager { Client.disconnect() } - fun cleanUp() { + fun cleanObservers() { + LocalCache.cleanObservers() + } + + fun trimMemory() { LocalCache.cleanObservers() val accounts = LocalPreferences.allLocalAccountNPubs().mapNotNull { decodePublicKeyAsHexOrNull(it) }.toSet() 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 bb82a3357..d86fd04b3 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt @@ -103,6 +103,7 @@ class MainActivity : AppCompatActivity() { } override fun onPause() { + ServiceManager.cleanObservers() // if (BuildConfig.DEBUG) { debugState(this) // } @@ -127,7 +128,7 @@ class MainActivity : AppCompatActivity() { super.onTrimMemory(level) println("Trim Memory $level") GlobalScope.launch(Dispatchers.Default) { - ServiceManager.cleanUp() + ServiceManager.trimMemory() } }