bug fixeds

tonkeeper · Nov 2, 2024 · 74fa76d · 74fa76d
1 parent 20e8108
commit 74fa76d
Show file tree

Hide file tree

Showing 25 changed files with 307 additions and 125 deletions.
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
@@ -110,7 +110,6 @@ class API(
     val configFlow: Flow<ConfigEntity>
         get() = configRepository.stream
 
-
     suspend fun tonapiFetch(
         url: String,
         options: String

diff --git a/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/AccountRepository.kt b/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/AccountRepository.kt
@@ -76,7 +76,9 @@ class AccountRepository(
     private val migrationHelper = RNMigrationHelper(rnLegacy)
 
     private val _selectedStateFlow = MutableStateFlow<SelectedState>(SelectedState.Initialization)
-    val selectedStateFlow = _selectedStateFlow.stateIn(scope, SharingStarted.Eagerly,
+    val selectedStateFlow = _selectedStateFlow.stateIn(
+        scope,
+        SharingStarted.Eagerly,
         SelectedState.Initialization
     )
     val selectedWalletFlow = selectedStateFlow.filterNotNull().filterIsInstance<SelectedState.Wallet>().map {
@@ -112,15 +114,13 @@ class AccountRepository(
 
     private suspend fun migrationFromRN() = withContext(Dispatchers.IO) {
         val (selectedId, wallets) = migrationHelper.loadLegacy()
-        if (wallets.isEmpty()) {
-            _selectedStateFlow.value = SelectedState.Empty
-        } else {
+        if (wallets.isNotEmpty()) {
             database.insertAccounts(wallets)
             for (wallet in wallets) {
                 val token = rnLegacy.getTonProof(wallet.id) ?: continue
                 storageSource.setTonProofToken(wallet.publicKey, token)
             }
-            setSelectedWallet(selectedId)
+            storageSource.setSelectedId(selectedId)
         }
     }
 

diff --git a/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/source/VaultSource.kt b/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/source/VaultSource.kt
@@ -3,6 +3,7 @@ package com.tonapps.wallet.data.account.source
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
+import com.tonapps.blockchain.ton.extensions.getPrivateKey
 import com.tonapps.blockchain.ton.extensions.hex
 import com.tonapps.extensions.getByteArray
 import com.tonapps.extensions.putByteArray
@@ -47,10 +48,7 @@ internal class VaultSource(context: Context) {
     }
 
     fun getPrivateKey(publicKey: PublicKeyEd25519): PrivateKeyEd25519? {
-        val seed = prefs.getByteArray(privateKey(publicKey)) ?: return null
-        val privateKey = PrivateKeyEd25519(seed)
-        seed.clear()
-        return privateKey
+        return prefs.getPrivateKey(privateKey(publicKey))
     }
 
     private fun privateKey(publicKey: PublicKeyEd25519) = key(PRIVATE_KEY_PREFIX, publicKey)

diff --git a/apps/wallet/data/backup/src/main/java/com/tonapps/wallet/data/backup/BackupRepository.kt b/apps/wallet/data/backup/src/main/java/com/tonapps/wallet/data/backup/BackupRepository.kt
@@ -30,7 +30,7 @@ class BackupRepository(
     init {
         scope.launch(Dispatchers.IO) {
             if (rnLegacy.isRequestMigration()) {
-                localDataSource.clear()
+                // localDataSource.clear()
                 migrationFromRN()
             }
             _stream.value = localDataSource.getAllBackups()

diff --git a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/BlobDataSource.kt b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/BlobDataSource.kt
@@ -3,6 +3,7 @@ package com.tonapps.wallet.data.core
 import android.content.Context
 import android.os.Parcelable
 import android.util.Log
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.extensions.cacheFolder
 import com.tonapps.extensions.file
 import com.tonapps.extensions.toByteArray
@@ -47,6 +48,7 @@ abstract class BlobDataSource<D>(
                         val string = String(bytes)
                         fromJSON(string)
                     } catch (e: Throwable) {
+                        FirebaseCrashlytics.getInstance().recordException(e)
                         null
                     }
                 }
@@ -73,9 +75,13 @@ abstract class BlobDataSource<D>(
     }
 
     private fun setDiskCache(key: String, value: D) {
-        val file = diskFile(key)
-        val bytes = onMarshall(value)
-        file.writeBytes(bytes)
+        try {
+            val file = diskFile(key)
+            val bytes = onMarshall(value)
+            file.writeBytes(bytes)
+        } catch (e: Throwable) {
+            FirebaseCrashlytics.getInstance().recordException(e)
+        }
     }
 
     private fun diskFile(key: String): File {
@@ -98,6 +104,7 @@ abstract class BlobDataSource<D>(
             val bytes = file.readBytes()
             if (bytes.isEmpty()) null else bytes
         } catch (e: IOException) {
+            FirebaseCrashlytics.getInstance().recordException(e)
             null
         }
     }

diff --git a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/WalletCurrency.kt b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/WalletCurrency.kt
@@ -22,6 +22,7 @@ data class WalletCurrency(
             "GBP", // Great Britain Pound
             "CHF", // Swiss Franc
             "CNY", // China Yuan
+            "GEL", // Georgian Lari
             "KRW", // South Korean Won
             "IDR", // Indonesian Rupiah
             "INR", // Indian Rupee

diff --git a/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/LockScreen.kt b/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/LockScreen.kt
@@ -51,7 +51,7 @@ class LockScreen(
         }
     }
 
-    fun biometric(result: BiometricPrompt.AuthenticationResult) {
+    fun biometric() {
         hide()
     }
 

diff --git a/.../wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/PasscodeBiometric.kt b/.../wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/PasscodeBiometric.kt
@@ -5,6 +5,7 @@ import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.extensions.activity
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
@@ -28,6 +29,7 @@ object PasscodeBiometric {
             }
 
             override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+                // Yes. Biometric right now is only UI feature.
                 continuation.resume(true)
             }
         })
@@ -54,6 +56,7 @@ object PasscodeBiometric {
 
             biometricPrompt.authenticate(builder.build())
         } catch (e: Throwable) {
+            FirebaseCrashlytics.getInstance().recordException(e)
             callback.onAuthenticationError(BiometricPrompt.ERROR_HW_NOT_PRESENT, "Unknown error")
         }
     }

diff --git a/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/PasscodeHelper.kt b/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/PasscodeHelper.kt
@@ -1,6 +1,7 @@
 package com.tonapps.wallet.data.passcode
 
 import android.content.Context
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.extensions.logError
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.passcode.source.PasscodeStore
@@ -47,6 +48,7 @@ class PasscodeHelper(
             store.setPinCode(code)
             true
         } catch (e: Throwable) {
+            FirebaseCrashlytics.getInstance().recordException(e)
             context.logError(e)
             false
         }

diff --git a/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/PasscodeManager.kt b/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/PasscodeManager.kt
@@ -1,7 +1,9 @@
 package com.tonapps.wallet.data.passcode
 
 import android.content.Context
+import android.util.Log
 import androidx.biometric.BiometricPrompt
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.extensions.logError
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.passcode.dialog.PasscodeDialog
@@ -10,11 +12,13 @@ import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import uikit.navigation.Navigation
-import java.util.concurrent.atomic.AtomicBoolean
 
 class PasscodeManager(
     private val accountRepository: AccountRepository,
@@ -30,16 +34,17 @@ class PasscodeManager(
         get() = lockscreen.stateFlow
 
     init {
-        scope.launch(Dispatchers.IO) {
+        settingsRepository.isMigratedFlow.onEach {
             lockscreen.init()
-        }
+        }.launchIn(scope)
     }
 
-    fun lockscreenBiometric(result: BiometricPrompt.AuthenticationResult) {
-        lockscreen.biometric(result)
+    fun lockscreenBiometric() {
+        lockscreen.biometric()
     }
 
     fun deleteAll() {
+        settingsRepository.biometric = false
         scope.launch {
             reset()
         }
@@ -77,6 +82,7 @@ class PasscodeManager(
                 migration(context, code)
                 true
             } catch (e: Throwable) {
+                FirebaseCrashlytics.getInstance().recordException(e)
                 context.logError(e)
                 false
             }
@@ -97,6 +103,7 @@ class PasscodeManager(
                 }
                 true
             } catch (e: Throwable) {
+                FirebaseCrashlytics.getInstance().recordException(e)
                 context.logError(e)
                 false
             }
@@ -108,10 +115,33 @@ class PasscodeManager(
     }
 
     suspend fun reset() = withContext(Dispatchers.IO) {
+        settingsRepository.lockScreen = false
+        settingsRepository.biometric = false
         helper.reset()
         rnLegacy.clearMnemonic()
     }
 
+    suspend fun confirmationByBiometric(
+        context: Context,
+        title: String
+    ): Boolean = withContext(Dispatchers.Main) {
+        try {
+            if (isRequestMigration()) {
+                val passcode = rnLegacy.exportPasscodeWithBiometry()
+                if (passcode.isBlank()) {
+                    throw Exception("failed to request passcode")
+                }
+                migration(context, passcode)
+                true
+            } else {
+                PasscodeBiometric.showPrompt(context, title)
+            }
+        } catch (e: Throwable) {
+            FirebaseCrashlytics.getInstance().recordException(e)
+            false
+        }
+    }
+
     suspend fun confirmation(
         context: Context,
         title: String
@@ -146,6 +176,7 @@ class PasscodeManager(
             }
             throw Exception("biometry is disabled")
         } catch (e: Throwable) {
+            FirebaseCrashlytics.getInstance().recordException(e)
             return null
         }
     }
@@ -165,6 +196,7 @@ class PasscodeManager(
             migration(context, passcode)
             true
         } catch (e: Throwable) {
+            FirebaseCrashlytics.getInstance().recordException(e)
             context.logError(e)
             false
         }
@@ -175,10 +207,10 @@ class PasscodeManager(
         code: String
     ) = withContext(Dispatchers.Main) {
         val navigation = Navigation.from(context)
-        navigation?.toast("...", true, 0)
+        navigation?.migrationLoader(true)
         accountRepository.importPrivateKeysFromRNLegacy(code)
         save(code)
-        navigation?.toast("...", false, 0)
+        navigation?.migrationLoader(false)
     }
 
     fun confirmationFlow(context: Context, title: String) = flow {

diff --git a/apps/wallet/data/rn/src/main/java/com/tonapps/wallet/data/rn/RNSeedStorage.kt b/apps/wallet/data/rn/src/main/java/com/tonapps/wallet/data/rn/RNSeedStorage.kt
@@ -2,6 +2,7 @@ package com.tonapps.wallet.data.rn
 
 import android.content.Context
 import androidx.fragment.app.FragmentActivity
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.wallet.data.rn.data.RNVaultState
 import com.tonapps.wallet.data.rn.expo.SecureStoreModule
 import com.tonapps.wallet.data.rn.expo.SecureStoreOptions
@@ -66,7 +67,12 @@ internal class RNSeedStorage(context: Context) {
     }
 
     suspend fun hasPinCode(): Boolean {
-        return readState() != null
+        return try {
+            readState() != null
+        } catch (e: Exception) {
+            FirebaseCrashlytics.getInstance().recordException(e)
+            false
+        }
     }
 
     suspend fun removeAll() {
@@ -79,7 +85,7 @@ internal class RNSeedStorage(context: Context) {
     }
 
     suspend fun get(passcode: String): RNVaultState = withContext(Dispatchers.IO) {
-        val state = readState() ?: throw Exception("Seed state is null")
+        val state = readState() ?: return@withContext RNVaultState()
         val json = JSONObject(ScryptBox.decrypt(passcode, state))
         RNVaultState.of(json)
     }

diff --git a/apps/wallet/data/rn/src/main/java/com/tonapps/wallet/data/rn/RNSql.kt b/apps/wallet/data/rn/src/main/java/com/tonapps/wallet/data/rn/RNSql.kt
@@ -3,12 +3,13 @@ package com.tonapps.wallet.data.rn
 import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
+import android.os.Build
 import android.os.SystemClock
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.sqlite.SQLiteHelper
 import org.json.JSONArray
 import org.json.JSONObject
-import java.util.concurrent.ConcurrentHashMap
+import android.database.CursorWindow
 
 internal class RNSql(context: Context): SQLiteHelper(context, DATABASE_NAME, DATABASE_VERSION) {
 
@@ -27,6 +28,10 @@ internal class RNSql(context: Context): SQLiteHelper(context, DATABASE_NAME, DAT
     override fun onConfigure(db: SQLiteDatabase) {
         super.onConfigure(db)
         db.execSQL("PRAGMA foreign_keys=OFF;")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            db.setMaxSqlCacheSize(SQLiteDatabase.MAX_SQL_CACHE_SIZE)
+        }
+        initCursorWindowSize()
     }
 
     fun getValue(key: String): String? {
@@ -96,4 +101,14 @@ internal class RNSql(context: Context): SQLiteHelper(context, DATABASE_NAME, DAT
         setValue(key, value.toString())
     }
 
+    private fun initCursorWindowSize() {
+        try {
+            val field = CursorWindow::class.java.getDeclaredField("sCursorWindowSize")
+            field.isAccessible = true
+            field.set(null, 100 * 1024 * 1024) //the 100MB is the new size
+        } catch (e: Exception) {
+            FirebaseCrashlytics.getInstance().recordException(e)
+        }
+    }
+
 }
diff --git a/...wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt b/...wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt
@@ -20,6 +20,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
@@ -79,6 +80,9 @@ class SettingsRepository(
     private val _walletPush = MutableEffectFlow<Unit>()
     val walletPush = _walletPush.shareIn(scope, SharingStarted.Eagerly)
 
+    private val _isMigratedFlow = MutableStateFlow<Boolean?>(null)
+    val isMigratedFlow = _isMigratedFlow.asStateFlow().filterNotNull()
+
     fun notifyWalletPush() {
         _walletPush.tryEmit(Unit)
     }
@@ -387,6 +391,7 @@ class SettingsRepository(
                 searchEngine = legacyValues.searchEngine
             }
 
+            _isMigratedFlow.value = true
             _currencyFlow.tryEmit(currency)
             _languageFlow.tryEmit(language)
             _hiddenBalancesFlow.tryEmit(hiddenBalances)
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ class LockScreen( @@
             }
         }
-        fun biometric(result: BiometricPrompt.AuthenticationResult) {
+        fun biometric() {
             hide()
         }
@@ Expand Down @@