Merge pull request #67 from horizontalsystems/static-clear

abdrasulov · web-flow · commit 1f94e949df43 · 2019-05-08T18:08:09.000+06:00
Implement static clear() method.
diff --git a/app/src/main/java/io/horizontalsystems/ethereumkit/sample/BalanceFragment.kt b/app/src/main/java/io/horizontalsystems/ethereumkit/sample/BalanceFragment.kt
@@ -21,6 +21,7 @@ class BalanceFragment : Fragment() {
     lateinit var kitStateValue: TextView
     lateinit var erc20StateValue: TextView
     lateinit var refreshButton: Button
+    lateinit var clearButton: Button
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -73,6 +74,7 @@ class BalanceFragment : Fragment() {
         balanceValue = view.findViewById(R.id.balanceValue)
         tokenBalanceValue = view.findViewById(R.id.tokenBalanceValue)
         refreshButton = view.findViewById(R.id.buttonRefresh)
+        clearButton = view.findViewById(R.id.buttonClear)
         feeValue = view.findViewById(R.id.feeValue)
         lbhValue = view.findViewById(R.id.lbhValue)
         kitStateValue = view.findViewById(R.id.kitStateValue)
@@ -81,5 +83,9 @@ class BalanceFragment : Fragment() {
         refreshButton.setOnClickListener {
             viewModel.refresh()
         }
+
+        clearButton.setOnClickListener {
+            viewModel.clear()
+        }
     }
 }
diff --git a/app/src/main/java/io/horizontalsystems/ethereumkit/sample/MainViewModel.kt b/app/src/main/java/io/horizontalsystems/ethereumkit/sample/MainViewModel.kt
@@ -3,6 +3,7 @@ package io.horizontalsystems.ethereumkit.sample
 import android.arch.lifecycle.MutableLiveData
 import android.arch.lifecycle.ViewModel
 import android.util.Log
+import io.horizontalsystems.erc20kit.core.Erc20Kit
 import io.horizontalsystems.ethereumkit.core.EthereumKit
 import io.horizontalsystems.ethereumkit.core.EthereumKit.NetworkType
 import io.horizontalsystems.ethereumkit.core.EthereumKit.SyncState
@@ -25,10 +26,10 @@ class MainViewModel : ViewModel() {
 
     private val disposables = CompositeDisposable()
 
-    private var ethereumKit: EthereumKit
-    private val ethereumAdapter: EthereumAdapter
+    private lateinit var ethereumKit: EthereumKit
+    private lateinit var ethereumAdapter: EthereumAdapter
 
-    private val erc20Adapter: Erc20Adapter
+    private lateinit var erc20Adapter: Erc20Adapter
 
     val transactions = MutableLiveData<List<TransactionRecord>>()
     val balance = MutableLiveData<BigDecimal>()
@@ -44,6 +45,10 @@ class MainViewModel : ViewModel() {
     val gasPrice: Long = 5_000_000_000
 
     init {
+        init()
+    }
+
+    fun init() {
         //  val words = "subway plate brick pattern inform used oblige identify cherry drop flush balance".split(" ")
         val words = "mom year father track attend frown loyal goddess crisp abandon juice roof".split(" ")
 
@@ -168,6 +173,12 @@ class MainViewModel : ViewModel() {
         fee.postValue(ethereumKit.fee(gasPrice))
     }
 
+    fun clear() {
+        EthereumKit.clear(App.instance)
+        Erc20Kit.clear(App.instance)
+        init()
+    }
+
     fun receiveAddress(): String {
         return ethereumKit.receiveAddress
     }
diff --git a/app/src/main/res/layout/fragment_balance.xml b/app/src/main/res/layout/fragment_balance.xml
@@ -151,4 +151,17 @@
         app:layout_constraintTop_toBottomOf="@+id/kitStateTitle"
         />
 
+    <Button
+        android:id="@+id/buttonClear"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:text="Clear"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/buttonRefresh"
+        />
+
 </android.support.constraint.ConstraintLayout>
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/BalanceManager.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/BalanceManager.kt
@@ -30,8 +30,4 @@ class BalanceManager(private val contractAddress: ByteArray,
                 }
     }
 
-    override fun clear() {
-        storage.clearBalance()
-        disposables.clear()
-    }
 }
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Erc20DatabaseManager.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Erc20DatabaseManager.kt
@@ -0,0 +1,43 @@
+package io.horizontalsystems.erc20kit.core
+
+import android.arch.persistence.room.RoomDatabase
+import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import io.horizontalsystems.erc20kit.core.room.Erc20KitDatabase
+import java.io.File
+
+internal object Erc20DatabaseManager {
+
+    fun getErc20Database(context: Context, contractAddress: String): Erc20KitDatabase {
+        val databaseName = "erc20-$contractAddress"
+        return Erc20KitDatabase.getInstance(context, databaseName).also { addDatabasePath(context, it) }
+    }
+
+    fun clear(context: Context) {
+        synchronized(this) {
+            val preferences = context.getSharedPreferences(preferencesName, Context.MODE_PRIVATE)
+            val paths = HashSet<String>(preferences.getStringSet(DATABASE_PATHS, setOf()))
+
+            paths.forEach { path ->
+                SQLiteDatabase.deleteDatabase(File(path))
+            }
+
+            preferences.edit().clear().apply()
+        }
+    }
+
+    private const val preferencesName = "erc20_database_preferences"
+    private const val DATABASE_PATHS = "key_database_paths"
+
+    private fun addDatabasePath(context: Context, database: RoomDatabase) {
+        val path = database.openHelper.writableDatabase.path
+
+        synchronized(this) {
+            val preferences = context.getSharedPreferences(preferencesName, Context.MODE_PRIVATE)
+
+            val paths = HashSet<String>(preferences.getStringSet(DATABASE_PATHS, setOf()))
+            paths.add(path)
+            preferences.edit().putStringSet(DATABASE_PATHS, paths).apply()
+        }
+    }
+}
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Erc20Kit.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Erc20Kit.kt
@@ -86,9 +86,7 @@ class Erc20Kit(private val ethereumKit: EthereumKit,
     val transactionsFlowable: Flowable<List<TransactionInfo>>
         get() = state.transactionsSubject.toFlowable(BackpressureStrategy.BUFFER)
 
-    fun clear() {
-        transactionManager.clear()
-        balanceManager.clear()
+    fun stop() {
         disposables.clear()
     }
 
@@ -126,7 +124,8 @@ class Erc20Kit(private val ethereumKit: EthereumKit,
             val contractAddressRaw = contractAddress.hexStringToByteArray()
             val address = ethereumKit.receiveAddressRaw
 
-            val roomStorage = RoomStorage(context, "erc20_$contractAddress")
+            val erc20KitDatabase = Erc20DatabaseManager.getErc20Database(context, contractAddress)
+            val roomStorage = Erc20Storage(erc20KitDatabase)
             val transactionStorage: ITransactionStorage = roomStorage
             val balanceStorage: ITokenBalanceStorage = roomStorage
 
@@ -142,6 +141,10 @@ class Erc20Kit(private val ethereumKit: EthereumKit,
 
             return erc20Kit
         }
+
+        fun clear(context: Context) {
+            Erc20DatabaseManager.clear(context)
+        }
     }
 
 }
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Erc20Storage.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Erc20Storage.kt
@@ -1,16 +1,12 @@
 package io.horizontalsystems.erc20kit.core
 
-import android.content.Context
 import io.horizontalsystems.erc20kit.core.room.Erc20KitDatabase
 import io.horizontalsystems.erc20kit.models.TokenBalance
 import io.horizontalsystems.erc20kit.models.Transaction
 import io.reactivex.Single
 import java.math.BigInteger
 
-class RoomStorage(context: Context, databaseName: String) : ITransactionStorage, ITokenBalanceStorage {
-
-    private val database = Erc20KitDatabase.getInstance(context, databaseName)
-
+class Erc20Storage(private val database: Erc20KitDatabase) : ITransactionStorage, ITokenBalanceStorage {
 
     // ITransactionStorage
 
@@ -48,10 +44,6 @@ class RoomStorage(context: Context, databaseName: String) : ITransactionStorage,
         database.transactionDao.insert(transactions)
     }
 
-    override fun clearTransactions() {
-        database.transactionDao.deleteAll()
-    }
-
 
     // ITokenBalanceStorage
 
@@ -63,7 +55,4 @@ class RoomStorage(context: Context, databaseName: String) : ITransactionStorage,
         database.tokenBalanceDao.insert(TokenBalance(balance))
     }
 
-    override fun clearBalance() {
-        database.tokenBalanceDao.deleteAll()
-    }
-}
+}
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Interfaces.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/Interfaces.kt
@@ -20,7 +20,6 @@ interface ITransactionManager {
     fun getTransactions(fromTransaction: TransactionKey?, limit: Int?): Single<List<Transaction>>
     fun sync()
     fun send(to: ByteArray, value: BigInteger, gasPrice: Long, gasLimit: Long): Single<Transaction>
-    fun clear()
 }
 
 interface IBalanceManagerListener {
@@ -33,7 +32,6 @@ interface IBalanceManager {
 
     val balance: BigInteger?
     fun sync()
-    fun clear()
 }
 
 interface ITransactionStorage {
@@ -42,13 +40,11 @@ interface ITransactionStorage {
     fun getTransactions(fromTransaction: TransactionKey?, limit: Int?): Single<List<Transaction>>
     fun getPendingTransactions(): List<Transaction>
     fun save(transactions: List<Transaction>)
-    fun clearTransactions()
 }
 
 interface ITokenBalanceStorage {
     fun getBalance(): BigInteger?
     fun save(balance: BigInteger)
-    fun clearBalance()
 }
 
 interface IDataProvider {
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/TransactionManager.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/TransactionManager.kt
@@ -94,8 +94,4 @@ class TransactionManager(private val contractAddress: ByteArray,
                 }
     }
 
-    override fun clear() {
-        disposables.clear()
-        storage.clearTransactions()
-    }
 }
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/room/Erc20KitDatabase.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/room/Erc20KitDatabase.kt
@@ -18,16 +18,7 @@ abstract class Erc20KitDatabase : RoomDatabase() {
 
     companion object {
 
-        @Volatile
-        private var INSTANCE: Erc20KitDatabase? = null
-
         fun getInstance(context: Context, databaseName: String): Erc20KitDatabase {
-            return INSTANCE ?: synchronized(this) {
-                INSTANCE ?: buildDatabase(context, databaseName).also { INSTANCE = it }
-            }
-        }
-
-        private fun buildDatabase(context: Context, databaseName: String): Erc20KitDatabase {
             return Room.databaseBuilder(context, Erc20KitDatabase::class.java, databaseName)
                     .fallbackToDestructiveMigration()
                     .allowMainThreadQueries()
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/room/TokenBalanceDao.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/room/TokenBalanceDao.kt
@@ -15,6 +15,4 @@ interface TokenBalanceDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insert(balance: TokenBalance)
 
-    @Query("DELETE FROM TokenBalance")
-    fun deleteAll()
 }
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/room/TransactionDao.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/core/room/TransactionDao.kt
@@ -22,7 +22,4 @@ interface TransactionDao {
     @Update(onConflict = OnConflictStrategy.REPLACE)
     fun update(transaction: Transaction)
 
-    @Query("DELETE FROM `Transaction`")
-    fun deleteAll()
-
 }
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/ApiBlockchain.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/ApiBlockchain.kt
@@ -58,11 +58,6 @@ class ApiBlockchain(
         disposables.clear()
     }
 
-    override fun clear() {
-        disposables.clear()
-        storage.clear()
-    }
-
     override fun send(rawTransaction: RawTransaction): Single<EthereumTransaction> {
         return rpcApiProvider.getTransactionCount(address)
                 .flatMap { nonce ->
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/storage/ApiDatabase.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/storage/ApiDatabase.kt
@@ -20,15 +20,7 @@ abstract class ApiDatabase : RoomDatabase() {
 
     companion object {
 
-        @Volatile private var INSTANCE: ApiDatabase? = null
-
         fun getInstance(context: Context, databaseName: String): ApiDatabase {
-            return INSTANCE ?: synchronized(this) {
-                INSTANCE ?: buildDatabase(context, databaseName).also { INSTANCE = it }
-            }
-        }
-
-        private fun buildDatabase(context: Context, databaseName: String): ApiDatabase {
             return Room.databaseBuilder(context, ApiDatabase::class.java, databaseName)
                     .fallbackToDestructiveMigration()
                     .allowMainThreadQueries()
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/storage/ApiRoomStorage.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/storage/ApiRoomStorage.kt
@@ -1,17 +1,13 @@
 package io.horizontalsystems.ethereumkit.api.storage
 
-import android.content.Context
 import io.horizontalsystems.ethereumkit.api.models.EthereumBalance
 import io.horizontalsystems.ethereumkit.api.models.LastBlockHeight
 import io.horizontalsystems.ethereumkit.core.IApiStorage
 import io.horizontalsystems.ethereumkit.models.EthereumTransaction
 import io.reactivex.Single
 import java.math.BigInteger
 
-class ApiRoomStorage(databaseName: String, context: Context) : IApiStorage {
-
-    private val database: ApiDatabase = ApiDatabase.getInstance(context, databaseName)
-
+class ApiRoomStorage(private val database: ApiDatabase) : IApiStorage {
 
     override fun getTransactions(fromHash: ByteArray?, limit: Int?, contractAddress: ByteArray?): Single<List<EthereumTransaction>> {
         val single =
@@ -67,7 +63,4 @@ class ApiRoomStorage(databaseName: String, context: Context) : IApiStorage {
         database.transactionDao().insert(ethereumTransactions)
     }
 
-    override fun clear() {
-        database.clearAllTables()
-    }
 }
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumDatabaseManager.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumDatabaseManager.kt
@@ -0,0 +1,49 @@
+package io.horizontalsystems.ethereumkit.core
+
+import android.arch.persistence.room.RoomDatabase
+import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import io.horizontalsystems.ethereumkit.api.storage.ApiDatabase
+import io.horizontalsystems.ethereumkit.spv.core.room.SPVDatabase
+import java.io.File
+
+internal object EthereumDatabaseManager {
+
+    fun getEthereumApiDatabase(context: Context, walletId: String, networkType: EthereumKit.NetworkType): ApiDatabase {
+        val databaseName = "api-$walletId-${networkType.name}"
+        return ApiDatabase.getInstance(context, databaseName).also { addDatabasePath(context, it) }
+    }
+
+    fun getEthereumSpvDatabase(context: Context, walletId: String, networkType: EthereumKit.NetworkType): SPVDatabase {
+        val databaseName = "spv-$walletId-${networkType.name}"
+        return SPVDatabase.getInstance(context, databaseName).also { addDatabasePath(context, it) }
+    }
+
+    fun clear(context: Context) {
+        synchronized(this) {
+            val preferences = context.getSharedPreferences(preferencesName, Context.MODE_PRIVATE)
+            val paths = HashSet<String>(preferences.getStringSet(DATABASE_PATHS, setOf()))
+
+            paths.forEach { path ->
+                SQLiteDatabase.deleteDatabase(File(path))
+            }
+
+            preferences.edit().clear().apply()
+        }
+    }
+
+    private const val preferencesName = "ethereum_database_preferences"
+    private const val DATABASE_PATHS = "key_database_paths"
+
+    private fun addDatabasePath(context: Context, database: RoomDatabase) {
+        val path = database.openHelper.writableDatabase.path
+
+        synchronized(this) {
+            val preferences = context.getSharedPreferences(preferencesName, Context.MODE_PRIVATE)
+
+            val paths = HashSet<String>(preferences.getStringSet(DATABASE_PATHS, setOf()))
+            paths.add(path)
+            preferences.edit().putStringSet(DATABASE_PATHS, paths).apply()
+        }
+    }
+}
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumKit.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumKit.kt
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/Interfaces.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/Interfaces.kt
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/SpvBlockchain.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/SpvBlockchain.kt
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/SpvRoomStorage.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/SpvRoomStorage.kt
diff --git a/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/room/SPVDatabase.kt b/ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/room/SPVDatabase.kt

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,4 @@ class BalanceManager(private val contractAddress: ByteArray,`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`- override fun clear() {`
`34`		`- storage.clearBalance()`
`35`		`- disposables.clear()`
`36`		`- }`
`37`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,7 @@ class Erc20Kit(private val ethereumKit: EthereumKit,`
`86`	`86`	`val transactionsFlowable: Flowable<List<TransactionInfo>>`
`87`	`87`	`get() = state.transactionsSubject.toFlowable(BackpressureStrategy.BUFFER)`
`88`	`88`
`89`		`- fun clear() {`
`90`		`- transactionManager.clear()`
`91`		`- balanceManager.clear()`
	`89`	`+ fun stop() {`
`92`	`90`	`disposables.clear()`
`93`	`91`	`}`
`94`	`92`
`@@ -126,7 +124,8 @@ class Erc20Kit(private val ethereumKit: EthereumKit,`
`126`	`124`	`val contractAddressRaw = contractAddress.hexStringToByteArray()`
`127`	`125`	`val address = ethereumKit.receiveAddressRaw`
`128`	`126`
`129`		`- val roomStorage = RoomStorage(context, "erc20_$contractAddress")`
	`127`	`+ val erc20KitDatabase = Erc20DatabaseManager.getErc20Database(context, contractAddress)`
	`128`	`+ val roomStorage = Erc20Storage(erc20KitDatabase)`
`130`	`129`	`val transactionStorage: ITransactionStorage = roomStorage`
`131`	`130`	`val balanceStorage: ITokenBalanceStorage = roomStorage`
`132`	`131`
`@@ -142,6 +141,10 @@ class Erc20Kit(private val ethereumKit: EthereumKit,`
`142`	`141`
`143`	`142`	`return erc20Kit`
`144`	`143`	`}`
	`144`	`+`
	`145`	`+ fun clear(context: Context) {`
	`146`	`+ Erc20DatabaseManager.clear(context)`
	`147`	`+ }`
`145`	`148`	`}`
`146`	`149`
`147`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ interface ITransactionManager {`
`20`	`20`	`fun getTransactions(fromTransaction: TransactionKey?, limit: Int?): Single<List<Transaction>>`
`21`	`21`	`fun sync()`
`22`	`22`	`fun send(to: ByteArray, value: BigInteger, gasPrice: Long, gasLimit: Long): Single<Transaction>`
`23`		`- fun clear()`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`interface IBalanceManagerListener {`
`@@ -33,7 +32,6 @@ interface IBalanceManager {`
`33`	`32`
`34`	`33`	`val balance: BigInteger?`
`35`	`34`	`fun sync()`
`36`		`- fun clear()`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`interface ITransactionStorage {`
`@@ -42,13 +40,11 @@ interface ITransactionStorage {`
`42`	`40`	`fun getTransactions(fromTransaction: TransactionKey?, limit: Int?): Single<List<Transaction>>`
`43`	`41`	`fun getPendingTransactions(): List<Transaction>`
`44`	`42`	`fun save(transactions: List<Transaction>)`
`45`		`- fun clearTransactions()`
`46`	`43`	`}`
`47`	`44`
`48`	`45`	`interface ITokenBalanceStorage {`
`49`	`46`	`fun getBalance(): BigInteger?`
`50`	`47`	`fun save(balance: BigInteger)`
`51`		`- fun clearBalance()`
`52`	`48`	`}`
`53`	`49`
`54`	`50`	`interface IDataProvider {`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,4 @@ class TransactionManager(private val contractAddress: ByteArray,`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`- override fun clear() {`
`98`		`- disposables.clear()`
`99`		`- storage.clearTransactions()`
`100`		`- }`
`101`	`97`	`}`