diff --git a/app/build.gradle b/app/build.gradle index 0adfa7a9b..f367caf1e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -347,7 +347,7 @@ dependencies { implementation 'com.dropbox.core:dropbox-android-sdk:7.0.0' /** Crowdin **/ - implementation ('com.github.crowdin.mobile-sdk-android:sdk:1.9.2') { + implementation ('com.github.crowdin.mobile-sdk-android:sdk:1.13.1') { exclude group: 'com.google.code.gson', module: 'gson' } diff --git a/app/src/main/java/com/flowfoundation/wallet/FlowWalletApplication.kt b/app/src/main/java/com/flowfoundation/wallet/FlowWalletApplication.kt index 2f064e9f2..a29adeaca 100644 --- a/app/src/main/java/com/flowfoundation/wallet/FlowWalletApplication.kt +++ b/app/src/main/java/com/flowfoundation/wallet/FlowWalletApplication.kt @@ -1,6 +1,7 @@ package com.flowfoundation.wallet import android.app.Application +import com.flowfoundation.wallet.crowdin.crowdinInitialize import com.flowfoundation.wallet.manager.LaunchManager import com.flowfoundation.wallet.utils.Env @@ -9,6 +10,7 @@ class FlowWalletApplication : Application() { override fun onCreate() { super.onCreate() Env.init(this) + crowdinInitialize(this) LaunchManager.init(this) } } diff --git a/app/src/main/java/com/flowfoundation/wallet/crowdin/CrowdinUtils.kt b/app/src/main/java/com/flowfoundation/wallet/crowdin/CrowdinUtils.kt index b9f2bf5e4..d6edaa89e 100644 --- a/app/src/main/java/com/flowfoundation/wallet/crowdin/CrowdinUtils.kt +++ b/app/src/main/java/com/flowfoundation/wallet/crowdin/CrowdinUtils.kt @@ -6,7 +6,6 @@ import com.crowdin.platform.CrowdinConfig import com.crowdin.platform.data.remote.NetworkType import com.flowfoundation.wallet.BuildConfig - fun crowdinInitialize(application: Application) { Crowdin.init(application, CrowdinConfig.Builder() diff --git a/app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt b/app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt index f7b38c043..98b673f05 100644 --- a/app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt +++ b/app/src/main/java/com/flowfoundation/wallet/page/browser/widgets/LilicoWebView.kt @@ -22,6 +22,7 @@ import android.widget.FrameLayout import android.widget.TextView import android.widget.Toast import androidx.annotation.ColorInt +import com.crowdin.platform.Crowdin import com.flowfoundation.wallet.BuildConfig import com.flowfoundation.wallet.R import com.flowfoundation.wallet.manager.blocklist.BlockManager @@ -55,16 +56,16 @@ class LilicoWebView : WebView { private var blockedUrl: String? = null - constructor(context: Context) : super(context) { + constructor(context: Context) : super(Crowdin.wrapContext(context)) { initWebView() } - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) { + constructor(context: Context, attrs: AttributeSet?) : super(Crowdin.wrapContext(context), attrs) { initWebView() } constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super( - context, + Crowdin.wrapContext(context), attrs, defStyleAttr ) { diff --git a/app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/DeepLinkingActivity.kt b/app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/DeepLinkingActivity.kt index 8c30c3d85..b84fea8f4 100644 --- a/app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/DeepLinkingActivity.kt +++ b/app/src/main/java/com/flowfoundation/wallet/page/component/deeplinking/DeepLinkingActivity.kt @@ -77,11 +77,6 @@ class DeepLinkingActivity : BaseActivity() { } } - override fun onPause() { - super.onPause() - // Don't finish here, let the coroutine handle it - } - private fun isWalletConnectUri(uri: Uri): Boolean { return try { val uriString = uri.toString()