Preventive measure for an issue that causes a crash while migrating t…

…he Tor identity from shared prefs to secure prefs. Bump build number.
tari-project · Jan 20, 2021 · 80baeef · 80baeef
1 parent e61a05e
commit 80baeef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/com/tari/android/wallet/application/WalletManager.kt b/app/src/main/java/com/tari/android/wallet/application/WalletManager.kt
@@ -34,6 +34,8 @@ package com.tari.android.wallet.application
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import com.orhanobut.logger.Logger
 import com.tari.android.wallet.BuildConfig
 import com.tari.android.wallet.R
@@ -238,7 +240,9 @@ internal class WalletManager(
                 walletLogFilePath
             )
             FFIWallet.instance = wallet
-            sharedPrefsWrapper.torIdentity = wallet.getTorIdentity()
+            Handler(Looper.getMainLooper()).post {
+                sharedPrefsWrapper.torIdentity = wallet.getTorIdentity()
+            }
             if (isNewInstallation) {
                 sharedPrefsWrapper.network = Constants.Wallet.network
                 FFIWallet.instance?.setKeyValue(

diff --git a/app/src/main/java/com/tari/android/wallet/util/SharedPrefsWrapper.kt b/app/src/main/java/com/tari/android/wallet/util/SharedPrefsWrapper.kt
@@ -180,11 +180,12 @@ class SharedPrefsWrapper(
                 }
                 return identity.toPreservedByteArray
             }
-            return SecurePreferences.getStringValue(
+            val torIdentity = SecurePreferences.getStringValue(
                 context,
                 Key.torIdentity,
                 null
-            )?.toPreservedByteArray
+            )
+            return torIdentity?.toPreservedByteArray
         }
         set(value) {
             if (value != null) {

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     ext.kotlin_version = '1.4.10'
 
     // build & version
-    ext.buildNumber = 147
+    ext.buildNumber = 148
     ext.versionNumber = "0.5.4"
 
     // JNI libs