Dev/voiceprint lock

.gitleaks.toml

@@ -131,13 +131,15 @@ paths = [
     '''(go.mod|go.sum)$''',
     '''iOS/.*\.strings''',
     '''iOS/.*\.lproj/.*''',
-    '''iOS/Scenes/ConvoAI/.*''',
+    '''iOS/.*\.xcodeproj/.*''',
+    '''iOS/.cursor/rules/.*''',
+    '''.*\.md''',
     '''.*\.strings$''',
     '''.*\.strings''',
     '''.*\/zh-Hans\.lproj\/.*''',
     '''.*\/zh-Hant\.lproj\/.*''',
     '''.*\/zh\.lproj\/.*''',
     '''iOS/Pods/.*''',
-    '''Web/.*''',
-    '''README\.md'''
+    '''README\.md''',
+    '''Web/.*'''
 ]

Android/app/build.gradle

@@ -21,7 +21,7 @@ android {
         minSdk rootProject.ext.minSdkVersion
         targetSdk rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.8.0"
+        versionName "1.8.5"
 
         buildConfigField("String", "BUILD_TIMESTAMP", "\"${buildTimestamp}\"")
 

Android/app/src/main/java/io/agora/agent/WelcomeActivity.kt

@@ -5,12 +5,11 @@ import android.os.Build
 import android.os.Bundle
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import io.agora.agent.databinding.WelcomeActivityBinding
-import io.agora.scene.common.constant.AgentScenes
 import io.agora.scene.common.ui.BaseActivity
 import androidx.annotation.RequiresApi
 import io.agora.scene.common.constant.SSOUserManager
-import io.agora.scene.convoai.ui.CovAgentListActivity
-import io.agora.scene.convoai.ui.CovLoginActivity
+import io.agora.scene.convoai.ui.auth.CovLoginActivity
+import io.agora.scene.convoai.ui.main.CovMainActivity
 
 class WelcomeActivity : BaseActivity<WelcomeActivityBinding>() {
 
@@ -37,7 +36,7 @@ class WelcomeActivity : BaseActivity<WelcomeActivityBinding>() {
     private fun goScene() {
         if (SSOUserManager.getToken().isNotEmpty()) {
             initFirebaseCrashlytics()
-            startActivity(Intent(this@WelcomeActivity, CovAgentListActivity::class.java))
+            startActivity(Intent(this@WelcomeActivity, CovMainActivity::class.java))
         } else {
             startActivity(Intent(this, CovLoginActivity::class.java))
         }

Android/build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 ext {
-    compileSdkVersion = 34
+    compileSdkVersion = 35
     minSdkVersion = 24
-    targetSdkVersion = 34
+    targetSdkVersion = 35
 }

Android/common/src/main/AndroidManifest.xml

@@ -3,17 +3,6 @@
 
     <application>
 
-        <activity
-            android:name=".ui.TermsActivity"
-            android:screenOrientation="portrait"
-            android:configChanges="locale|layoutDirection"
-            android:exported="false" />
-
-        <activity
-            android:name=".ui.SSOWebViewActivity"
-            android:screenOrientation="portrait"
-            android:configChanges="locale|layoutDirection"
-            android:exported="false"/>
     </application>
 
 </manifest>

Android/common/src/main/java/io/agora/scene/common/AgentApp.kt

@@ -10,7 +10,6 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
-import io.agora.scene.common.debugMode.DebugButton
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner

Android/common/src/main/java/io/agora/scene/common/constant/SSOUserManager.kt

@@ -1,6 +1,9 @@
 package io.agora.scene.common.constant
 
 import com.google.gson.JsonIOException
+import io.agora.scene.common.constant.SSOUserManager.CURRENT_SSO_USER
+import io.agora.scene.common.constant.SSOUserManager.TAG
+import io.agora.scene.common.constant.SSOUserManager.mUserInfo
 import io.agora.scene.common.net.SSOUserInfo
 import io.agora.scene.common.util.CommonLogger
 import io.agora.scene.common.util.GsonTools
@@ -30,6 +33,16 @@ object SSOUserManager {
         return mToken
     }
 
+    val accountUid: String get() = userInfo?.accountUid ?: ""
+
+    val userInfo: SSOUserInfo?
+        get() {
+            if (mUserInfo == null) {
+                loadUserFromLocal()
+            }
+            return mUserInfo
+        }
+
     @JvmStatic
     fun logout() {
         this.mToken = ""
@@ -47,4 +60,17 @@ object SSOUserManager {
         }
         LocalStorageUtil.putString(CURRENT_SSO_USER, userString)
     }
+
+    private fun loadUserFromLocal() {
+        val userString = LocalStorageUtil.getString(CURRENT_SSO_USER, "")
+        if (userString.isNotEmpty()) {
+            try {
+                mUserInfo = GsonTools.toBean(userString, SSOUserInfo::class.java)
+            } catch (e: Exception) {
+                CommonLogger.e(TAG, "Failed to load user info from local storage: ${e.message}")
+                mUserInfo = null
+            }
+        }
+    }
+
 }

Android/common/src/main/java/io/agora/scene/common/constant/ServerConfig.kt

@@ -28,6 +28,12 @@ object ServerConfig {
             return "https://www.agora.io/en/privacy-policy/"
         }
 
+    @JvmStatic
+    val ssoProfileUrl : String
+        get() {
+            return "https://sso.agora.io/profile"
+        }
+
     @JvmStatic
     var appVersionName: String = ""
         private set

Android/common/src/main/java/io/agora/scene/common/debugMode/DebugBaseConfigFragment.kt

@@ -67,6 +67,7 @@ class DebugBaseConfigFragment : BaseFragment<CommonDebugBaseConfigFragmentBindin
             divider.setDrawable(resources.getDrawable(R.drawable.shape_divider_line, null))
             rcOptions.addItemDecoration(divider)
 
+            mtvAppVersion.text = ServerConfig.appVersionName + "-" + ServerConfig.appBuildNo
             mtvRtcVersion.text = RtcEngine.getSdkVersion()
             mtvRtmVersion.text = RtmClient.getVersion()