Merge pull request #138 from soramitsu/rc/1.1.1

v1.1.1

Author: antonkhvorov

app/build.gradle

@@ -113,6 +113,8 @@ dependencies {
     implementation rxCallAdapterDep
 
     implementation gifDep
+
+    compileOnly wsDep
 }
 
 task printVersion {

app/src/main/AndroidManifest.xml

@@ -21,6 +21,7 @@
             android:name="jp.co.soramitsu.app.root.presentation.RootActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Soramitsu.Fearless"
+            android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize">
             <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />
@@ -33,6 +34,17 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <data
+                    android:host="buy-success"
+                    android:scheme="fearless" />
+
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
         </activity>
 
         <activity

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

@@ -3,8 +3,10 @@ package jp.co.soramitsu.app.root.di
 import jp.co.soramitsu.common.data.network.AppLinksProvider
 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.domain.interfaces.WalletRepository
+import jp.co.soramitsu.feature_wallet_api.domain.model.BuyTokenRegistry
 
 interface RootDependencies {
     fun networkStateMixin(): NetworkStateMixin
@@ -16,4 +18,8 @@ interface RootDependencies {
     fun walletRepository(): WalletRepository
 
     fun appLinksProvider(): AppLinksProvider
+
+    fun buyTokenRegistry(): BuyTokenRegistry
+
+    fun resourceManager(): ResourceManager
 }

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

@@ -6,6 +6,7 @@ import jp.co.soramitsu.app.root.domain.RootInteractor
 import jp.co.soramitsu.common.di.scope.FeatureScope
 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.domain.model.BuyTokenRegistry
 
 @Module
 class RootFeatureModule {
@@ -14,8 +15,9 @@ class RootFeatureModule {
     @FeatureScope
     fun provideRootInteractor(
         accountRepository: AccountRepository,
-        walletRepository: WalletRepository
+        walletRepository: WalletRepository,
+        buyTokenRegistry: BuyTokenRegistry
     ): RootInteractor {
-        return RootInteractor(accountRepository, walletRepository)
+        return RootInteractor(accountRepository, buyTokenRegistry, walletRepository)
     }
 }

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

@@ -4,9 +4,12 @@ import io.reactivex.Completable
 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
 ) {
     fun observeSelectedNode() = accountRepository.observeSelectedNode()
@@ -15,4 +18,8 @@ class RootInteractor(
         .filter { it.network.type == networkType }
         .distinctUntilChanged { old, new -> old.address == new.address }
         .switchMapCompletable(walletRepository::listenForUpdates)
+
+    fun isBuyProviderRedirectLink(link: String) = buyTokenRegistry.availableProviders
+        .filterIsInstance<ExternalProvider>()
+        .any { it.redirectLink == link }
 }

app/src/main/java/jp/co/soramitsu/app/root/navigation/Navigator.kt

@@ -204,10 +204,6 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
         navController?.navigate(R.id.action_open_receive)
     }
 
-    override fun openBuy() {
-        navController?.navigate(R.id.action_open_buy)
-    }
-
     override fun returnToMain() {
         // to achieve smooth animation
         postToUiThread {

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

@@ -1,5 +1,6 @@
 package jp.co.soramitsu.app.root.presentation
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.lifecycle.Observer
 import androidx.navigation.NavController
@@ -10,11 +11,12 @@ import jp.co.soramitsu.app.root.di.RootComponent
 import jp.co.soramitsu.app.root.navigation.Navigator
 import jp.co.soramitsu.common.base.BaseActivity
 import jp.co.soramitsu.common.di.FeatureUtils
+import jp.co.soramitsu.common.utils.EventObserver
 import jp.co.soramitsu.common.utils.setVisible
+import jp.co.soramitsu.common.utils.showToast
 import jp.co.soramitsu.common.utils.updatePadding
 import jp.co.soramitsu.splash.presentation.SplashBackgroundHolder
 import kotlinx.android.synthetic.main.activity_root.mainView
-import kotlinx.android.synthetic.main.activity_root.navHost
 import kotlinx.android.synthetic.main.activity_root.rootNetworkBar
 import javax.inject.Inject
 
@@ -49,6 +51,8 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
             insets
         }
 
+        intent?.let(::processIntent)
+
 //        processJsonOpenIntent()
     }
 
@@ -62,6 +66,12 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
         return R.layout.activity_root
     }
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+
+        processIntent(intent)
+    }
+
     override fun initViews() {
     }
 
@@ -81,6 +91,10 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
         viewModel.showConnectingBarLiveData.observe(this, Observer { show ->
             rootNetworkBar.setVisible(show)
         })
+
+        viewModel.messageLiveData.observe(this, EventObserver {
+            showToast(it)
+        })
     }
 
     override fun removeSplashBackground() {
@@ -95,6 +109,12 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
 //        restartAfterLanguageChange(this)
     }
 
+    private fun processIntent(intent: Intent) {
+        val uri = intent.data?.toString()
+
+        uri?.let { viewModel.externalUrlOpened(uri) }
+    }
+
 //    private fun processJsonOpenIntent() {
 //        if (Intent.ACTION_VIEW == intent.action && intent.type != null) {
 //            if ("application/json" == intent.type) {

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

@@ -3,18 +3,21 @@ package jp.co.soramitsu.app.root.presentation
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
+import jp.co.soramitsu.app.R
 import jp.co.soramitsu.app.root.domain.RootInteractor
 import jp.co.soramitsu.common.base.BaseViewModel
 import jp.co.soramitsu.common.data.network.rpc.ConnectionManager
 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
 
 class RootViewModel(
     private val interactor: RootInteractor,
     private val rootRouter: RootRouter,
     private val connectionManager: ConnectionManager,
+    private val resourceManager: ResourceManager,
     private val networkStateMixin: NetworkStateMixin
 ) : BaseViewModel(), NetworkStateUi by networkStateMixin {
     private var socketSourceDisposable: Disposable? = null
@@ -93,4 +96,10 @@ class RootViewModel(
             willBeClearedForLanguageChange = false
         }
     }
+
+    fun externalUrlOpened(uri: String) {
+        if (interactor.isBuyProviderRedirectLink(uri)) {
+            showMessage(resourceManager.getString(R.string.buy_completed))
+        }
+    }
 }

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

@@ -14,6 +14,7 @@ import jp.co.soramitsu.common.data.network.rpc.ConnectionManager
 import jp.co.soramitsu.common.di.viewmodel.ViewModelKey
 import jp.co.soramitsu.common.di.viewmodel.ViewModelModule
 import jp.co.soramitsu.common.mixin.api.NetworkStateMixin
+import jp.co.soramitsu.common.resources.ResourceManager
 
 @Module(
     includes = [
@@ -32,12 +33,14 @@ class RootActivityModule {
         interactor: RootInteractor,
         rootRouter: RootRouter,
         connectionManager: ConnectionManager,
+        resourceManager: ResourceManager,
         networkStateMixin: NetworkStateMixin
     ): ViewModel {
         return RootViewModel(
             interactor,
             rootRouter,
             connectionManager,
+            resourceManager,
             networkStateMixin
         )
     }

app/src/main/res/navigation/main_nav_graph.xml

@@ -67,14 +67,6 @@
         android:id="@+id/action_export_json"
         app:destination="@id/exportJsonPasswordFragment" />
 
-    <action
-        android:id="@+id/action_open_buy"
-        app:destination="@+id/buyFragment"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit" />
-
     <fragment
         android:id="@+id/mainFragment"
         android:name="jp.co.soramitsu.app.root.presentation.main.MainFragment"
@@ -356,10 +348,4 @@
         android:label="fragment_pincode"
         tools:layout="@layout/fragment_pincode" />
 
-    <fragment
-        android:id="@+id/buyFragment"
-        android:name="jp.co.soramitsu.feature_wallet_impl.presentation.buy.BuyFragment"
-        android:label="BuyFragment"
-        tools:layout="@layout/fragment_buy" />
-
 </navigation>

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.1.0'
-        versionCode = 6
+        versionName = '1.1.1'
+        versionCode = 7
 
         // SDK and tools
         compileSdkVersion = 29
@@ -41,7 +41,7 @@ buildscript {
 
         bouncyCastleVersion = '1.60'
 
-        fearlessLibVersion = '1.0.27'
+        fearlessLibVersion = '1.0.28'
 
         gifVersion = '1.2.19'
 
@@ -105,9 +105,8 @@ buildscript {
         archCoreTestDep = "androidx.arch.core:core-testing:$architectureComponentVersion"
 
         progressButtonDep = "com.github.razir.progressbutton:progressbutton:$progressButtonsVersion"
-
-        kotlin_version = '1.3.61'
     }
+
     repositories {
         google()
         jcenter()

common/src/main/java/jp/co/soramitsu/common/data/network/AndroidLogger.kt

@@ -1,7 +1,7 @@
 package jp.co.soramitsu.common.data.network
 
 import android.util.Log
-import jp.co.soramitsu.fearless_utils.wsrpc.Logger
+import jp.co.soramitsu.fearless_utils.wsrpc.logging.Logger
 
 const val TAG = "AndroidLogger"
 

common/src/main/java/jp/co/soramitsu/common/data/network/AppLinksProvider.kt

@@ -1,6 +1,6 @@
 package jp.co.soramitsu.common.data.network
 
-import jp.co.soramitsu.common.utils.requirePrefix
+import jp.co.soramitsu.fearless_utils.extensions.requirePrefix
 import jp.co.soramitsu.feature_account_api.domain.model.Node
 
 class AppLinksProvider(

common/src/main/java/jp/co/soramitsu/common/data/network/rpc/ConnectionManager.kt

@@ -1,6 +1,7 @@
 package jp.co.soramitsu.common.data.network.rpc
 
 import io.reactivex.Observable
+import jp.co.soramitsu.fearless_utils.wsrpc.State
 
 enum class LifecycleCondition {
     ALLOWED, FORBIDDEN, STOPPED