feat: updated code for session-manager changes

Signed-off-by: Gaurav Goel <[email protected]>

Author: grvgoel81

core/build.gradle

@@ -69,7 +69,7 @@ dependencies {
     implementation 'org.web3j:core:4.8.8-android'
 
     //session-manager-sdk
-    implementation 'com.github.grvgoel81:session-manager-android:7.2.0'
+    implementation 'com.github.grvgoel81:session-manager-android:7.4.0'
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
 

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

@@ -166,6 +166,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
         fetchProjectConfig(context).whenComplete { _, err ->
             if (err == null) {
                 //authorize session
+                sessionManager.setSessionId(SessionManager.getSessionIdFromStorage())
                 this.authorizeSession(web3AuthOption.redirectUrl.toString(), context)
                     .whenComplete { resp, error ->
                         runOnUIThread {
@@ -218,7 +219,8 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
         val sessionId = sessionResponse.sessionId
 
         if (sessionId.isNotBlank() && sessionId.isNotEmpty()) {
-            sessionManager.saveSessionId(sessionId)
+            SessionManager.saveSessionIdToStorage(sessionId)
+            sessionManager.setSessionId(sessionId)
 
             //Rehydrate Session
             this.authorizeSession(web3AuthOption.redirectUrl.toString(), context)
@@ -233,7 +235,10 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                                 throwLoginError(ErrorCode.SOMETHING_WENT_WRONG)
                                 throwEnableMFAError(ErrorCode.SOMETHING_WENT_WRONG)
                             } else {
-                                web3AuthResponse?.sessionId?.let { sessionManager.saveSessionId(it) }
+                                web3AuthResponse?.sessionId?.let {
+                                    SessionManager.saveSessionIdToStorage(it)
+                                    sessionManager.setSessionId(it)
+                                }
 
                                 if (web3AuthResponse?.userInfo?.dappShare?.isNotEmpty() == true) {
                                     KeyStoreManagerUtils.encryptData(
@@ -436,9 +441,11 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<String> representing the asynchronous operation, containing the login ID.
      */
     private fun getLoginId(jsonObject: JSONObject, context: Context): CompletableFuture<String> {
+        val sessionId = SessionManager.generateRandomSessionKey()
+        sessionManager.setSessionId(sessionId)
         return sessionManager.createSession(
             jsonObject.toString(),
-            context
+            context,
         )
     }
 
@@ -455,7 +462,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
         context: Context
     ): CompletableFuture<Void> {
         val launchWalletServiceCF: CompletableFuture<Void> = CompletableFuture()
-        val sessionId = sessionManager.getSessionId()
+        val sessionId = SessionManager.getSessionIdFromStorage()
         if (sessionId.isNotBlank()) {
             val sdkUrl = Uri.parse(web3AuthOption.walletSdkUrl)