Merge pull request #43 from Web3Auth/feature/update-shared-prefs-for-android-version12

Handle changes for shared prefs wrt android version 12 and above

Author: chaitanyapotti

app/build.gradle

@@ -12,12 +12,12 @@ android {
             keyPassword 'torus123'
         }
     }
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.web3auth.app"
         minSdkVersion 24
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         manifestPlaceholders = [

core/build.gradle

@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 31
+        targetSdkVersion 33
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "proguard-rules.pro"
@@ -58,7 +58,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
 
     // android security
-    implementation 'androidx.security:security-crypto:1.0.0-alpha02'
+    implementation 'androidx.security:security-crypto:1.1.0-alpha05'
     implementation 'org.web3j:core:4.8.8-android'
 
     // Test

core/src/main/java/com/web3auth/core/Web3Auth.kt

@@ -194,9 +194,9 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
      */
     private fun authorizeSession() {
         sessionCompletableFuture = CompletableFuture()
-        sessionId = KeyStoreManagerUtils.decryptData(KeyStoreManagerUtils.SESSION_ID)
+        sessionId = KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.SESSION_ID)
         if (sessionId != null && sessionId?.isNotEmpty() == true) {
-            var pubKey = "04".plus(KeyStoreManagerUtils.getPubKey(sessionId.toString()))
+            val pubKey = "04".plus(KeyStoreManagerUtils.getPubKey(sessionId.toString()))
             GlobalScope.launch {
                 val result = web3AuthApi.authorizeSession(pubKey)
                 if (result.isSuccessful && result.body() != null) {
@@ -231,7 +231,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
                         val encryptedShareBytes =
                             AES256CBC.toByteArray(BigInteger(shareMetadata.ciphertext, 16))
                         val share = aes256cbc.decrypt(Base64.encodeBytes(encryptedShareBytes))
-                        var tempJson = JSONObject(share.toString())
+                        val tempJson = JSONObject(share.toString())
                         tempJson.put("userInfo", tempJson.get("store"))
                         tempJson.remove("store")
                         web3AuthResponse =

core/src/main/java/com/web3auth/core/keystore/KeyStoreManagerUtils.kt

@@ -67,7 +67,7 @@ object KeyStoreManagerUtils {
      * Method to encrypt data with key
      */
     fun encryptData(key: String, data: String) {
-        sharedPreferences?.edit()?.putString(key, data)?.apply()
+        sharedPreferences.edit().putString(key, data)?.apply()
         encryptedPairData = getEncryptedDataPair(data)
         encryptedPairData.second.toString(UTF_8)
     }
@@ -88,44 +88,49 @@ object KeyStoreManagerUtils {
      * Method to decrypt data with key
      */
     fun decryptData(key: String): String? {
-        val sharedPreferenceIds = sharedPreferences?.all
         var result: String? = null
-        sharedPreferenceIds?.forEach {
-            if (it.key.contains(key)) {
-                result = sharedPreferences?.getString(it.key, "")
+        try {
+            val sharedPreferenceIds = sharedPreferences.all
+            sharedPreferenceIds.forEach {
+                if (it.key.contains(key)) {
+                    result = sharedPreferences.getString(it.key, "")
+                }
             }
+            if (result == null) return null
+            val encryptedPairData = result?.let { getEncryptedDataPair(it) }
+            val cipher = Cipher.getInstance(TRANSFORMATION)
+            val keySpec = IvParameterSpec(encryptedPairData?.first)
+            cipher.init(Cipher.DECRYPT_MODE, getKey(), keySpec)
+            return cipher.doFinal(encryptedPairData?.second).toString(UTF_8)
+        } catch (ex: Exception) {
+            ex.printStackTrace()
         }
-        if (result == null) return null
-        val encryptedPairData = result?.let { getEncryptedDataPair(it) }
-        val cipher = Cipher.getInstance(TRANSFORMATION)
-        val keySpec = IvParameterSpec(encryptedPairData?.first)
-        cipher.init(Cipher.DECRYPT_MODE, getKey(), keySpec)
-        return cipher.doFinal(encryptedPairData?.second).toString(UTF_8)
+        return result
     }
 
     /**
      * Store encrypted data into preferences
      */
     fun savePreferenceData(key: String, data: String) {
-        sharedPreferences?.edit()?.putString(key, data)?.apply()
+        sharedPreferences.edit().putString(key, data)?.apply()
     }
 
     /**
      * Retrieve decrypted data from preferences
      */
     fun getPreferencesData(key: String): String? {
-        return sharedPreferences?.getString(key, "")
+        return sharedPreferences.getString(key, "")
     }
 
     /**
      * Delete All local storage
      */
     fun deletePreferencesData(key: String) {
-        sharedPreferences?.edit()?.remove(key)?.apply()
-        val sharedPreferenceIds = sharedPreferences?.all
-        sharedPreferenceIds?.forEach {
+        sharedPreferences.edit().remove(key)?.apply()
+        val sharedPreferenceIds = sharedPreferences.all
+        sharedPreferenceIds.forEach {
             if (it.key.contains(key)) {
-                sharedPreferences?.edit()?.remove(key)?.apply()
+                sharedPreferences.edit().remove(key)?.apply()
             }
         }
     }