Merge pull request #188 from horizontalsystems/fix-clearing-db

Fix clearing db
horizontalsystems · Dec 24, 2018 · 6856abd · 6856abd
2 parents 1400103 + d4cc51e
commit 6856abd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/BitcoinKit.kt b/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/BitcoinKit.kt
@@ -29,7 +29,7 @@ import io.realm.annotations.RealmModule
 @RealmModule(library = true, allClasses = true)
 class BitcoinKitModule
 
-class BitcoinKit(words: List<String>, networkType: NetworkType, peerSize: Int = 10, newWallet: Boolean = false, confirmationsThreshold: Int = 6) : KitStateProvider.Listener, DataProvider.Listener {
+class BitcoinKit(words: List<String>, networkType: NetworkType, walletId: String? = null, peerSize: Int = 10, newWallet: Boolean = false, confirmationsThreshold: Int = 6) : KitStateProvider.Listener, DataProvider.Listener {
 
     interface Listener {
         fun onTransactionsUpdate(bitcoinKit: BitcoinKit, inserted: List<TransactionInfo>, updated: List<TransactionInfo>, deleted: List<Int>)
@@ -55,7 +55,7 @@ class BitcoinKit(words: List<String>, networkType: NetworkType, peerSize: Int =
     private val transactionBuilder: TransactionBuilder
     private val dataProvider: DataProvider
     private val unspentOutputProvider: UnspentOutputProvider
-    private val realmFactory = RealmFactory("bitcoinkit-${networkType.name}")
+    private val realmFactory = RealmFactory("bitcoinkit-${networkType.name}-$walletId")
 
     private val network = when (networkType) {
         NetworkType.MainNet -> MainNet()

diff --git a/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/core/DataProvider.kt b/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/core/DataProvider.kt
@@ -60,9 +60,9 @@ class DataProvider(private val realm: Realm, private val listener: Listener, pri
     }
 
     fun clear() {
-        realm.close()
         transactionRealmResults.removeAllChangeListeners()
         blockRealmResults.removeAllChangeListeners()
+        realm.close()
         balanceSubjectDisposable.dispose()
     }
 

diff --git a/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/network/peer/PeerGroup.kt b/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/network/peer/PeerGroup.kt
@@ -52,7 +52,6 @@ class PeerGroup(
 
     fun close() {
         running = false
-        syncStateListener?.onSyncStop()
 
         interrupt()
         try {
@@ -82,6 +81,8 @@ class PeerGroup(
             }
         }
 
+        syncStateListener?.onSyncStop()
+        blockSyncer = null
         logger.info("Closing all peer connections...")
 
         peerManager.disconnectAll()