onflow · lealobanov · Oct 9, 2025 · Oct 20, 2025 · Oct 20, 2025 · Oct 21, 2025
@@ -370,6 +370,9 @@ dependencies {
     implementation('com.trustwallet:wallet-core:4.3.2') {
         exclude group: 'com.google.protobuf', module: 'protobuf-java'
     }
+    // Add wallet-core-proto separately to avoid conflicts
+    // Note: wallet-core-proto may require protobuf-java, so we allow it for this dependency only
+    implementation('com.trustwallet:wallet-core-proto:4.3.2')
 
     // room https://developer.android.google.cn/training/data-storage/room?hl=zh-cn
     implementation "androidx.room:room-runtime:2.6.1"

@@ -71,12 +71,11 @@
         <activity
             android:name=".reactnative.ReactNativeActivity"
             android:exported="false"
-            android:launchMode="standard"
+            android:launchMode="singleTop"
             android:theme="@style/AppTheme"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:windowSoftInputMode="adjustResize"
-            android:excludeFromRecents="true"
-            android:noHistory="true"/>
+            android:excludeFromRecents="false"/>
 
         <activity
             android:name=".manager.drive.GoogleDriveAuthActivity"

@@ -146,18 +146,33 @@ object AccountCacheManager{
     }
 
     private fun cacheSync(data: List<Account>) {
-        val str = Json.encodeToString(ListSerializer(Account.serializer()), data)
-
-        // Validate JSON before writing
         try {
-            Json.decodeFromString(ListSerializer(Account.serializer()), str)
+            val str = Json.encodeToString(ListSerializer(Account.serializer()), data)
+
+            // Validate JSON before writing
+            try {
+                Json.decodeFromString(ListSerializer(Account.serializer()), str)
+            } catch (e: Exception) {
+                loge(TAG, "Generated invalid JSON, not writing to cache: $e")
+                return
+            }
+
+            str.saveToFile(file)
+            logd(TAG, "Successfully cached ${data.size} accounts")
         } catch (e: Exception) {
-            loge(TAG, "Generated invalid JSON, not writing to cache: $e")
-            return
+            loge(TAG, "Error during cacheSync: $e")
+            loge(TAG, "Exception type: ${e.javaClass.name}")
+            e.printStackTrace()
+            // Log account structure for debugging
+            if (data.isNotEmpty()) {
+                val firstAccount = data.first()
+                loge(TAG, "First account structure: userInfo=${firstAccount.userInfo.javaClass.name}, " +
+                    "wallet=${firstAccount.wallet?.javaClass?.name}, " +
+                    "walletEmojiList=${firstAccount.walletEmojiList?.javaClass?.name}, " +
+                    "evmAddressData=${firstAccount.evmAddressData?.javaClass?.name}")
+            }
+            throw e
         }
-
-        str.saveToFile(file)
-        logd(TAG, "Successfully cached ${data.size} accounts")
     }
 
     fun clearCache() {

diff --git a/app/src/main/java/com/flowfoundation/wallet/firebase/auth/FirebaseAuth.kt b/app/src/main/java/com/flowfoundation/wallet/firebase/auth/FirebaseAuth.kt
@@ -7,6 +7,7 @@ import com.flowfoundation.wallet.firebase.messaging.getFirebaseMessagingToken
 import com.flowfoundation.wallet.network.clearUserCache
 import com.flowfoundation.wallet.utils.ioScope
 import com.flowfoundation.wallet.utils.logd
+import com.flowfoundation.wallet.utils.loge
 import com.flowfoundation.wallet.utils.uiScope
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
@@ -29,14 +30,26 @@ fun firebaseCustomLogin(token: String, onComplete: FirebaseAuthCallback) {
     logd(TAG, "=== firebaseCustomLogin START ===")
     val auth = Firebase.auth
     val currentUser = auth.currentUser
-    logd(TAG, "Current Firebase user: ${currentUser?.uid ?: "null"}")
-
-    if (currentUser != null) {
-        logd(TAG, "User already signed in, UID: ${currentUser.uid}, isAnonymous: ${currentUser.isAnonymous}")
-        onComplete.invoke(true, null)
+    logd(TAG, "Current Firebase user: ${currentUser?.uid ?: "null"}, isAnonymous: ${currentUser?.isAnonymous ?: false}")
+
+    // If user exists and is NOT anonymous, we need to sign out first to replace with custom token user
+    // If user is anonymous, we can proceed to sign in with custom token (Firebase will replace the user)
+    if (currentUser != null && !currentUser.isAnonymous) {
+        logd(TAG, "Non-anonymous user already signed in (UID: ${currentUser.uid}), signing out first...")
+        auth.signOut()
+        // Wait a moment for sign out to complete, then proceed
+        android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
+            signInWithCustomTokenInternal(token, onComplete)
+        }, 100)
         return
     }
 
+    // If anonymous or no user, proceed directly to sign in with custom token
+    signInWithCustomTokenInternal(token, onComplete)
+}
+
+private fun signInWithCustomTokenInternal(token: String, onComplete: FirebaseAuthCallback) {
+    val auth = Firebase.auth
     logd(TAG, "Attempting to sign in with custom token (length: ${token.length})")
     auth.signInWithCustomToken(token).addOnCompleteListener { task ->
         logd(TAG, "signInWithCustomToken completed - success: ${task.isSuccessful}")
@@ -52,7 +65,12 @@ fun firebaseCustomLogin(token: String, onComplete: FirebaseAuthCallback) {
                 logd(TAG, "Requesting ID token refresh")
 
                 newUser?.getIdToken(true)?.addOnSuccessListener { result ->
-                    logd(TAG, "ID token obtained successfully")
+                    val token = result.token
+                    if (token != null) {
+                        logd(TAG, "ID token obtained successfully (length: ${token.length})")
+                    } else {
+                        logd(TAG, "ID token obtained but token is null")
+                    }
                     uiScope {
                         onComplete.invoke(true, null)
                     }
@@ -77,23 +95,102 @@ fun firebaseCustomLogin(token: String, onComplete: FirebaseAuthCallback) {
 fun firebaseUid() = Firebase.auth.currentUser?.uid
 
 suspend fun getFirebaseJwt(forceRefresh: Boolean = false) = suspendCoroutine { continuation ->
-    ioScope {
-        val auth = Firebase.auth
-        if (auth.currentUser == null) {
-            signInAnonymously()
-        }
-
-        val user = auth.currentUser
-        if (user == null) {
-            continuation.resume("")
-            return@ioScope
-        }
-
+    val auth = Firebase.auth
+    val user = auth.currentUser
+
+    if (user != null) {
+        // User exists, get ID token from existing user
+        logd(TAG, "User exists, getting ID token: ${user.uid}, isAnonymous: ${user.isAnonymous}")
         user.getIdToken(forceRefresh).addOnCompleteListener { task ->
-            if (task.isSuccessful) {
-                continuation.resume(task.result.token.orEmpty())
+            if (task.isSuccessful && task.result != null) {
+                val token = task.result.token
+                if (token.isNullOrEmpty()) {
+                    loge(TAG, "ID token is null or empty")
+                    continuation.resume("")
+                } else {
+                    logd(TAG, "ID token obtained successfully (length: ${token.length})")
+                    continuation.resume(token)
+                }
             } else {
+                val exception = task.exception
+                val errorMessage = exception?.message ?: "Unknown error"
+                loge(TAG, "Failed to get ID token: $errorMessage")
+
+                // Check if it's a network error
+                if (errorMessage.contains("network", ignoreCase = true) || 
+                    errorMessage.contains("unreachable", ignoreCase = true) ||
+                    errorMessage.contains("timeout", ignoreCase = true)) {
+                    loge(TAG, "Network error detected - Firebase services may be unreachable")
+                }
+
+                continuation.resume("")
+            }
+        }
+    } else {
+        // No user exists, sign in anonymously first (matching extension behavior)
+        logd(TAG, "No Firebase user found, signing in anonymously...")
+        auth.signInAnonymously().addOnCompleteListener { signInTask ->
+            if (!signInTask.isSuccessful) {
+                val exception = signInTask.exception
+                val errorMessage = exception?.message ?: "Unknown error"
+                loge(TAG, "Failed to sign in anonymously: $errorMessage")
+
+                // Check if it's a network error
+                val isNetworkError = errorMessage.contains("network", ignoreCase = true) || 
+                    errorMessage.contains("unreachable", ignoreCase = true) ||
+                    errorMessage.contains("timeout", ignoreCase = true) ||
+                    errorMessage.contains("No address associated", ignoreCase = true) ||
+                    errorMessage.contains("Unable to resolve host", ignoreCase = true) ||
+                    exception?.javaClass?.simpleName?.contains("Network", ignoreCase = true) == true
+
+                if (isNetworkError) {
+                    val detailedError = "Network error preventing anonymous sign-in - Firebase services unreachable. " +
+                        "Error: $errorMessage. " +
+                        "Troubleshooting: " +
+                        "1. Check device/emulator internet connectivity " +
+                        "2. Verify Firebase configuration (google-services.json) " +
+                        "3. For emulators, ensure DNS is configured (use 8.8.8.8) " +
+                        "4. Check firewall/proxy settings"
+                    loge(TAG, detailedError)
+                }
+
                 continuation.resume("")
+                return@addOnCompleteListener
+            }
+
+            // Get user from task result (more reliable than auth.currentUser)
+            val anonymousUser = signInTask.result?.user ?: auth.currentUser
+            if (anonymousUser == null) {
+                loge(TAG, "Sign in succeeded but user is null")
+                continuation.resume("")
+                return@addOnCompleteListener
+            }
+
+            logd(TAG, "Anonymous sign-in successful, user: ${anonymousUser.uid}")
+            anonymousUser.getIdToken(forceRefresh).addOnCompleteListener { tokenTask ->
+                if (tokenTask.isSuccessful && tokenTask.result != null) {
+                    val token = tokenTask.result.token
+                    if (token.isNullOrEmpty()) {
+                        loge(TAG, "Anonymous user ID token is null or empty")
+                        continuation.resume("")
+                    } else {
+                        logd(TAG, "Anonymous user ID token obtained successfully (length: ${token.length})")
+                        continuation.resume(token)
+                    }
+                } else {
+                    val exception = tokenTask.exception
+                    val errorMessage = exception?.message ?: "Unknown error"
+                    loge(TAG, "Failed to get ID token from anonymous user: $errorMessage")
+
+                    // Check if it's a network error
+                    if (errorMessage.contains("network", ignoreCase = true) || 
+                        errorMessage.contains("unreachable", ignoreCase = true) ||
+                        errorMessage.contains("timeout", ignoreCase = true)) {
+                        loge(TAG, "Network error preventing token retrieval - Firebase services unreachable")
+                    }
+
+                    continuation.resume("")
+                }
             }
         }
     }

@@ -10,8 +10,8 @@ fun Account.getFlowAddress(networkName: String, logTag: String = "AccountExtensi
             walletData.blockchain?.asSequence() ?: emptySequence()
         }
         ?.find { blockchainData ->
-            val matches = blockchainData.chainId == networkName
-
+            // Compare case-insensitively since chainId from backend might be "mainnet" but networkName might be "Mainnet"
+            val matches = blockchainData.chainId?.lowercase() == networkName.lowercase()
             matches
         }?.address
     logd(logTag, "  Returning address: $foundAddress for ${this.userInfo.username} on $networkName")

@@ -2,7 +2,6 @@ package com.flowfoundation.wallet.manager.account
 
 import android.content.Intent
 import android.widget.Toast
-import com.google.gson.annotations.SerializedName
 import com.flowfoundation.wallet.R
 import com.flowfoundation.wallet.cache.AccountCacheManager
 import com.flowfoundation.wallet.cache.UserPrefixCacheManager
@@ -43,8 +42,11 @@ import com.flowfoundation.wallet.wallet.Wallet
 import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
 import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.decodeFromString
 import java.lang.ref.WeakReference
 import java.util.concurrent.CopyOnWriteArrayList
 import com.flowfoundation.wallet.manager.wallet.walletAddress
@@ -692,7 +694,7 @@ object AccountManager {
         val passwordMap = getPasswordMap()
         if (passwordMap.containsKey(accountId)) {
             passwordMap.remove(accountId)
-            storeWalletPassword(Gson().toJson(passwordMap))
+            storeWalletPassword(Json.encodeToString(passwordMap))
             logd(TAG, "Successfully removed password for account ID: $accountId")
         } else {
             logd(TAG, "No password found for account ID: $accountId")
@@ -705,8 +707,7 @@ object AccountManager {
             HashMap()
         } else {
             runCatching {
-                Gson().fromJson(pref, object : TypeToken<HashMap<String, String>>() {}.type)
-                    ?: HashMap<String, String>()
+                Json.decodeFromString<Map<String, String>>(pref).toMap(HashMap())
             }.getOrElse { HashMap() }
         }
     }
@@ -830,27 +831,19 @@ fun username() = AccountManager.get()!!.userInfo.username
 
 @Serializable
 data class Account(
-    @SerializedName("username")
+    @SerialName("username")
     var userInfo: UserInfoData,
-    @SerializedName("isActive")
     var isActive: Boolean = false,
-    @SerializedName("wallet")
     var wallet: WalletListData? = null,
-    @SerializedName("prefix")
     var prefix: String? = null,
-    @SerializedName("evmAddressData")
     var evmAddressData: EVMAddressData? = null,
-    @SerializedName("walletEmojiList")
     var walletEmojiList: List<WalletEmojiInfo>? = null,
-    @SerializedName("keyStoreInfo")
     var keyStoreInfo: String? = null
 )
 
 @Serializable
 data class UserPrefix(
-    @SerializedName("userId")
     val userId: String,
-    @SerializedName("prefix")
     var prefix: String
 )
 

@@ -1,14 +1,10 @@
 package com.flowfoundation.wallet.manager.emoji.model
 
-import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class WalletEmojiInfo(
-    @SerializedName("address")
     val address: String,
-    @SerializedName("emojiId")
     val emojiId: Int,
-    @SerializedName("emojiName")
     val emojiName: String
 )
@@ -48,6 +48,7 @@ import com.flowfoundation.wallet.wallet.toAddress
 import com.google.gson.annotations.SerializedName
 import org.onflow.flow.models.TransactionStatus
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
 import org.onflow.flow.ChainId
 import org.web3j.crypto.Keys
 import java.math.BigDecimal
@@ -118,7 +119,13 @@ object EVMWalletManager {
                     }
 
                     evmAddressMap[networkAddress] = formattedAddress
-                    AccountManager.updateEVMAddressInfo(evmAddressMap.toMutableMap())
+
+                    // Preserve existing entries from account's evmAddressData (e.g., EOA address with empty string key)
+                    // Merge with internal evmAddressMap to avoid overwriting EOA addresses
+                    val existingMap = AccountManager.evmAddressData()?.evmAddressMap?.toMutableMap() ?: mutableMapOf()
+                    existingMap.putAll(evmAddressMap)
+                    AccountManager.updateEVMAddressInfo(existingMap)
+
                     callback?.invoke(true)
                 } else {
                     ErrorReporter.reportWithMixpanel(EVMError.QUERY_EVM_ADDRESS_FAILED, getCurrentCodeLocation())
@@ -658,6 +665,7 @@ object EVMWalletManager {
 
 @Serializable
 data class EVMAddressData(
+    @SerialName("evmAddressMap")
     @SerializedName("evmAddressMap")
     var evmAddressMap: Map<String, String>? = null
 )