teams: smoother joining (fixes #4788) (#4789)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Nov 21, 2024 · 1ef8874 · 1ef8874
1 parent ab3532a
commit 1ef8874
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2102
-        versionName "0.21.2"
+        versionCode 2103
+        versionName "0.21.3"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/team/teamMember/AdapterMemberRequest.kt b/app/src/main/java/org/ole/planet/myplanet/ui/team/teamMember/AdapterMemberRequest.kt
@@ -23,16 +23,25 @@ class AdapterMemberRequest(private val context: Context, private val list: Mutab
     }
 
     override fun onBindViewHolder(holder: ViewHolderUser, position: Int) {
-        rowMemberRequestBinding.tvName.text = list[position].name ?: list[position].toString()
+        val currentItem = list.getOrNull(position) ?: return
+        rowMemberRequestBinding.tvName.text = currentItem.name ?: currentItem.toString()
 
         if (isTeamLeader) {
             rowMemberRequestBinding.btnAccept.isEnabled = true
             rowMemberRequestBinding.btnReject.isEnabled = true
+
             rowMemberRequestBinding.btnAccept.setOnClickListener {
-                acceptReject(list[position], true, position)
+                val adapterPosition = holder.bindingAdapterPosition
+                if (adapterPosition != RecyclerView.NO_POSITION && adapterPosition < list.size) {
+                    acceptReject(list[adapterPosition], true, adapterPosition)
+                }
             }
+
             rowMemberRequestBinding.btnReject.setOnClickListener {
-                acceptReject(list[position], false, position)
+                val adapterPosition = holder.bindingAdapterPosition
+                if (adapterPosition != RecyclerView.NO_POSITION && adapterPosition < list.size) {
+                    acceptReject(list[adapterPosition], false, adapterPosition)
+                }
             }
         } else {
             rowMemberRequestBinding.btnAccept.isEnabled = false