Merge pull request #96 from Web3Auth/feat/update-session-manager-changes

feat: updates session manager sdk and related changes.

Author: chaitanyapotti

app/build.gradle

@@ -12,11 +12,11 @@ android {
             keyPassword 'torus123'
         }
     }
-    compileSdkVersion 34
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.web3auth.app"
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 34
         versionCode 1
         versionName "1.0"

app/src/main/java/com/web3auth/app/MainActivity.kt

@@ -122,7 +122,6 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         val signOutButton = findViewById<Button>(R.id.signOutButton)
         val launchWalletButton = findViewById<Button>(R.id.launchWalletButton)
         val signMsgButton = findViewById<Button>(R.id.signMsgButton)
-        val signResultButton = findViewById<Button>(R.id.signResultButton)
         val btnSetUpMfa = findViewById<Button>(R.id.btnSetUpMfa)
         val spinner = findViewById<TextInputLayout>(R.id.verifierList)
         val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
@@ -135,6 +134,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             print(ex)
         }
 
+
         if (userInfo != null) {
             val jsonObject = JSONObject(gson.toJson(web3Auth.getWeb3AuthResponse()))
             contentTextView.text = jsonObject.toString(4) + "\n Private Key: " + key
@@ -155,7 +155,6 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             btnSetUpMfa.visibility = View.GONE
             launchWalletButton.visibility = View.GONE
             signMsgButton.visibility = View.GONE
-            signResultButton.visibility = View.GONE
             spinner.visibility = View.VISIBLE
         }
     }
@@ -165,7 +164,6 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         setContentView(R.layout.activity_main)
 
         val options = Web3AuthOptions(
-            context = this,
             clientId = "BFuUqebV5I8Pz5F7a5A2ihW7YVmbv_OHXnHYDv6OltAD5NGr6e-ViNvde3U4BHdn6HvwfkgobhVu4VwC-OSJkik",
             network = Network.SAPPHIRE_DEVNET,
             redirectUrl = Uri.parse("torusapp://org.torusresearch.web3authexample"),
@@ -186,15 +184,15 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                     clientId = "d84f6xvbdV75VTGmHiMWfZLeSPk8M07C",
                 )
             ),
-            buildEnv = BuildEnv.TESTING,
+            buildEnv = BuildEnv.PRODUCTION,
             sessionTime = 86400,
         )
 
         println("params: $options")
 
         // Configure Web3Auth
         web3Auth = Web3Auth(
-            options
+            options, this
         )
 
         web3Auth.setResultUrl(intent.data)
@@ -237,7 +235,6 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             }
         }
 
-        val signResultButton = findViewById<Button>(R.id.signResultButton)
         val signMsgButton = findViewById<Button>(R.id.signMsgButton)
         signMsgButton.setOnClickListener {
             val credentials: Credentials = Credentials.create(web3Auth.getPrivkey())
@@ -251,24 +248,17 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                     chainId = "0x89",
                     rpcTarget = "https://polygon-rpc.com/",
                     chainNamespace = ChainNamespace.EIP155
-                ), "personal_sign", requestParams = params
+                ), "personal_sign", requestParams = params, appState = "web3Auth"
             )
-            signMsgCompletableFuture.whenComplete { _, error ->
+            signMsgCompletableFuture.whenComplete { signResult, error ->
                 if (error == null) {
-                    Log.d("MainActivity_Web3Auth", "Message signed successfully")
-                    signResultButton.visibility = View.VISIBLE
+                    showAlertDialog("Sign Result", signResult.toString())
                 } else {
                     Log.d("MainActivity_Web3Auth", error.message ?: "Something went wrong")
-                    signResultButton.visibility = View.GONE
                 }
             }
         }
 
-        signResultButton.setOnClickListener {
-            val signResult = Web3Auth.getSignResponse()
-            showAlertDialog("Sign Result", signResult.toString())
-        }
-
         val btnSetUpMfa = findViewById<Button>(R.id.btnSetUpMfa)
         btnSetUpMfa.setOnClickListener {
             val setupMfaCf = web3Auth.enableMFA()

app/src/main/res/layout/activity_main.xml

@@ -103,18 +103,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/launchWalletButton" />
 
-    <Button
-        android:id="@+id/signResultButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
-        android:text="@string/sign_result"
-        android:textAllCaps="false"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/signMsgButton" />
-
     <Button
         android:id="@+id/btnSetUpMfa"
         android:layout_width="wrap_content"

core/build.gradle

@@ -5,10 +5,10 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -51,7 +51,7 @@ dependencies {
     implementation 'androidx.browser:browser:1.6.0'
 
     // Encoding
-    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'com.google.code.gson:gson:2.10.1'
 
     // retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@@ -69,14 +69,14 @@ dependencies {
     implementation 'org.web3j:core:4.8.8-android'
 
     //session-manager-sdk
-    implementation 'com.github.Web3Auth:session-manager-android:1.3.0'
+    implementation 'com.github.Web3Auth:session-manager-android:3.0.0'
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
 
     // Test
     testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
 
 project.afterEvaluate {