From 9395ea88a5ca0c34242644fb33a00df02962967f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 10 Jan 2022 10:43:34 +0100
Subject: [PATCH] Fixed used of deprecated adapterPosition API

---
 .../chat/adapters/ChatMessagesListAdapter.kt  | 20 +++++++++----------
 .../chat/adapters/ChatRoomsListAdapter.kt     |  4 ++--
 .../chat/fragments/MasterChatRoomsFragment.kt |  8 ++++----
 .../contact/adapters/ContactsListAdapter.kt   |  4 ++--
 .../fragments/MasterContactsFragment.kt       |  4 ++--
 .../history/adapters/CallLogsListAdapter.kt   |  4 ++--
 .../fragments/MasterCallLogsFragment.kt       |  4 ++--
 .../adapters/RecordingsListAdapter.kt         |  4 ++--
 .../utils/RecyclerViewHeaderDecoration.kt     |  2 +-
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
index cade0ec29..7eb6f214c 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
@@ -213,13 +213,13 @@ class ChatMessagesListAdapter(
                     selectionViewModel.isEditionEnabled.observe(
                         viewLifecycleOwner,
                         {
-                            position = adapterPosition
+                            position = bindingAdapterPosition
                         }
                     )
 
                     setClickListener {
                         if (selectionViewModel.isEditionEnabled.value == true) {
-                            selectionViewModel.onToggleSelect(adapterPosition)
+                            selectionViewModel.onToggleSelect(bindingAdapterPosition)
                         }
                     }
 
@@ -234,8 +234,8 @@ class ChatMessagesListAdapter(
                     var hasPrevious = false
                     var hasNext = false
 
-                    if (adapterPosition > 0) {
-                        val previousItem = getItem(adapterPosition - 1)
+                    if (bindingAdapterPosition > 0) {
+                        val previousItem = getItem(bindingAdapterPosition - 1)
                         if (previousItem.eventLog.type == EventLog.Type.ConferenceChatMessage) {
                             val previousMessage = previousItem.eventLog.chatMessage
                             if (previousMessage != null && previousMessage.fromAddress.weakEqual(chatMessage.fromAddress)) {
@@ -246,8 +246,8 @@ class ChatMessagesListAdapter(
                         }
                     }
 
-                    if (adapterPosition >= 0 && adapterPosition < itemCount - 1) {
-                        val nextItem = getItem(adapterPosition + 1)
+                    if (bindingAdapterPosition >= 0 && bindingAdapterPosition < itemCount - 1) {
+                        val nextItem = getItem(bindingAdapterPosition + 1)
                         if (nextItem.eventLog.type == EventLog.Type.ConferenceChatMessage) {
                             val nextMessage = nextItem.eventLog.chatMessage
                             if (nextMessage != null && nextMessage.fromAddress.weakEqual(chatMessage.fromAddress)) {
@@ -346,7 +346,7 @@ class ChatMessagesListAdapter(
         private fun resendMessage() {
             val chatMessage = binding.data?.chatMessage
             if (chatMessage != null) {
-                chatMessage.userData = adapterPosition
+                chatMessage.userData = bindingAdapterPosition
                 resendMessageEvent.value = Event(chatMessage)
             }
         }
@@ -388,7 +388,7 @@ class ChatMessagesListAdapter(
         private fun deleteMessage() {
             val chatMessage = binding.data?.chatMessage
             if (chatMessage != null) {
-                chatMessage.userData = adapterPosition
+                chatMessage.userData = bindingAdapterPosition
                 deleteMessageEvent.value = Event(chatMessage)
             }
         }
@@ -418,13 +418,13 @@ class ChatMessagesListAdapter(
                 selectionViewModel.isEditionEnabled.observe(
                     viewLifecycleOwner,
                     {
-                        position = adapterPosition
+                        position = bindingAdapterPosition
                     }
                 )
 
                 binding.setClickListener {
                     if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(adapterPosition)
+                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
                     }
                 }
 
diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt
index d4100c53f..1d8da9029 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt
@@ -75,7 +75,7 @@ class ChatRoomsListAdapter(
                 selectionViewModel.isEditionEnabled.observe(
                     viewLifecycleOwner,
                     {
-                        position = adapterPosition
+                        position = bindingAdapterPosition
                     }
                 )
 
@@ -83,7 +83,7 @@ class ChatRoomsListAdapter(
 
                 setClickListener {
                     if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(adapterPosition)
+                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
                     } else {
                         selectedChatRoomEvent.value = Event(chatRoomViewModel.chatRoom)
                     }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index 3f3f88025..36457821e 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -174,9 +174,9 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
         )
         val swipeListener = object : RecyclerViewSwipeListener {
             override fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder) {
-                val chatRoomViewModel = adapter.currentList[viewHolder.adapterPosition]
+                val chatRoomViewModel = adapter.currentList[viewHolder.bindingAdapterPosition]
                 chatRoomViewModel.chatRoom.markAsRead()
-                adapter.notifyItemChanged(viewHolder.adapterPosition)
+                adapter.notifyItemChanged(viewHolder.bindingAdapterPosition)
             }
 
             override fun onRightToLeftSwipe(viewHolder: RecyclerView.ViewHolder) {
@@ -184,13 +184,13 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
                 val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
 
                 viewModel.showCancelButton {
-                    adapter.notifyItemChanged(viewHolder.adapterPosition)
+                    adapter.notifyItemChanged(viewHolder.bindingAdapterPosition)
                     dialog.dismiss()
                 }
 
                 viewModel.showDeleteButton(
                     {
-                        val deletedChatRoom = adapter.currentList[viewHolder.adapterPosition].chatRoom
+                        val deletedChatRoom = adapter.currentList[viewHolder.bindingAdapterPosition].chatRoom
                         listViewModel.deleteChatRoom(deletedChatRoom)
                         if (!binding.slidingPane.isSlideable &&
                             deletedChatRoom == sharedViewModel.selectedChatRoom.value
diff --git a/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt
index ee2e554cb..768ca2602 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/adapters/ContactsListAdapter.kt
@@ -73,13 +73,13 @@ class ContactsListAdapter(
                 selectionViewModel.isEditionEnabled.observe(
                     viewLifecycleOwner,
                     {
-                        position = adapterPosition
+                        position = bindingAdapterPosition
                     }
                 )
 
                 setClickListener {
                     if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(adapterPosition)
+                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
                     } else {
                         selectedContactEvent.value = Event(contactViewModel.contactInternal)
                     }
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
index c751b5ae2..4a1f9494a 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt
@@ -175,13 +175,13 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
                 val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
 
                 viewModel.showCancelButton {
-                    adapter.notifyItemChanged(viewHolder.adapterPosition)
+                    adapter.notifyItemChanged(viewHolder.bindingAdapterPosition)
                     dialog.dismiss()
                 }
 
                 viewModel.showDeleteButton(
                     {
-                        val deletedContact = adapter.currentList[viewHolder.adapterPosition].contactInternal
+                        val deletedContact = adapter.currentList[viewHolder.bindingAdapterPosition].contactInternal
                         listViewModel.deleteContact(deletedContact)
                         if (!binding.slidingPane.isSlideable &&
                             deletedContact == sharedViewModel.selectedContact.value
diff --git a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
index a2506d516..8a7bd550b 100644
--- a/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/adapters/CallLogsListAdapter.kt
@@ -75,13 +75,13 @@ class CallLogsListAdapter(
                 selectionViewModel.isEditionEnabled.observe(
                     viewLifecycleOwner,
                     {
-                        position = adapterPosition
+                        position = bindingAdapterPosition
                     }
                 )
 
                 setClickListener {
                     if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(adapterPosition)
+                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
                     } else {
                         startCallToEvent.value = Event(callLogGroup)
                     }
diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
index 421e98cae..c7a56c4c9 100644
--- a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt
@@ -160,13 +160,13 @@ class MasterCallLogsFragment : MasterFragment<HistoryMasterFragmentBinding, Call
                 val dialog: Dialog = DialogUtils.getDialog(requireContext(), viewModel)
 
                 viewModel.showCancelButton {
-                    adapter.notifyItemChanged(viewHolder.adapterPosition)
+                    adapter.notifyItemChanged(viewHolder.bindingAdapterPosition)
                     dialog.dismiss()
                 }
 
                 viewModel.showDeleteButton(
                     {
-                        val deletedCallGroup = adapter.currentList[viewHolder.adapterPosition]
+                        val deletedCallGroup = adapter.currentList[viewHolder.bindingAdapterPosition]
                         listViewModel.deleteCallLogGroup(deletedCallGroup)
                         if (!binding.slidingPane.isSlideable &&
                             deletedCallGroup.lastCallLog.callId == sharedViewModel.selectedCallLogGroup.value?.lastCallLog?.callId
diff --git a/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt
index 43b2c48ad..839271c38 100644
--- a/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/recordings/adapters/RecordingsListAdapter.kt
@@ -69,12 +69,12 @@ class RecordingsListAdapter(
                 lifecycleOwner = viewLifecycleOwner
 
                 // This is for item selection through ListTopBarFragment
-                position = adapterPosition
+                position = bindingAdapterPosition
                 selectionListViewModel = selectionViewModel
 
                 setClickListener {
                     if (selectionViewModel.isEditionEnabled.value == true) {
-                        selectionViewModel.onToggleSelect(adapterPosition)
+                        selectionViewModel.onToggleSelect(bindingAdapterPosition)
                     }
                 }
 
diff --git a/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt b/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt
index a4f682376..031dead06 100644
--- a/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt
+++ b/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt
@@ -36,7 +36,7 @@ class RecyclerViewHeaderDecoration(private val context: Context, private val ada
         parent: RecyclerView,
         state: RecyclerView.State
     ) {
-        val position = (view.layoutParams as RecyclerView.LayoutParams).viewAdapterPosition
+        val position = (view.layoutParams as RecyclerView.LayoutParams).bindingAdapterPosition
 
         if (position != RecyclerView.NO_POSITION && adapter.displayHeaderForPosition(position)) {
             val headerView: View = adapter.getHeaderViewForPosition(view.context, position)