v4.3.13

cometchat · Jul 9, 2024 · 0430695 · 0430695
1 parent e1d6dff
commit 0430695
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "com.cometchat.kotlinsampleapp"
         minSdk = 21
         targetSdk = 34
-        versionCode = 3
-        versionName = "4.3.11"
+        versionCode = 4
+        versionName = "4.3.13"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/java/com/cometchat/kotlinsampleapp/activity/MainActivity.kt b/app/src/main/java/com/cometchat/kotlinsampleapp/activity/MainActivity.kt
@@ -30,13 +30,9 @@ import org.json.JSONObject
 
 class MainActivity : AppCompatActivity() {
     private lateinit var user1: MaterialCardView
-
     private lateinit var user2: MaterialCardView
-
     private lateinit var user3: MaterialCardView
-
     private lateinit var user4: MaterialCardView
-
     private lateinit var ivLogo: AppCompatImageView
     private lateinit var progressBar: ProgressBar
     private lateinit var tvCometChat: AppCompatTextView
@@ -56,6 +52,34 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val uiKitSettings =
+            UIKitSettingsBuilder().setRegion(AppConstants.REGION).setAppId(AppConstants.APP_ID)
+                .setAuthKey(AppConstants.AUTH_KEY).subscribePresenceForAllUsers().build()
+        CometChatUIKit.init(this, uiKitSettings, object : CometChat.CallbackListener<String?>() {
+            override fun onSuccess(s: String?) {
+                CometChat.setDemoMetaInfo(appMetadata)
+                if (CometChatUIKit.getLoggedInUser() != null) {
+                    fetchDefaultObjects()
+                    startActivity(
+                        Intent(
+                            this@MainActivity,
+                            HomeActivity::class.java
+                        )
+                    )
+                    finish()
+                } else {
+                    viewInit()
+                }
+            }
+
+            override fun onError(e: CometChatException) {
+                Toast.makeText(this@MainActivity, e.message, Toast.LENGTH_SHORT).show()
+            }
+        })
+
+    }
+
+    private fun viewInit() {
         setContentView(R.layout.activity_main)
         parentView = findViewById(R.id.parent_view)
         progressBar = findViewById(R.id.progress_bar)
@@ -86,30 +110,6 @@ class MainActivity : AppCompatActivity() {
         stateMessage.text = getString(R.string.please_wait)
         progressBar.visibility = View.VISIBLE
         Utils.setStatusBarColor(this, resources.getColor(android.R.color.white))
-        val uiKitSettings =
-            UIKitSettingsBuilder().setRegion(AppConstants.REGION).setAppId(AppConstants.APP_ID)
-                .setAuthKey(AppConstants.AUTH_KEY).subscribePresenceForAllUsers().build()
-        CometChatUIKit.init(this, uiKitSettings, object : CometChat.CallbackListener<String?>() {
-            override fun onSuccess(s: String?) {
-                CometChat.setDemoMetaInfo(appMetadata)
-                if (CometChatUIKit.getLoggedInUser() != null) {
-                    fetchDefaultObjects()
-                    startActivity(
-                        Intent(
-                            this@MainActivity,
-                            HomeActivity::class.java
-                        )
-                    )
-                    finish()
-                }
-            }
-
-            override fun onError(e: CometChatException) {
-                Toast.makeText(this@MainActivity, e.message, Toast.LENGTH_SHORT).show()
-            }
-        })
-
-
         AppUtils.fetchSampleUsers(object : CometChat.CallbackListener<List<User>>() {
             override fun onSuccess(users: List<User>) {
                 if (users.isNotEmpty()) {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -20,6 +20,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "CometChatSampleAppKotlin"
+rootProject.name = "KotlinSampleApp"
 include(":app")