feat: Refactor initialize function

Signed-off-by: Gaurav Goel <[email protected]>
Web3Auth · Nov 11, 2024 · 3fd8be3 · 3fd8be3
1 parent 2bd91fb
commit 3fd8be3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/app/src/main/java/com/web3auth/sfaexample/MainActivity.kt b/app/src/main/java/com/web3auth/sfaexample/MainActivity.kt
@@ -34,14 +34,11 @@ class MainActivity : AppCompatActivity() {
         singleFactorAuth = SingleFactorAuth(web3AuthOptions, this)
         loginParams = LoginParams(TEST_VERIFIER, TORUS_TEST_EMAIL, idToken)
 
-        val sfakey = singleFactorAuth.initialize(this.applicationContext)
-        sfakey.whenComplete { response, error ->
-            if (response != null) {
+        singleFactorAuth.initialize(this.applicationContext).whenComplete { res, err ->
+            if (err == null) {
                 val text =
-                    "Public Address: ${response?.publicAddress} , Private Key: ${response?.privateKey}"
+                    "Public Address: ${singleFactorAuth.getSessionData()?.publicAddress} , Private Key: ${singleFactorAuth.getSessionData()?.privateKey}"
                 tv.text = text
-            } else {
-                tv.text = error.message
             }
         }
 

diff --git a/singlefactorauth/src/main/java/com/web3auth/singlefactorauth/SingleFactorAuth.kt b/singlefactorauth/src/main/java/com/web3auth/singlefactorauth/SingleFactorAuth.kt
@@ -50,7 +50,7 @@ class SingleFactorAuth(
         sessionManager = SessionManager(ctx, web3AuthOptions.getSessionTime(), ctx.packageName)
     }
 
-    fun initialize(ctx: Context): CompletableFuture<SessionData?> {
+    fun initialize(ctx: Context): CompletableFuture<Nothing?> {
         return CompletableFuture.supplyAsync {
             val savedSessionId = SessionManager.getSessionIdFromStorage()
             sessionManager.setSessionId(savedSessionId)
@@ -85,8 +85,8 @@ class SingleFactorAuth(
                 userInfo = finalUserInfo
             )
             state
-        }.thenApplyAsync({ sessionData ->
-            sessionData
+        }.thenApplyAsync({ _ ->
+            null
         }, { Handler(Looper.getMainLooper()).post(it) }).exceptionally { ex ->
             throw Exception("Initialization failed", ex)
         }