Added initializedListeners to IBankingPersistence

persistence/database/RoomBankingPersistence/src/main/java/net/dankito/banking/persistence/RoomBankingPersistence.kt

@@ -18,6 +18,7 @@ import net.dankito.utils.multiplatform.asString
 import net.sqlcipher.database.SQLiteDatabase
 import net.sqlcipher.database.SupportFactory
 import org.slf4j.LoggerFactory
+import java.util.concurrent.CopyOnWriteArraySet
 
 
 open class RoomBankingPersistence(protected open val applicationContext: Context) : IBankingPersistence, ITransactionPartySearcher {
@@ -37,9 +38,19 @@ open class RoomBankingPersistence(protected open val applicationContext: Context
 
     protected lateinit var database: BankingDatabase
 
+    protected open var isInitialized = false
+
+    protected open val initializedListeners = CopyOnWriteArraySet<() -> Unit>()
+
 
     override fun decryptData(password: CharArray): Boolean {
-        return openDatabase(password)
+        val result = openDatabase(password)
+
+        if (result) {
+            callInitializedListeners()
+        }
+
+        return result
     }
 
     override fun changePassword(newPassword: CharArray): Boolean {
@@ -249,4 +260,27 @@ open class RoomBankingPersistence(protected open val applicationContext: Context
             .map { TransactionParty(it.name, it.accountId, it.bankCode) }
     }
 
+
+    override fun addInitializedListener(listener: () -> Unit) {
+        if (isInitialized) {
+            listener()
+        } else {
+            initializedListeners.add(listener)
+        }
+    }
+
+    protected open fun callInitializedListeners() {
+        isInitialized = true
+        val copy = ArrayList(initializedListeners)
+        initializedListeners.clear()
+
+        copy.forEach { listener -> {
+            try {
+                    listener()
+            } catch (e: Exception) {
+                log.error("Could not call listener $listener", e)
+            }
+        } }
+    }
+
 }

persistence/json/BankingPersistenceJson/src/main/kotlin/net/dankito/banking/persistence/BankingPersistenceJson.kt

@@ -93,4 +93,9 @@ open class BankingPersistenceJson(
         }
     }
 
+
+    override fun addInitializedListener(listener: () -> Unit) {
+        listener()
+    }
+
 }

ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/authentication/AuthenticationService.kt

@@ -50,6 +50,8 @@ open class AuthenticationService(
 
 
     init {
+        log.info("Initializing AuthenticationService (at the end database must get opened) ...")
+
         val settings = loadAuthenticationSettings()
 
         if (settings == null) { // first app run -> create a default password
@@ -151,7 +153,11 @@ open class AuthenticationService(
     }
 
     protected open fun openDatabase(password: CharArray): Boolean {
-        return persistence.decryptData(password)
+        val result = persistence.decryptData(password)
+
+        log.info("Did decrypting data / opening database succeed? $result")
+
+        return result
     }
 
 

ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/persistence/IBankingPersistence.kt

@@ -28,4 +28,7 @@ interface IBankingPersistence {
 
     fun saveBankIcon(bank: TypedBankData, iconUrl: String, fileExtension: String?)
 
+
+    fun addInitializedListener(listener: () -> Unit)
+
 }

ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/persistence/NoOpBankingPersistence.kt

@@ -46,4 +46,9 @@ open class NoOpBankingPersistence : IBankingPersistence {
 
     }
 
+
+    override fun addInitializedListener(listener: () -> Unit) {
+        listener()
+    }
+
 }

ui/BankingUiCommon/src/commonMain/kotlin/net/dankito/banking/ui/presenter/BankingPresenter.kt

@@ -154,12 +154,14 @@ open class BankingPresenter(
 
 
     init {
-        asyncRunner.runAsync {
+        persister.addInitializedListener {
-            readAppSettings()
+            asyncRunner.runAsync {
-            readPersistedBanks()
+                readAppSettings()
+                readPersistedBanks()
 
-            if (appSettings.automaticallyUpdateAccountsAfterMinutes != null) { // TODO: check if time has elapsed
+                if (appSettings.automaticallyUpdateAccountsAfterMinutes != null) { // TODO: check if time has elapsed
-                doAutomaticAccountsUpdate()
+                    //doAutomaticAccountsUpdate()
+                }
             }
         }
 

ui/BankingiOSApp/BankingiOSApp/persistence/CoreDataBankingPersistence.swift

@@ -5,6 +5,7 @@ import BankingUiSwift
 import EncryptedCoreData
 
 
+// TODO: implement addInitializedListener()
 class CoreDataBankingPersistence: IBankingPersistence, ITransactionPartySearcher {
     
     private let mapper = Mapper()
@@ -288,5 +289,9 @@ class CoreDataBankingPersistence: IBankingPersistence, ITransactionPartySearcher
             NSLog("Could not delete all banks: \(error)")
         }
     }
+
+    func addInitializedListener(listener: () -> Unit) {
+        listener()
+    }
     
 }