From 2a9ef440b7d9d15559d9b175663d80291bf62648 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 5 Dec 2025 11:20:09 +0100 Subject: [PATCH] Code small improvements --- .../notifications/NotificationsManager.kt | 2 +- .../telecom/TelecomCallControlCallback.kt | 7 -- .../ConferenceParticipantsListAdapter.kt | 2 +- .../ui/call/fragment/TransferCallFragment.kt | 5 +- .../ui/fileviewer/viewmodel/FileViewModel.kt | 3 +- ...ationsContactsAndSuggestionsListAdapter.kt | 4 +- .../chat/adapter/ConversationEventAdapter.kt | 6 +- .../ConversationParticipantsAdapter.kt | 2 +- .../chat/adapter/ConversationsFilesAdapter.kt | 4 +- .../chat/adapter/MessageBottomSheetAdapter.kt | 2 +- .../adapter/ContactHistoryListAdapter.kt | 2 +- .../adapter/MeetingParticipantsAdapter.kt | 2 +- .../meetings/adapter/MeetingsListAdapter.kt | 2 +- .../linphone/ui/welcome/WelcomeActivity.kt | 2 +- .../java/org/linphone/utils/DialogUtils.kt | 17 --- .../linphone/utils/PatternClickableSpan.kt | 2 +- .../java/org/linphone/utils/ShortcutUtils.kt | 17 +-- .../main/res/layout/dialog_delete_meeting.xml | 106 ------------------ 18 files changed, 28 insertions(+), 159 deletions(-) delete mode 100644 app/src/main/res/layout/dialog_delete_meeting.xml diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 79476bcec..f3291e76b 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -1209,7 +1209,7 @@ class NotificationsManager .setContentIntent(pendingIntent) .build() - accountsErrorNotificationsMap.put(identity, notificationId) + accountsErrorNotificationsMap[identity] = notificationId Log.i("$TAG Showing account registration error notification with ID [$notificationId] for [$identity]") notify(notificationId, notification, ACCOUNT_ERROR_TAG) } diff --git a/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt b/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt index e9953930d..58e06d512 100644 --- a/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt +++ b/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt @@ -46,15 +46,8 @@ class TelecomCallControlCallback( ) { companion object { private const val TAG = "[Telecom Call Control Callback]" - - private const val DELAY_BEFORE_RELOADING_SOUND_DEVICES_MS = 100L } - private var availableEndpoints: List = arrayListOf() - private var currentEndpoint = CallEndpointCompat.TYPE_UNKNOWN - private var endpointUpdateRequestFromLinphone: Boolean = false - private var latestLinphoneRequestedEndpoint: CallEndpointCompat? = null - private var mutedByTelecomManager = false private val callListener = object : CallListenerStub() { diff --git a/app/src/main/java/org/linphone/ui/call/adapter/ConferenceParticipantsListAdapter.kt b/app/src/main/java/org/linphone/ui/call/adapter/ConferenceParticipantsListAdapter.kt index f56514bba..814762925 100644 --- a/app/src/main/java/org/linphone/ui/call/adapter/ConferenceParticipantsListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/call/adapter/ConferenceParticipantsListAdapter.kt @@ -49,7 +49,7 @@ class ConferenceParticipantsListAdapter : (holder as ViewHolder).bind(getItem(position)) } - inner class ViewHolder( + class ViewHolder( val binding: CallConferenceParticipantListCellBinding ) : RecyclerView.ViewHolder(binding.root) { @UiThread diff --git a/app/src/main/java/org/linphone/ui/call/fragment/TransferCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/TransferCallFragment.kt index 8f42bc281..5fc4193fa 100644 --- a/app/src/main/java/org/linphone/ui/call/fragment/TransferCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/fragment/TransferCallFragment.kt @@ -332,9 +332,8 @@ class TransferCallFragment : GenericCallFragment() { model.confirmEvent.observe(viewLifecycleOwner) { it.consume { coreContext.postOnCoreThread { - val address = toAddress - Log.i("$TAG Transferring (blind) call to [${address.asStringUriOnly()}]") - callViewModel.blindTransferCallTo(address) + Log.i("$TAG Transferring (blind) call to [${toAddress.asStringUriOnly()}]") + callViewModel.blindTransferCallTo(toAddress) } dialog.dismiss() diff --git a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt index b35c042e6..d44f965d1 100644 --- a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt @@ -130,8 +130,7 @@ class FileViewModel val extension = FileUtils.getExtensionFromFileName(file) val mime = FileUtils.getMimeTypeFromExtension(extension) mimeType.postValue(mime) - val mimeType = FileUtils.getMimeType(mime) - when (mimeType) { + when (val mimeType = FileUtils.getMimeType(mime)) { FileUtils.MimeType.Pdf -> { Log.d("$TAG File [$file] seems to be a PDF") loadPdf() diff --git a/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt b/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt index 356fb10bb..e8c79d2b0 100644 --- a/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt @@ -161,7 +161,7 @@ class ConversationsContactsAndSuggestionsListAdapter : } } - inner class ConversationViewHolder( + class ConversationViewHolder( val binding: GenericAddressPickerConversationListCellBinding ) : RecyclerView.ViewHolder(binding.root) { @UiThread @@ -198,7 +198,7 @@ class ConversationsContactsAndSuggestionsListAdapter : } } - inner class SuggestionViewHolder( + class SuggestionViewHolder( val binding: GenericAddressPickerSuggestionListCellBinding ) : RecyclerView.ViewHolder(binding.root) { @UiThread diff --git a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt index c02f7097b..c3d345d1b 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt @@ -202,7 +202,7 @@ class ConversationEventAdapter : } } - inner class IncomingBubbleViewHolder( + class IncomingBubbleViewHolder( val binding: ChatBubbleIncomingBinding ) : RecyclerView.ViewHolder(binding.root) { fun bind(message: MessageModel) { @@ -217,7 +217,7 @@ class ConversationEventAdapter : } } - inner class OutgoingBubbleViewHolder( + class OutgoingBubbleViewHolder( val binding: ChatBubbleOutgoingBinding ) : RecyclerView.ViewHolder(binding.root) { fun bind(message: MessageModel) { @@ -232,7 +232,7 @@ class ConversationEventAdapter : } } - inner class EventViewHolder( + class EventViewHolder( val binding: ChatConversationEventBinding ) : RecyclerView.ViewHolder(binding.root) { fun bind(event: EventModel) { diff --git a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationParticipantsAdapter.kt b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationParticipantsAdapter.kt index f72af30ac..95cca4bd3 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationParticipantsAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationParticipantsAdapter.kt @@ -50,7 +50,7 @@ class ConversationParticipantsAdapter : ListAdapter = ArrayList() - inner class SpannablePatternItem( + class SpannablePatternItem( var pattern: Pattern, var listener: SpannableClickedListener ) diff --git a/app/src/main/java/org/linphone/utils/ShortcutUtils.kt b/app/src/main/java/org/linphone/utils/ShortcutUtils.kt index 700d082c2..6a5cc8821 100644 --- a/app/src/main/java/org/linphone/utils/ShortcutUtils.kt +++ b/app/src/main/java/org/linphone/utils/ShortcutUtils.kt @@ -165,14 +165,15 @@ class ShortcutUtils { .setIsConversation() .setLongLived(Version.sdkAboveOrEqual(Version.API30_ANDROID_11)) .setLocusId(LocusIdCompat(id)) - // See https://developer.android.com/training/sharing/direct-share-targets#track-shortcut-usage-comms-apps - if (isGroup) { - builder.addCapabilityBinding("actions.intent.SEND_MESSAGE", "message.recipient.@type", listOf("Audience")) - builder.addCapabilityBinding("actions.intent.RECEIVE_MESSAGE", "message.sender.@type", listOf("Audience")) - } else { - builder.addCapabilityBinding("actions.intent.SEND_MESSAGE") - builder.addCapabilityBinding("actions.intent.RECEIVE_MESSAGE") - } + + // See https://developer.android.com/training/sharing/direct-share-targets#track-shortcut-usage-comms-apps + if (isGroup) { + builder.addCapabilityBinding("actions.intent.SEND_MESSAGE", "message.recipient.@type", listOf("Audience")) + builder.addCapabilityBinding("actions.intent.RECEIVE_MESSAGE", "message.sender.@type", listOf("Audience")) + } else { + builder.addCapabilityBinding("actions.intent.SEND_MESSAGE") + builder.addCapabilityBinding("actions.intent.RECEIVE_MESSAGE") + } return builder.build() } catch (e: NumberFormatException) { diff --git a/app/src/main/res/layout/dialog_delete_meeting.xml b/app/src/main/res/layout/dialog_delete_meeting.xml deleted file mode 100644 index c8d20e218..000000000 --- a/app/src/main/res/layout/dialog_delete_meeting.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file