Merge commit 'cbf5fc6544825b3649af88fddc3b09151265e7d5' into v9-andro…

…id-testing
Web3Auth · Dec 6, 2024 · e7ca240 · e7ca240
2 parents ebd12a1 + cbf5fc6
commit e7ca240
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 22 deletions.
diff --git a/android/android-aggregate-verifier-example/app/build.gradle b/android/android-aggregate-verifier-example/app/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.code.gson:gson:2.9.1'
-    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.0'
+    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.1'
     implementation 'org.web3j:core:4.8.7-android'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

diff --git a/android/android-auth0-example/app/build.gradle b/android/android-auth0-example/app/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.code.gson:gson:2.9.1'
-    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.0'
+    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.1'
     implementation 'org.web3j:core:4.8.7-android'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

diff --git a/android/android-firebase-example/app/build.gradle b/android/android-firebase-example/app/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.code.gson:gson:2.9.1'
-    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.0'
+    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.1'
     implementation 'org.web3j:core:4.8.7-android'
     implementation platform('com.google.firebase:firebase-bom:31.0.2')
     implementation 'com.google.firebase:firebase-auth-ktx'

diff --git a/android/android-firebase-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt b/android/android-firebase-example/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
@@ -16,6 +16,7 @@ import com.google.firebase.auth.GetTokenResult
 import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
 import com.google.gson.Gson
+import com.google.gson.JsonArray
 import com.web3auth.core.Web3Auth
 import com.web3auth.core.types.*
 import org.web3j.crypto.Credentials

diff --git a/android/android-playground/app/build.gradle.kts b/android/android-playground/app/build.gradle.kts
@@ -57,7 +57,7 @@ dependencies {
     implementation("com.google.accompanist:accompanist-pager:0.13.0")
     implementation("com.google.accompanist:accompanist-pager-indicators:0.27.1")
     implementation("androidx.compose.material:material-icons-extended:1.6.7")
-    implementation("com.github.web3auth:web3auth-android-sdk:9.0.0")
+    implementation("com.github.web3auth:web3auth-android-sdk:9.0.1")
     debugImplementation("androidx.compose.ui:ui-tooling:1.6.7")
     implementation("androidx.compose.ui:ui-tooling-preview:1.6.7")
     implementation("androidx.activity:activity-compose:1.9.0")

diff --git a/android/android-playground/app/src/main/java/com/example/android_playground/MainActivity.kt b/android/android-playground/app/src/main/java/com/example/android_playground/MainActivity.kt
@@ -29,8 +29,6 @@ class MainActivity : ComponentActivity() {
             modules(appModule)
         }
 
-        viewModel.setResultUrl(intent?.data)
-
         setContent {
             AndroidplaygroundTheme {
                 // A surface container using the 'background' color from the theme
@@ -43,6 +41,7 @@ class MainActivity : ComponentActivity() {
                 }
             }
             viewModel.initialise()
+            viewModel.setResultUrl(intent?.data)
         }
     }
 

diff --git a/...id-playground/app/src/main/java/com/example/android_playground/data/Web3AuthHelperImpl.kt b/...id-playground/app/src/main/java/com/example/android_playground/data/Web3AuthHelperImpl.kt
@@ -31,7 +31,7 @@ class Web3AuthHelperImpl(
     }
 
     override suspend fun initialize(): CompletableFuture<Void> {
-        return web3Auth.initialize()
+           return web3Auth.initialize()
     }
 
     override suspend fun setResultUrl(uri: Uri?) {

diff --git a/android/android-playground/app/src/main/java/com/example/android_playground/di/appModule.kt b/android/android-playground/app/src/main/java/com/example/android_playground/di/appModule.kt
@@ -33,7 +33,7 @@ private fun getWeb3AuthHelper(context: Context): Web3AuthHelper {
             clientId = "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ",
             network = Network.SAPPHIRE_MAINNET,
             redirectUrl = Uri.parse( "w3a://com.example.android_playground/auth")
-        ), context
+        ), context.applicationContext
     )
 
     return Web3AuthHelperImpl(web3Auth)

diff --git a/...id-playground/app/src/main/java/com/example/android_playground/viewmodel/MainViewModel.kt b/...id-playground/app/src/main/java/com/example/android_playground/viewmodel/MainViewModel.kt
@@ -84,7 +84,11 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper) : ViewModel() {
 
     fun initialise() {
         viewModelScope.launch {
-            web3AuthHelper.initialize().await()
+            try {
+                web3AuthHelper.initialize().await()
+            }catch (e: Exception) {
+                Log.e("Initialize", e.toString())
+            }
             isUserLoggedIn()
         }
     }
@@ -122,9 +126,9 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper) : ViewModel() {
         viewModelScope.launch {
             try {
                 web3AuthHelper.logOut().await()
-                _isLoggedIn.emit(true)
-            } catch (e: Exception) {
                 _isLoggedIn.emit(false)
+            } catch (e: Exception) {
+                _isLoggedIn.emit(true)
             }
         }
     }

diff --git a/android/android-playground/build.gradle.kts b/android/android-playground/build.gradle.kts
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.7.2" apply false
+    id("com.android.application") version "8.2.0" apply false
     id("org.jetbrains.kotlin.android") version "1.9.0" apply false
 }
diff --git a/android/android-quick-start/app/build.gradle b/android/android-quick-start/app/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.code.gson:gson:2.9.1'
     // IMP START - Installation
-    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.0'
+    implementation 'com.github.web3auth:web3auth-android-sdk:9.0.1'
     // IMP END - Installation
     implementation 'org.web3j:core:4.8.7-android'
     testImplementation 'junit:junit:4.13.2'

diff --git a/android/android-quick-start/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt b/android/android-quick-start/app/src/main/java/com/sbz/web3authdemoapp/MainActivity.kt
@@ -149,7 +149,10 @@ class MainActivity : AppCompatActivity() {
         val logoutCompletableFuture = web3Auth.logout()
         // IMP END - Logout
         logoutCompletableFuture.whenComplete { _, error ->
+
             if (error == null) {
+                val user = web3Auth.getUserInfo()
+                Log.i("UserInfo", user.toString())
                 reRender()
             } else {
                 Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")

diff --git a/android/android-quick-start/build.gradle b/android/android-quick-start/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.7.2' apply false
-    id 'com.android.library' version '8.7.2' apply false
+    id 'com.android.application' version '8.2.0' apply false
+    id 'com.android.library' version '8.2.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }
 

diff --git a/android/android-quick-start/gradle.properties b/android/android-quick-start/gradle.properties
@@ -21,5 +21,4 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
diff --git a/android/android-solana-example/app/build.gradle.kts b/android/android-solana-example/app/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
-    implementation("com.github.Web3Auth:web3auth-android-sdk:9.0.0")
+    implementation("com.github.Web3Auth:web3auth-android-sdk:9.0.1")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

diff --git a/...ana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelperImpl.kt b/...ana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelperImpl.kt
@@ -31,7 +31,12 @@ class Web3AuthHelperImpl(
     }
 
     override suspend fun initialize(): CompletableFuture<Void> {
-        return web3Auth.initialize()
+       try {
+          return web3Auth.initialize()
+       } catch(e: Exception) {
+           // Something went wrong
+           throw e
+       }
     }
 
     override suspend fun setResultUrl(uri: Uri?) {

diff --git a/...ana-example/app/src/main/java/com/example/androidsolanaexample/viewmodel/MainViewModel.kt b/...ana-example/app/src/main/java/com/example/androidsolanaexample/viewmodel/MainViewModel.kt
@@ -1,5 +1,6 @@
 package com.example.androidsolanaexample.viewmodel
 import android.net.Uri
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.androidsolanaexample.data.Web3AuthHelper
@@ -48,7 +49,11 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper, private val sola
 
     fun initialise() {
         viewModelScope.launch {
-            web3AuthHelper.initialize().await()
+            try {
+                web3AuthHelper.initialize().await()
+            } catch (e:Exception) {
+                Log.e("Initialization", e.toString())
+            }
             isUserLoggedIn()
         }
     }
@@ -84,9 +89,10 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper, private val sola
         viewModelScope.launch {
             try {
                 web3AuthHelper.logOut().await()
-                _isLoggedIn.emit(true)
-            } catch (e: Exception) {
                 _isLoggedIn.emit(false)
+            } catch (e: Exception) {
+                Log.e("Logout", e.toString())
+                _isLoggedIn.emit(true)
             }
         }
     }

diff --git a/android/android-solana-example/build.gradle.kts b/android/android-solana-example/build.gradle.kts
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.7.2" apply false
+    id("com.android.application") version "8.2.0" apply false
     id("org.jetbrains.kotlin.android") version "1.9.0" apply false
 }