Merge pull request #41 from Web3Auth/feat/remove-application-class

Removing application context and remove We3AuthApp

Author: chaitanyapotti

core/src/main/AndroidManifest.xml

@@ -3,10 +3,6 @@
     package="com.web3auth.core">
 
     <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:name=".Web3AuthApp"/>
-
     <queries>
         <intent>
             <action android:name="android.support.customtabs.action.CustomTabsService" />

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

@@ -54,11 +54,6 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
     private var web3AuthOption = web3AuthOptions
 
     init {
-        //initiate keyStore
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            initiateKeyStoreManager()
-        }
-
         // Build init params
         val initParams = mutableMapOf(
             "clientId" to web3AuthOptions.clientId,
@@ -74,11 +69,15 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions) {
         this.initParams = initParams
         this.context = web3AuthOptions.context
 
+        KeyStoreManagerUtils.initializePreferences(context.applicationContext)
+
+        //initiate keyStore
+        initiateKeyStoreManager()
+
         //authorize session
         authorizeSession()
     }
 
-    @RequiresApi(Build.VERSION_CODES.M)
     private fun initiateKeyStoreManager() {
         KeyStoreManagerUtils.getKeyGenerator()
     }

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

@@ -1,10 +1,10 @@
 package com.web3auth.core.keystore
 
+import android.content.Context
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKeys
-import com.web3auth.core.Web3AuthApp
 import org.bouncycastle.asn1.ASN1EncodableVector
 import org.bouncycastle.asn1.ASN1Integer
 import org.bouncycastle.asn1.DERSequence
@@ -33,14 +33,16 @@ object KeyStoreManagerUtils {
     private lateinit var encryptedPairData: Pair<ByteArray, ByteArray>
 
     private val masterKeyAlias = MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC)
-    private val sharedPreferences = Web3AuthApp.getContext()?.let {
-        EncryptedSharedPreferences.create(
+    private lateinit var sharedPreferences: EncryptedSharedPreferences
+
+    fun initializePreferences(context: Context) {
+        sharedPreferences = EncryptedSharedPreferences.create(
             "Web3Auth",
             masterKeyAlias,
-            it,
+            context,
             EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
             EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
-        )
+        ) as EncryptedSharedPreferences
     }
 
     /**