From 0a1a938a01a6537c7fbf01718a790732925977e2 Mon Sep 17 00:00:00 2001
From: AyushBherwani1998 <ayush.bherwani1998@gmail.com>
Date: Wed, 4 Dec 2024 16:08:35 +0530
Subject: [PATCH] update android sfa example

---
 .../sfa-android-quick-start/app/build.gradle  |  3 +-
 .../example/androidsfaexample/MainActivity.kt | 31 ++++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/single-factor-auth-android/sfa-android-quick-start/app/build.gradle b/single-factor-auth-android/sfa-android-quick-start/app/build.gradle
index 4ee8c791..7f455ddf 100644
--- a/single-factor-auth-android/sfa-android-quick-start/app/build.gradle
+++ b/single-factor-auth-android/sfa-android-quick-start/app/build.gradle
@@ -40,8 +40,7 @@ android {
 
 dependencies {
     // IMP START - Installation
-    implementation 'com.github.web3auth:single-factor-auth-android:2.1.0'
-    implementation 'org.torusresearch:torus-utils-java:4.0.3'
+    implementation 'com.github.web3auth:single-factor-auth-android:3.0.0'
     // IMP END - Installation
     implementation platform('com.google.firebase:firebase-bom:31.0.2')
     implementation 'com.google.firebase:firebase-auth-ktx'
diff --git a/single-factor-auth-android/sfa-android-quick-start/app/src/main/java/com/example/androidsfaexample/MainActivity.kt b/single-factor-auth-android/sfa-android-quick-start/app/src/main/java/com/example/androidsfaexample/MainActivity.kt
index 0b40b98e..23a62c15 100644
--- a/single-factor-auth-android/sfa-android-quick-start/app/src/main/java/com/example/androidsfaexample/MainActivity.kt
+++ b/single-factor-auth-android/sfa-android-quick-start/app/src/main/java/com/example/androidsfaexample/MainActivity.kt
@@ -61,21 +61,23 @@ class MainActivity : AppCompatActivity() {
 
         val signOutButton = findViewById<Button>(R.id.signOut)
         signOutButton.setOnClickListener { signOut(this.applicationContext) }
-        singleFactorAuth.getSessionData()
         val torusKeyCF = singleFactorAuth.initialize(this.applicationContext)
         Log.i("Is connected",singleFactorAuth.isConnected().toString())
-        torusKeyCF.whenComplete { sessionData, error ->
+        torusKeyCF.whenComplete { _, error ->
             if (error != null) {
                 Log.e("Initialize Error", error.toString())
-            } else if (sessionData == null) {
-                Log.e("Initialize", "No active session found")
             } else  {
-                this.sessionData = sessionData
-                torusKey = sessionData.privateKey
-                publicAddress = sessionData.publicAddress
-                Log.i("Private Key", torusKey!!.trimIndent())
-                Log.i("User Info", sessionData.userInfo.toString())
-                reRender()
+                this.sessionData = singleFactorAuth.getSessionData()
+                if(this.sessionData == null) {
+                    Log.i("Session", "No active session found")
+                } else {
+                    torusKey = sessionData!!.privateKey
+                    publicAddress = sessionData!!.publicAddress
+                    Log.i("Private Key", torusKey!!.trimIndent())
+                    Log.i("User Info", sessionData!!.userInfo.toString())
+                    reRender()
+                }
+
             }
         }
 
@@ -142,8 +144,13 @@ class MainActivity : AppCompatActivity() {
     private fun signOut(context: Context) {
         publicAddress = ""
         Firebase.auth.signOut()
-        singleFactorAuth.logout(context)
-        reRender()
+        try {
+            val logoutCF = singleFactorAuth.logout(context)
+            logoutCF.get()
+            reRender()
+        } catch (error: Exception) {
+            Log.e("Logout Error", error.toString());
+        }
     }
 
     private fun reRender() {