Merge pull request #152 from soramitsu/rc/1.2.1

Rc/1.2.1

Author: valentunn

app/build.gradle

@@ -95,9 +95,6 @@ dependencies {
     implementation navigationFragmentDep
     implementation navigationUiDep
 
-    implementation rxJavaDep
-    implementation rxAndroidDep
-
     implementation roomDep
 
     implementation fearlessLibDep
@@ -110,11 +107,12 @@ dependencies {
 
     implementation retrofitDep
     implementation gsonConvertedDep
-    implementation rxCallAdapterDep
 
     implementation gifDep
 
     compileOnly wsDep
+
+    implementation coroutinesDep
 }
 
 task printVersion {

app/src/main/java/jp/co/soramitsu/app/root/di/RootDependencies.kt

@@ -5,6 +5,7 @@ import jp.co.soramitsu.common.data.network.rpc.ConnectionManager
 import jp.co.soramitsu.common.mixin.api.NetworkStateMixin
 import jp.co.soramitsu.common.resources.ResourceManager
 import jp.co.soramitsu.feature_account_api.domain.interfaces.AccountRepository
+import jp.co.soramitsu.feature_wallet_api.di.WalletUpdaters
 import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository
 import jp.co.soramitsu.feature_wallet_api.domain.model.BuyTokenRegistry
 
@@ -22,4 +23,6 @@ interface RootDependencies {
     fun buyTokenRegistry(): BuyTokenRegistry
 
     fun resourceManager(): ResourceManager
+
+    fun walletUpdaters(): WalletUpdaters
 }

app/src/main/java/jp/co/soramitsu/app/root/di/RootFeatureModule.kt

@@ -2,22 +2,32 @@ package jp.co.soramitsu.app.root.di
 
 import dagger.Module
 import dagger.Provides
+import jp.co.soramitsu.app.root.domain.CompositeUpdater
 import jp.co.soramitsu.app.root.domain.RootInteractor
 import jp.co.soramitsu.common.di.scope.FeatureScope
+import jp.co.soramitsu.core_api.data.network.Updater
 import jp.co.soramitsu.feature_account_api.domain.interfaces.AccountRepository
-import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository
+import jp.co.soramitsu.feature_wallet_api.di.WalletUpdaters
 import jp.co.soramitsu.feature_wallet_api.domain.model.BuyTokenRegistry
 
 @Module
 class RootFeatureModule {
 
+    @Provides
+    @FeatureScope
+    fun provideRootUpdater(
+        walletUpdaters: WalletUpdaters
+    ): Updater {
+        return CompositeUpdater(walletUpdaters.updaters)
+    }
+
     @Provides
     @FeatureScope
     fun provideRootInteractor(
         accountRepository: AccountRepository,
-        walletRepository: WalletRepository,
+        rootUpdater: Updater,
         buyTokenRegistry: BuyTokenRegistry
     ): RootInteractor {
-        return RootInteractor(accountRepository, buyTokenRegistry, walletRepository)
+        return RootInteractor(accountRepository, rootUpdater, buyTokenRegistry)
     }
 }

app/src/main/java/jp/co/soramitsu/app/root/domain/CompositeUpdater.kt

@@ -0,0 +1,22 @@
+package jp.co.soramitsu.app.root.domain
+
+import jp.co.soramitsu.core_api.data.network.Updater
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.withContext
+
+class CompositeUpdater(
+    private val updaters: List<Updater>
+) : Updater {
+
+    constructor(vararg updaters: Updater) : this(updaters.toList())
+
+    override suspend fun listenForUpdates(): Unit = withContext(Dispatchers.IO) {
+        val coroutines = updaters.map {
+            async { it.listenForUpdates() }
+        }
+
+        coroutines.awaitAll()
+    }
+}

app/src/main/java/jp/co/soramitsu/app/root/domain/RootInteractor.kt

@@ -1,23 +1,21 @@
 package jp.co.soramitsu.app.root.domain
 
-import io.reactivex.Completable
+import jp.co.soramitsu.core_api.data.network.Updater
 import jp.co.soramitsu.feature_account_api.domain.interfaces.AccountRepository
-import jp.co.soramitsu.feature_account_api.domain.model.Node
-import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository
 import jp.co.soramitsu.feature_wallet_api.domain.model.BuyTokenRegistry
 import jp.co.soramitsu.feature_wallet_impl.data.buyToken.ExternalProvider
 
 class RootInteractor(
     private val accountRepository: AccountRepository,
-    private val buyTokenRegistry: BuyTokenRegistry,
-    private val walletRepository: WalletRepository
+    private val rootUpdater: Updater,
+    private val buyTokenRegistry: BuyTokenRegistry
 ) {
-    fun observeSelectedNode() = accountRepository.observeSelectedNode()
 
-    fun listenForAccountUpdates(networkType: Node.NetworkType): Completable = accountRepository.observeSelectedAccount()
-        .filter { it.network.type == networkType }
-        .distinctUntilChanged { old, new -> old.address == new.address }
-        .switchMapCompletable(walletRepository::listenForUpdates)
+    fun selectedNodeFlow() = accountRepository.selectedNodeFlow()
+
+    suspend fun listenForUpdates() {
+        rootUpdater.listenForUpdates()
+    }
 
     fun isBuyProviderRedirectLink(link: String) = buyTokenRegistry.availableProviders
         .filterIsInstance<ExternalProvider>()

app/src/main/java/jp/co/soramitsu/app/root/presentation/RootActivity.kt

@@ -2,7 +2,6 @@ package jp.co.soramitsu.app.root.presentation
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.lifecycle.Observer
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import jp.co.soramitsu.app.R
@@ -88,9 +87,9 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
     }
 
     override fun subscribe(viewModel: RootViewModel) {
-        viewModel.showConnectingBarLiveData.observe(this, Observer { show ->
+        viewModel.showConnectingBarLiveData.observe(this) { show ->
             rootNetworkBar.setVisible(show)
-        })
+        }
 
         viewModel.messageLiveData.observe(this, EventObserver {
             showToast(it)

app/src/main/java/jp/co/soramitsu/app/root/presentation/RootViewModel.kt

@@ -1,8 +1,6 @@
 package jp.co.soramitsu.app.root.presentation
 
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
+import androidx.lifecycle.viewModelScope
 import jp.co.soramitsu.app.R
 import jp.co.soramitsu.app.root.domain.RootInteractor
 import jp.co.soramitsu.common.base.BaseViewModel
@@ -11,7 +9,16 @@ import jp.co.soramitsu.common.data.network.rpc.LifecycleCondition
 import jp.co.soramitsu.common.mixin.api.NetworkStateMixin
 import jp.co.soramitsu.common.mixin.api.NetworkStateUi
 import jp.co.soramitsu.common.resources.ResourceManager
-import jp.co.soramitsu.common.utils.plusAssign
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import kotlin.coroutines.EmptyCoroutineContext
 
 class RootViewModel(
     private val interactor: RootInteractor,
@@ -20,47 +27,46 @@ class RootViewModel(
     private val resourceManager: ResourceManager,
     private val networkStateMixin: NetworkStateMixin
 ) : BaseViewModel(), NetworkStateUi by networkStateMixin {
-    private var socketSourceDisposable: Disposable? = null
+
+    private var nodeScope = CoroutineScope(EmptyCoroutineContext)
 
     private var willBeClearedForLanguageChange = false
 
     init {
         observeAllowedToConnect()
-
-        disposables += networkStateMixin.networkStateDisposable
     }
 
     private fun observeAllowedToConnect() {
-        disposables += connectionManager.observeLifecycleCondition()
+        connectionManager.lifecycleConditionFlow()
             .distinctUntilChanged()
-            .subscribe { lifecycleCondition ->
+            .onEach { lifecycleCondition ->
                 if (lifecycleCondition == LifecycleCondition.ALLOWED) {
                     bindConnectionToNode()
                 } else {
                     unbindConnection()
                 }
             }
+            .flowOn(Dispatchers.IO)
+            .launchIn(viewModelScope)
     }
 
-    private fun bindConnectionToNode() {
-        socketSourceDisposable = interactor.observeSelectedNode()
-            .subscribeOn(Schedulers.io())
+    private fun bindConnectionToNode() = nodeScope.launch {
+        interactor.selectedNodeFlow()
             .distinctUntilChanged()
-            .doOnNext {
+            .onEach {
                 if (connectionManager.started()) {
                     connectionManager.switchUrl(it.link)
                 } else {
                     connectionManager.start(it.link)
                 }
-            }.switchMapCompletable {
-                interactor.listenForAccountUpdates(it.networkType)
+            }.flowOn(Dispatchers.IO)
+            .collectLatest {
+                interactor.listenForUpdates()
             }
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe()
     }
 
     private fun unbindConnection() {
-        socketSourceDisposable?.dispose()
+        nodeScope.coroutineContext.cancelChildren()
 
         connectionManager.stop()
     }

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.2.0'
-        versionCode = 8
+        versionName = '1.2.1'
+        versionCode = 10
 
         // SDK and tools
         compileSdkVersion = 29
@@ -15,8 +15,7 @@ buildscript {
         cardViewVersion = '1.0.0'
         constraintVersion = '1.1.3'
 
-        rxJavaVersion = '2.2.7'
-        rxAndroidVersion = '2.1.0'
+        coroutinesVersion = '1.4.2'
 
         biometricVersion = '1.0.1'
 
@@ -27,7 +26,7 @@ buildscript {
 
         architectureComponentVersion = '2.2.0'
 
-        retrofitVersion = '2.4.0'
+        retrofitVersion = '2.9.0'
         okhttpVersion = '3.8.0'
         gsonVersion = '2.8.2'
 
@@ -41,13 +40,12 @@ buildscript {
 
         bouncyCastleVersion = '1.60'
 
-        fearlessLibVersion = '1.0.30'
+        fearlessLibVersion = '1.0.48'
 
         gifVersion = '1.2.19'
 
         zXingVersion = '3.4.0'
         zXingEmbeddedVersion = '3.5.0@aar'
-        rxPermssionVersion = '0.10.2'
 
         biometricDep = "androidx.biometric:biometric:$biometricVersion"
 
@@ -56,6 +54,8 @@ buildscript {
 
         wsVersion = "2.10"
 
+        permissionsVersion = '1.1.2'
+
         kotlinDep = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
         androidDep = "androidx.appcompat:appcompat:$supportVersion"
@@ -64,17 +64,28 @@ buildscript {
         constraintDep = "androidx.constraintlayout:constraintlayout:$constraintVersion"
         materialDep = "com.google.android.material:material:$supportVersion"
 
-        rxJavaDep = "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
-        rxAndroidDep = "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
-
         daggerDep = "com.google.dagger:dagger:$daggerVersion"
         daggerKapt = "com.google.dagger:dagger-compiler:$daggerVersion"
 
         lifecycleDep = "androidx.lifecycle:lifecycle-extensions:$architectureComponentVersion"
         lifecycleKapt = "androidx.lifecycle:lifecycle-compiler:$architectureComponentVersion"
 
+        coroutinesDep = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+        coroutinesAndroidDep = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+        // viewModelScope
+        viewModelKtxDep = "androidx.lifecycle:lifecycle-viewmodel-ktx:$architectureComponentVersion"
+
+        // liveData builder
+        liveDataKtxDep = "androidx.lifecycle:lifecycle-livedata-ktx:$architectureComponentVersion"
+
+        // lifecycle scopes
+        lifeCycleKtxDep = "androidx.lifecycle:lifecycle-runtime-ktx:$architectureComponentVersion"
+
+        permissionsDep = "com.github.florent37:runtime-permission-kotlin:$permissionsVersion"
+
         roomDep = "androidx.room:room-runtime:$architectureComponentVersion"
-        rxRoomDep = "androidx.room:room-rxjava2:$architectureComponentVersion"
+        roomKtxDep = "androidx.room:room-ktx:$architectureComponentVersion"
         roomKapt = "androidx.room:room-compiler:$architectureComponentVersion"
 
         navigationFragmentDep = "androidx.navigation:navigation-fragment-ktx:$navControllerVersion"
@@ -84,13 +95,11 @@ buildscript {
 
         retrofitDep = "com.squareup.retrofit2:retrofit:$retrofitVersion"
         interceptorVersion = "com.squareup.okhttp3:logging-interceptor:$okhttpVersion"
-        rxCallAdapterDep = "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"
         gsonConvertedDep = "com.squareup.retrofit2:converter-gson:$retrofitVersion"
         gsonDep = "com.google.code.gson:gson:$gsonVersion"
 
         zXingCoreDep = "com.google.zxing:core:$zXingVersion"
         zXingEmbeddedDep = "com.journeyapps:zxing-android-embedded:$zXingEmbeddedVersion"
-        rxPermissionsDep = "com.github.tbruyelle:rxpermissions:$rxPermssionVersion"
 
         fearlessLibDep = "jp.co.soramitsu.fearless-utils:fearless-utils:$fearlessLibVersion"
 

common/build.gradle

@@ -38,6 +38,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    kotlinOptions {
+        freeCompilerArgs = ["-Xallow-result-return-type"]
+    }
 }
 
 dependencies {
@@ -57,8 +61,10 @@ dependencies {
 
     implementation fearlessLibDep
 
-    implementation rxJavaDep
-    implementation rxAndroidDep
+    implementation coroutinesDep
+    implementation liveDataKtxDep
+
+    implementation viewModelKtxDep
 
     implementation daggerDep
     kapt daggerKapt
@@ -68,7 +74,6 @@ dependencies {
 
     implementation retrofitDep
     implementation gsonConvertedDep
-    implementation rxCallAdapterDep
     implementation interceptorVersion
 
     implementation zXingCoreDep