Merge branch 'master' of github.com:torusresearch/web3auth-android-sdk

Web3Auth · Mar 18, 2022 · fab8802 · fab8802
2 parents 2a6cc95 + 575bc88
commit fab8802
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,7 +22,7 @@ android {
         versionName "1.0"
         manifestPlaceholders = [
                 'torusRedirectScheme'    : 'torusapp',
-                'torusRedirectHost'      : 'org.torusresearch.openloginexample',
+                'torusRedirectHost'      : 'org.torusresearch.web3authexample',
                 'torusRedirectPathPrefix': '/redirect'
         ]
 

diff --git a/app/src/androidTest/java/com/openlogin/app/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/openlogin/app/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.openlogin.app
+package com.web3auth.app
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.openlogin.app", appContext.packageName)
+        assertEquals("com.web3auth.app", appContext.packageName)
     }
 }
diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -108,9 +108,9 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         // Configure Web3Auth
         web3Auth = Web3Auth(
             Web3AuthOptions(context = this,
-            clientId = getString(R.string.openlogin_project_id),
+            clientId = getString(R.string.web3auth_project_id),
             network = Web3Auth.Network.MAINNET,
-            redirectUrl = Uri.parse("torusapp://org.torusresearch.openloginexample/redirect"),
+            redirectUrl = Uri.parse("torusapp://org.torusresearch.web3authexample/redirect"),
                 whiteLabel = WhiteLabelData(
                     "Web3Auth Sample App", null, null, "en", true,
                     hashMapOf(

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">Torus Web3Auth</string>
-    <string name="openlogin_project_id">BCtbnOamqh0cJFEUYA0NB5YkvBECZ3HLZsKfvSRBvew2EiiKW3UxpyQASSR0artjQkiUOCHeZ_ZeygXpYpxZjOs</string>
+    <string name="web3auth_project_id">BASdZxp5tWqPGkzbOU4VMJsnz8QOpJ2pyxf6kZcuxI8AJ1gsOw5MgbW96RpAAx_Kk-5p4rhOopPhCa9kR_9mKpE</string>
     <string name="sign_in">Sign in</string>
     <string name="not_logged_in">Not logged in</string>
     <string name="sign_out">Sign out</string>

diff --git a/core/src/androidTest/java/com/openlogin/core/ExampleInstrumentedTest.kt b/core/src/androidTest/java/com/openlogin/core/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.openlogin.core
+package com.web3auth.core
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.openlogin.core.test", appContext.packageName)
+        assertEquals("com.web3auth.core.test", appContext.packageName)
     }
 }
diff --git a/core/src/main/java/com/web3auth/core/Utils.kt b/core/src/main/java/com/web3auth/core/Utils.kt
@@ -24,7 +24,7 @@ val ALLOWED_CUSTOM_TABS_PACKAGES =
     )
 
 fun Context.doesDefaultBrowserSupportCustomTabs(): Boolean {
-    val defaultBrowserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://openlogin.com"));
+    val defaultBrowserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://web3auth.io"));
 
     val `package` = packageManager.resolveActivity(
         defaultBrowserIntent,
@@ -43,7 +43,7 @@ fun String.isEmailValid(): Boolean {
 }
 
 fun Context.getDefaultBrowser(): String? {
-    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://openlogin.com"))
+    val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://web3auth.io"))
     val resolveInfo = packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY)
         ?: return null
     val activityInfo = resolveInfo.activityInfo ?: return null

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,3 @@
-rootProject.name = "openlogin"
+rootProject.name = "web3auth"
 include ':core'
 include ':app'