Merge remote-tracking branch 'origin/master' into feature/trading_perpetual

Author: SeniorZhai

app/build.gradle

@@ -14,7 +14,7 @@ plugins {
 
 def versionMajor = 3
 def versionMinor = 10
-def versionPatch = 2
+def versionPatch = 3
 def versionBuild = 1
 
 def includeDebugX86_64 = project.findProperty("includeDebugX86_64")?.toString()?.toBoolean() ?: false // Enable debug package for x86_64
@@ -29,7 +29,7 @@ android {
     defaultConfig {
         applicationId "one.mixin.messenger"
         minSdkVersion 26
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
         versionName "${versionMajor}.${versionMinor}.${versionPatch}"
         multiDexEnabled true

app/proguard-rules.pro

@@ -77,8 +77,13 @@
 
 # web3j
 -keep class org.web3j.protocol.** { *; }
--keep class org.web3j.crypto.** { *; }
 -keep class org.web3j.abi.** { *; }
+-keep class org.web3j.crypto.** { *; }
+-dontwarn org.web3j.crypto.**
+-dontwarn jnr.unixsocket.**
+-dontwarn org.web3j.protocol.ipc.**
+-dontwarn org.java_websocket.**
+-dontwarn org.web3j.protocol.websocket.**
 
 -dontwarn com.fasterxml.jackson.databind.**
 -keep class com.fasterxml.jackson.core.** { *; }
@@ -107,4 +112,8 @@
 -keep interface com.yalantis.ucrop** { *; }
 
 -keep class com.appsflyer.** { *; }
+-dontwarn com.appsflyer.**
+-keepclassmembers class com.appsflyer.** {
+    *;
+}
 -keep class kotlin.jvm.internal.** { *; }

app/src/main/java/one/mixin/android/tip/wc/WalletConnectV2.kt

@@ -131,7 +131,7 @@ object WalletConnectV2 : WalletConnect() {
                     sessionProposal: Wallet.Model.SessionProposal,
                     verifyContext: Wallet.Model.VerifyContext,
                 ) {
-                    Timber.d("$TAG onSessionProposal $sessionProposal")
+                    Timber.d("$TAG onSessionProposal $sessionProposal $verifyContext")
                     val chains = supportChainList.map { c -> c.chainId }
                     val namespaces =
                         (sessionProposal.requiredNamespaces.values + sessionProposal.optionalNamespaces.values)

app/src/main/java/one/mixin/android/ui/common/BaseActivity.kt

@@ -77,7 +77,7 @@ open class BaseActivity : AppCompatActivity() {
 
     override fun onBackPressed() {
         val fragments = supportFragmentManager.fragments
-        if (fragments.size > 0) {
+        if (fragments.isNotEmpty()) {
             // Make sure there is a BaseFragment handle this event.
             fragments.indices.reversed()
                 .map { fragments[it] }

app/src/main/java/one/mixin/android/ui/home/MainActivity.kt

@@ -185,6 +185,7 @@ import one.mixin.android.vo.ParticipantRole
 import one.mixin.android.vo.WalletCategory
 import one.mixin.android.vo.isGroupConversation
 import one.mixin.android.web3.js.Web3Signer
+import one.mixin.android.websocket.ReconnectWorker
 import one.mixin.android.worker.SessionWorker
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
@@ -454,6 +455,11 @@ class MainActivity : BlazeBaseActivity(), WalletMissingBtcAddressFragment.Callba
                 ExistingPeriodicWorkPolicy.UPDATE,
                 periodicWorkRequest
             )
+            val request = PeriodicWorkRequestBuilder<ReconnectWorker>(15, TimeUnit.MINUTES)
+                .build()
+            WorkManager.getInstance(this@MainActivity).enqueueUniquePeriodicWork(
+                "Reconnect", ExistingPeriodicWorkPolicy.KEEP, request
+            )
         }
     }
 

app/src/main/java/one/mixin/android/websocket/ReconnectWorker.kt

@@ -0,0 +1,26 @@
+package one.mixin.android.websocket
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import one.mixin.android.job.BlazeMessageService
+import one.mixin.android.job.BlazeMessageService.Companion.ACTION_ACTIVITY_PAUSE
+import one.mixin.android.worker.BaseWork
+
+@HiltWorker
+class ReconnectWorker @AssistedInject constructor(
+        @Assisted val context: Context,
+        @Assisted parameters: WorkerParameters,
+        private val chatWebSocket: ChatWebSocket,
+    ) : BaseWork(context, parameters) {
+
+    override suspend fun onRun(): Result {
+        if (chatWebSocket.connected) {
+            return Result.success()
+        }
+        BlazeMessageService.startService(context, ACTION_ACTIVITY_PAUSE)
+        return Result.success()
+    }
+}

build.gradle

@@ -119,7 +119,7 @@ buildscript {
         ext.playPayVersion = '16.5.0'
         ext.datastoreVersion = '1.2.1'
         ext.protobufVersion = '3.11.0'
-        ext.appsFlyerVersion ='6.18.0'
+        ext.appsFlyerVersion ='6.17.3'
         ext.installreferrerVersion ='2.2'
         ext.billingVersion ='8.3.0'