Updated SDK version to 33

build.gradle

@@ -22,9 +22,9 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '4.2.0' apply false
-    id 'com.android.library' version '4.2.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
 }
 task clean(type: Delete) {
     delete rootProject.buildDir

commonmodule/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         minSdk 26
@@ -42,6 +42,7 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion"
     implementation "com.google.android.material:material:$googleMaterialVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion"
+    implementation "androidx.activity:activity:$androidxCoreKtxVersion"
 
     //sendbird
     implementation "com.sendbird.sdk:sendbird-chat:$sendbirdVersion"

commonmodule/src/main/java/com/sendbird/chat/module/ui/base/BaseSplashActivity.kt

@@ -33,15 +33,16 @@ class BaseSplashActivity : AppCompatActivity() {
             startActivity(intent)
             finish()
         } else {
-            SendbirdChat.connect(userId) { _, e ->
-                if (e != null) {
-                    showToast("$e")
+            SendbirdChat.connect(userId) { user, e ->
+                if (user != null) {
+                    val intent = Intent("$packageName.MAIN")
+                    startActivity(intent)
+                } else {
+                    if (e != null) {
+                        showToast("$e")
+                    }
                     finish()
-                    return@connect
                 }
-                val intent = Intent("$packageName.MAIN")
-                startActivity(intent)
-                finish()
             }
         }
     }

commonmodule/src/main/java/com/sendbird/chat/module/ui/base/BaseUserInfoActivity.kt

@@ -1,11 +1,10 @@
 package com.sendbird.chat.module.ui.base
 
-import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import com.sendbird.android.SendbirdChat
@@ -20,14 +19,11 @@ class BaseUserInfoActivity : AppCompatActivity() {
     private var userNickname: String? = null
     private var profileUri: Uri? = null
 
-    private val startForResult =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { data ->
+    private val pickMedia =
+        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
             SendbirdChat.autoBackgroundDetection = true
-            if (data.resultCode == RESULT_OK) {
-                val uri = data.data?.data
-                profileUri = uri
-                binding.circularImageviewProfile.setImageUri(uri)
-            }
+            profileUri = uri
+            binding.circularImageviewProfile.setImageUri(uri)
         }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -47,7 +43,7 @@ class BaseUserInfoActivity : AppCompatActivity() {
 
         binding.circularImageviewEditProfile.setOnClickListener {
             SendbirdChat.autoBackgroundDetection = false
-            FileUtils.selectFile(Constants.DATA_TYPE_ONLY_IMAGE, startForResult, this)
+            pickMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
         }
         binding.purpleButtonSave.setOnClickListener {
             val nickname = binding.tagEdittextNickname.getText()
@@ -133,29 +129,4 @@ class BaseUserInfoActivity : AppCompatActivity() {
             else -> super.onOptionsItemSelected(item)
         }
     }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int, permissions: Array<out String>, grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        when (requestCode) {
-            Constants.PERMISSION_REQUEST_CODE -> {
-                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    showToast(getString(R.string.permission_granted))
-                    SendbirdChat.autoBackgroundDetection = false
-                    FileUtils.selectFile(Constants.DATA_TYPE_ONLY_IMAGE, startForResult, this)
-                } else {
-                    if (shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                        requestPermissions(
-                            arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
-                            Constants.PERMISSION_REQUEST_CODE
-                        )
-                    } else {
-                        showToast(getString(R.string.permission_denied))
-                    }
-                }
-            }
-        }
-    }
-
 }

commonmodule/src/main/java/com/sendbird/chat/module/utils/Constants.kt

@@ -12,9 +12,4 @@ object Constants {
     const val CHANNEL_HANDLER_ID = "channel_handler_id"
 
     const val CONNECTION_HANDLER_ID = "connection_handler_id"
-
-    const val PERMISSION_REQUEST_CODE = 10001
-
-    const val DATA_TYPE_ONLY_IMAGE = "image/*"
-    const val DATA_TYPE_IMAGE_AND_VIDEO = "image/* video/*"
 }

commonmodule/src/main/java/com/sendbird/chat/module/utils/FileUtils.kt

@@ -1,19 +1,11 @@
 package com.sendbird.chat.module.utils
 
-import android.Manifest
-import android.app.Activity
 import android.content.ContentResolver
 import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
-import android.provider.MediaStore
 import android.provider.OpenableColumns
 import android.util.Log
 import android.webkit.MimeTypeMap
-import androidx.activity.result.ActivityResultLauncher
-import androidx.core.app.ActivityCompat.requestPermissions
-import androidx.core.content.ContextCompat
 import java.io.File
 import java.io.FileDescriptor
 import java.io.FileInputStream
@@ -22,57 +14,6 @@ import java.io.FileOutputStream
 
 object FileUtils {
 
-    fun selectFile(
-        type: String,
-        startForResult: ActivityResultLauncher<Intent>,
-        context: Context
-    ) {
-        if (ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            requestStoragePermission(context)
-        } else {
-            val intent = Intent(Intent.ACTION_PICK)
-            intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, type)
-            startForResult.launch(intent)
-        }
-    }
-
-    fun selectFile(startForResult: ActivityResultLauncher<Intent>, context: Context) {
-        if (ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            requestStoragePermission(context)
-        } else {
-            val intent = Intent(Intent.ACTION_GET_CONTENT)
-            intent.type = "*/*"
-            intent.addCategory(Intent.CATEGORY_OPENABLE)
-            intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true)
-            startForResult.launch(intent)
-        }
-    }
-
-    private fun requestStoragePermission(context: Context) {
-        context.showAlertDialog(
-            "Permission",
-            "Storage access permissions are required to upload/download files.",
-            "Accept",
-            "Cancel",
-            {
-                requestPermissions(
-                    context as Activity,
-                    arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
-                    10001
-                )
-            },
-            {}
-        )
-    }
-
     data class FileResult(val file: File, val size: Int, val mime: String?, val name: String)
 
     fun getFileInfo(uri: Uri, context: Context): FileResult? {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Feb 17 09:30:44 KST 2022
+#Thu Sep 07 16:17:09 KST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

groupchannel-add-remove-operators/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.sendbird.chat.sample.groupchannel.addremoveoperators"

groupchannel-add-remove-operators/src/main/java/com/sendbird/chat/sample/groupchannel/addremoveoperators/ui/groupchannel/GroupChannelChatActivity.kt

@@ -1,12 +1,11 @@
 package com.sendbird.chat.sample.groupchannel.addremoveoperators.ui.groupchannel
 
-import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -41,14 +40,12 @@ class GroupChannelChatActivity : AppCompatActivity() {
     private var channelTSHashMap = ConcurrentHashMap<String, Long>()
     private var isCollectionInitialized = false
 
-    private val startForResultFile =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { data ->
+    private val pickMedia =
+        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
             SendbirdChat.autoBackgroundDetection = true
-            if (data.resultCode == RESULT_OK) {
-                val uri = data.data?.data
-                sendFileMessage(uri)
-            }
+            uri?.let { sendFileMessage(it) }
         }
+
     private val startForResultInvite =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { data ->
             if (data.resultCode == RESULT_OK) {
@@ -86,11 +83,7 @@ class GroupChannelChatActivity : AppCompatActivity() {
 
             override fun onFileMessageSend() {
                 SendbirdChat.autoBackgroundDetection = false
-                FileUtils.selectFile(
-                    Constants.DATA_TYPE_IMAGE_AND_VIDEO,
-                    startForResultFile,
-                    this@GroupChannelChatActivity
-                )
+                pickMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
             }
         })
     }
@@ -598,32 +591,4 @@ class GroupChannelChatActivity : AppCompatActivity() {
         }
 
     }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int, permissions: Array<out String>, grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        when (requestCode) {
-            Constants.PERMISSION_REQUEST_CODE -> {
-                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    showToast(getString(R.string.permission_granted))
-                    SendbirdChat.autoBackgroundDetection = false
-                    FileUtils.selectFile(
-                        Constants.DATA_TYPE_IMAGE_AND_VIDEO,
-                        startForResultFile,
-                        this
-                    )
-                } else {
-                    if (shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                        requestPermissions(
-                            arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
-                            Constants.PERMISSION_REQUEST_CODE
-                        )
-                    } else {
-                        showToast(getString(R.string.permission_denied))
-                    }
-                }
-            }
-        }
-    }
 }

groupchannel-admin-message/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.sendbird.chat.sample.groupchannel.admin"

groupchannel-admin-message/src/main/java/com/sendbird/chat/sample/groupchannel/admin/ui/groupchannel/GroupChannelChatActivity.kt

@@ -1,12 +1,11 @@
 package com.sendbird.chat.sample.groupchannel.admin.ui.groupchannel
 
-import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -41,6 +40,12 @@ class GroupChannelChatActivity : AppCompatActivity() {
     private var channelTSHashMap = ConcurrentHashMap<String, Long>()
     private var isCollectionInitialized = false
 
+    private val pickMedia =
+        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
+            SendbirdChat.autoBackgroundDetection = true
+            uri?.let { sendFileMessage(it) }
+        }
+
     private val startForResultFile =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { data ->
             SendbirdChat.autoBackgroundDetection = true
@@ -86,11 +91,7 @@ class GroupChannelChatActivity : AppCompatActivity() {
 
             override fun onFileMessageSend() {
                 SendbirdChat.autoBackgroundDetection = false
-                FileUtils.selectFile(
-                    Constants.DATA_TYPE_IMAGE_AND_VIDEO,
-                    startForResultFile,
-                    this@GroupChannelChatActivity
-                )
+                pickMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
             }
         })
     }
@@ -598,32 +599,4 @@ class GroupChannelChatActivity : AppCompatActivity() {
         }
 
     }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int, permissions: Array<out String>, grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        when (requestCode) {
-            Constants.PERMISSION_REQUEST_CODE -> {
-                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    showToast(getString(R.string.permission_granted))
-                    SendbirdChat.autoBackgroundDetection = false
-                    FileUtils.selectFile(
-                        Constants.DATA_TYPE_IMAGE_AND_VIDEO,
-                        startForResultFile,
-                        this
-                    )
-                } else {
-                    if (shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                        requestPermissions(
-                            arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
-                            Constants.PERMISSION_REQUEST_CODE
-                        )
-                    } else {
-                        showToast(getString(R.string.permission_denied))
-                    }
-                }
-            }
-        }
-    }
 }