From 5e8f848574d7cbb02b06b4e06912ece4da02260e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 5 Feb 2026 17:03:00 +0100 Subject: [PATCH] Code cleanup --- .../org/linphone/contacts/ContactLoader.kt | 4 +- .../java/org/linphone/core/CoreContext.kt | 18 +++--- .../java/org/linphone/ui/GenericViewModel.kt | 8 +-- .../viewmodel/AccountCreationViewModel.kt | 2 +- .../viewmodel/AccountLoginViewModel.kt | 6 +- .../ThirdPartySipAccountLoginViewModel.kt | 6 +- .../ui/call/adapter/CallsListAdapter.kt | 4 +- .../viewmodel/ConferenceViewModel.kt | 8 +-- .../ui/call/viewmodel/CallsViewModel.kt | 2 +- .../ui/call/viewmodel/CurrentCallViewModel.kt | 38 ++++++------ .../ui/fileviewer/viewmodel/FileViewModel.kt | 6 +- .../ui/fileviewer/viewmodel/MediaViewModel.kt | 4 +- ...ationsContactsAndSuggestionsListAdapter.kt | 2 +- .../chat/adapter/ConversationEventAdapter.kt | 6 +- .../chat/adapter/ConversationsListAdapter.kt | 4 +- .../chat/fragment/ConversationFragment.kt | 2 +- .../linphone/ui/main/chat/model/FileModel.kt | 2 +- .../ui/main/chat/model/MessageModel.kt | 2 +- .../AbstractConversationViewModel.kt | 4 +- .../ChatMessageLongPressViewModel.kt | 10 +-- .../ConversationDocumentsListViewModel.kt | 2 +- .../ConversationForwardMessageViewModel.kt | 2 +- .../viewmodel/ConversationInfoViewModel.kt | 10 +-- .../ConversationMediaListViewModel.kt | 2 +- .../chat/viewmodel/ConversationViewModel.kt | 20 +++--- .../SendMessageInConversationViewModel.kt | 10 +-- .../viewmodel/StartConversationViewModel.kt | 2 +- .../contacts/adapter/ContactsListAdapter.kt | 4 +- .../contacts/fragment/EditContactFragment.kt | 6 +- .../contacts/fragment/NewContactFragment.kt | 6 +- .../viewmodel/ContactNewOrEditViewModel.kt | 30 ++++++--- .../contacts/viewmodel/ContactViewModel.kt | 18 +++--- .../viewmodel/ContactsListViewModel.kt | 4 +- .../ui/main/fragment/EmptyFragment.kt | 2 +- .../ui/main/help/viewmodel/HelpViewModel.kt | 14 ++--- .../history/adapter/HistoryListAdapter.kt | 6 +- .../history/viewmodel/HistoryListViewModel.kt | 4 +- .../history/viewmodel/HistoryViewModel.kt | 8 +-- .../history/viewmodel/StartCallViewModel.kt | 12 ++-- .../meetings/adapter/MeetingsListAdapter.kt | 4 +- .../viewmodel/CancelMeetingViewModel.kt | 2 +- .../meetings/viewmodel/MeetingViewModel.kt | 2 +- .../viewmodel/MeetingWaitingRoomViewModel.kt | 6 +- .../viewmodel/ScheduleMeetingViewModel.kt | 2 +- .../adapter/RecordingsListAdapter.kt | 4 +- .../main/recordings/model/RecordingModel.kt | 2 +- .../viewmodel/RecordingsListViewModel.kt | 2 +- .../viewmodel/AccountProfileViewModel.kt | 2 +- .../settings/viewmodel/CardDavViewModel.kt | 4 +- .../main/settings/viewmodel/LdapViewModel.kt | 2 +- .../settings/viewmodel/SettingsViewModel.kt | 12 ++-- .../sso/viewmodel/SingleSignOnViewModel.kt | 4 +- .../main/viewmodel/AbstractMainViewModel.kt | 14 ++--- .../viewmodel/AddressSelectionViewModel.kt | 4 +- .../DefaultAccountChangedViewModel.kt | 2 +- .../ui/main/viewmodel/DrawerMenuViewModel.kt | 10 +-- .../ui/main/viewmodel/MainViewModel.kt | 16 ++--- .../ui/main/viewmodel/SharedMainViewModel.kt | 62 +++++++++---------- .../java/org/linphone/utils/TimestampUtils.kt | 2 +- app/src/main/res/drawable/shape_empty.xml | 4 -- .../drawable/shape_red_button_background.xml | 5 -- app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 2 - app/src/main/res/values-pl/strings.xml | 6 +- app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-sk/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values/strings.xml | 2 - 72 files changed, 236 insertions(+), 257 deletions(-) delete mode 100644 app/src/main/res/drawable/shape_empty.xml delete mode 100644 app/src/main/res/drawable/shape_red_button_background.xml diff --git a/app/src/main/java/org/linphone/contacts/ContactLoader.kt b/app/src/main/java/org/linphone/contacts/ContactLoader.kt index 75682a8a9..8fe983d47 100644 --- a/app/src/main/java/org/linphone/contacts/ContactLoader.kt +++ b/app/src/main/java/org/linphone/contacts/ContactLoader.kt @@ -63,8 +63,6 @@ class ContactLoader : LoaderManager.LoaderCallbacks { const val NATIVE_ADDRESS_BOOK_FRIEND_LIST = "Native address-book" const val LINPHONE_ADDRESS_BOOK_FRIEND_LIST = "Linphone address-book" - - private const val MIN_INTERVAL_TO_WAIT_BEFORE_REFRESH = 300000L // 5 minutes } private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob()) @@ -102,7 +100,7 @@ class ContactLoader : LoaderManager.LoaderCallbacks { // WARNING: this doesn't prevent to be called again in onLoadFinished, // it will only have for effect that the notified cursor will be the same as before // instead of a new one with updated content! - // loader.setUpdateThrottle(MIN_INTERVAL_TO_WAIT_BEFORE_REFRESH) + // loader.setUpdateThrottle(300000L) return loader } diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt index df1418e88..fc7b47aab 100644 --- a/app/src/main/java/org/linphone/core/CoreContext.kt +++ b/app/src/main/java/org/linphone/core/CoreContext.kt @@ -96,40 +96,40 @@ class CoreContext var isConnectedToAndroidAuto: Boolean = false val bearerAuthenticationRequestedEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val digestAuthenticationRequestedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val clearAuthenticationRequestDialogEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val refreshMicrophoneMuteStateEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showGreenToastEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val showRedToastEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val showFormattedRedToastEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val provisioningAppliedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var filesToExportToNativeMediaGallery = arrayListOf() val filesToExportToNativeMediaGalleryEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } private var keepAliveServiceStarted = false diff --git a/app/src/main/java/org/linphone/ui/GenericViewModel.kt b/app/src/main/java/org/linphone/ui/GenericViewModel.kt index b31e4ef38..33416de63 100644 --- a/app/src/main/java/org/linphone/ui/GenericViewModel.kt +++ b/app/src/main/java/org/linphone/ui/GenericViewModel.kt @@ -28,20 +28,20 @@ import org.linphone.utils.Event open class GenericViewModel : ViewModel() { // Message res id, icon val showGreenToastEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val showFormattedGreenToastEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } // Message res id, icon val showRedToastEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val showFormattedRedToastEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } fun showGreenToast(@StringRes message: Int, @DrawableRes icon: Int) { diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt index a2824578a..139145f21 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt @@ -105,7 +105,7 @@ class AccountCreationViewModel val accountCreatedEvent = MutableLiveData>() val accountRecoveryTokenReceivedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var waitingForFlexiApiPushToken = false diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt index e46f44142..18209d0bc 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt @@ -68,15 +68,15 @@ open class AccountLoginViewModel val registrationInProgress = MutableLiveData() val accountLoggedInEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val accountLoginErrorEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val skipLandingToThirdPartySipAccountEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } var conditionsAndPrivacyPolicyAccepted = false diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt index 1e0ffb9db..3b16100fc 100644 --- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt +++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt @@ -76,15 +76,15 @@ class ThirdPartySipAccountLoginViewModel val registrationInProgress = MutableLiveData() val accountLoggedInEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val accountLoginErrorEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val defaultTransportIndexEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val availableTransports = arrayListOf() diff --git a/app/src/main/java/org/linphone/ui/call/adapter/CallsListAdapter.kt b/app/src/main/java/org/linphone/ui/call/adapter/CallsListAdapter.kt index 40060638c..bd0d08654 100644 --- a/app/src/main/java/org/linphone/ui/call/adapter/CallsListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/call/adapter/CallsListAdapter.kt @@ -38,11 +38,11 @@ class CallsListAdapter : var selectedAdapterPosition = -1 val callClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val callLongClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt index 0551214a1..16cbe2ff6 100644 --- a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt @@ -83,19 +83,19 @@ class ConferenceViewModel val fullScreenMode = MutableLiveData() val firstParticipantOtherThanOurselvesJoinedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showLayoutMenuEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val removeParticipantEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val goToConversationEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private lateinit var conference: Conference diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt index f0480543c..cde233826 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt @@ -64,7 +64,7 @@ class CallsViewModel val callsTopBarStatus = MutableLiveData() val goToCallsListEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private val coreListener = object : CoreListenerStub() { diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt index b433ca978..35af7fb3e 100644 --- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt @@ -151,7 +151,7 @@ class CurrentCallViewModel } val incomingCallTitle: MutableLiveData by lazy { - MutableLiveData() + MutableLiveData() } val qualityValue = MutableLiveData() @@ -163,23 +163,23 @@ class CurrentCallViewModel var terminatedByUser = false val isRemoteRecordingEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val goToEndedCallEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val finishActivityEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val requestRecordAudioPermission: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val requestCameraPermission: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val proximitySensorEnabled = MutableLiveData() @@ -188,21 +188,21 @@ class CurrentCallViewModel val callDuration = MutableLiveData() val showAudioDevicesListEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } // ZRTP related val showZrtpSasDialogEvent: MutableLiveData>>> by lazy { - MutableLiveData>>>() + MutableLiveData() } val showZrtpSasCacheMismatchDialogEvent: MutableLiveData>>> by lazy { - MutableLiveData>>>() + MutableLiveData() } val zrtpAuthTokenVerifiedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } var isZrtpDialogVisible: Boolean = false @@ -217,7 +217,7 @@ class CurrentCallViewModel val operationInProgress = MutableLiveData() val goToConversationEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Conference @@ -225,39 +225,39 @@ class CurrentCallViewModel val conferenceModel = ConferenceViewModel() val goToConferenceEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val goToCallEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Extras actions val toggleExtraActionsBottomSheetEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showNumpadBottomSheetEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val transferInProgressEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val transferFailedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val numpadModel: NumpadModel val appendDigitToSearchBarEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val removedCharacterAtCurrentPositionEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Sliding answer/decline button 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 d44f965d1..288c556e0 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 @@ -72,15 +72,15 @@ class FileViewModel val isFromEphemeralMessage = MutableLiveData() val exportPlainTextFileEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val pdfRendererReadyEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val exportPdfEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Below are required for PDF viewer diff --git a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt index 9cbec6e52..5ab23b988 100644 --- a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt +++ b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt @@ -65,11 +65,11 @@ class MediaViewModel val position = MutableLiveData() val videoSizeChangedEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val changeFullScreenModeEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } lateinit var mediaPlayer: MediaPlayer 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 e8c79d2b0..628c6debd 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 @@ -53,7 +53,7 @@ class ConversationsContactsAndSuggestionsListAdapter : } val onClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } override fun displayHeaderForPosition(position: Int): Boolean { 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 c3d345d1b..830b18be1 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 @@ -60,15 +60,15 @@ class ConversationEventAdapter : val chatMessageLongPressEvent = MutableLiveData>() val showDeliveryForChatMessageModelEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showReactionForChatMessageModelEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val scrollToRepliedMessageEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var isConversationSecured: Boolean = false diff --git a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationsListAdapter.kt b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationsListAdapter.kt index b665924f7..42b713cea 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationsListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationsListAdapter.kt @@ -41,11 +41,11 @@ class ConversationsListAdapter : ListAdapter> by lazy { - MutableLiveData>() + MutableLiveData() } val conversationLongClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt index 08441843f..544b46ade 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt @@ -886,7 +886,7 @@ open class ConversationFragment : SlidingPaneChildFragment() { "$TAG Scrolling to message/event at position [$position], " + "display show events between positions [$firstDisplayedItemPosition] and [$lastDisplayedItemPosition]" ) - if (firstDisplayedItemPosition > position && position > 0) { + if (position in 1.. 100) { + if (percent !in 0..100) { transferProgressLabel.postValue("") } else { transferProgressLabel.postValue("$percent%") diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt index cb61500fe..97bcd1bf5 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt @@ -191,7 +191,7 @@ class MessageModel val formattedVoiceRecordingDuration = MutableLiveData() val dismissLongPressMenuEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } var isTextHighlighted = false diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/AbstractConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/AbstractConversationViewModel.kt index fb1d6ee41..b3fce51af 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/AbstractConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/AbstractConversationViewModel.kt @@ -42,11 +42,11 @@ abstract class AbstractConversationViewModel : GenericViewModel() { } val chatRoomFoundEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val confirmGroupCallEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } lateinit var chatRoom: ChatRoom diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt index 944579ac5..d7abda685 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt @@ -59,23 +59,23 @@ class ChatMessageLongPressViewModel : GenericViewModel() { val hasBeenRetracted = MutableLiveData() val showImdnInfoEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val editMessageEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val replyToMessageEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val forwardMessageEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val deleteMessageEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val onDismissedEvent = MutableLiveData>() diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt index 7d85805ee..5e5ae19a1 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt @@ -44,7 +44,7 @@ class ConversationDocumentsListViewModel val operationInProgress = MutableLiveData() val openDocumentEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var totalDocumentsCount: Int = -1 diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt index bec36d2be..fe181a3e4 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt @@ -48,7 +48,7 @@ class ConversationForwardMessageViewModel val operationInProgress = MutableLiveData() val chatRoomCreatedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private val chatRoomListener = object : ChatRoomListenerStub() { diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt index ee5f4cfbc..7cd0d0d40 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt @@ -85,23 +85,23 @@ class ConversationInfoViewModel val disableAddContact = MutableLiveData() val groupLeftEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val historyDeletedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val infoChangedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showParticipantAdminPopupMenuEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val goToScheduleMeetingEvent: MutableLiveData>>> by lazy { - MutableLiveData>>>() + MutableLiveData() } private val chatRoomListener = object : ChatRoomListenerStub() { diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt index f9b211f0e..a7f728062 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt @@ -44,7 +44,7 @@ class ConversationMediaListViewModel val operationInProgress = MutableLiveData() val openMediaEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var totalMediaCount: Int = -1 diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt index 616c84937..2833c000d 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt @@ -107,43 +107,43 @@ class ConversationViewModel val unreadMessagesCount = MutableLiveData() val focusSearchBarEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val fileToDisplayEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val sipUriToCallEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val conferenceToJoinEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val openWebBrowserEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val contactToDisplayEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val messageDeletedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val updateEvents: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val forwardMessageEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val voiceRecordPlaybackEndedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } var eventsList = arrayListOf() diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt index 4859fb40a..329cfd3bc 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt @@ -120,23 +120,23 @@ class SendMessageInConversationViewModel } val requestKeyboardHidingEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val emojiToAddEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val participantUsernameToAddEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val askRecordAudioPermissionEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val messageSentEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } lateinit var chatRoom: ChatRoom diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt index 2a428d532..42cddc41d 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt @@ -53,7 +53,7 @@ class StartConversationViewModel val operationInProgress = MutableLiveData() val chatRoomCreatedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private val chatRoomListener = object : ChatRoomListenerStub() { diff --git a/app/src/main/java/org/linphone/ui/main/contacts/adapter/ContactsListAdapter.kt b/app/src/main/java/org/linphone/ui/main/contacts/adapter/ContactsListAdapter.kt index f27a6ae53..fce8ee735 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/adapter/ContactsListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/adapter/ContactsListAdapter.kt @@ -41,11 +41,11 @@ class ContactsListAdapter( var selectedAdapterPosition = -1 val contactClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val contactLongClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt index df4edcfc3..5391204b2 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt @@ -64,7 +64,7 @@ class EditContactFragment : SlidingPaneChildFragment() { private val backPressedCallback = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { - showAbortConfirmationDialog() + showAbortConfirmationDialogIfPendingChanges() } } @@ -121,7 +121,7 @@ class EditContactFragment : SlidingPaneChildFragment() { viewModel.findFriendByRefKey(refKey) binding.setBackClickListener { - showAbortConfirmationDialog() + showAbortConfirmationDialogIfPendingChanges() } binding.setPickImageClickListener { @@ -215,7 +215,7 @@ class EditContactFragment : SlidingPaneChildFragment() { pickMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)) } - private fun showAbortConfirmationDialog() { + private fun showAbortConfirmationDialogIfPendingChanges() { if (!viewModel.isPendingChanges()) { Log.i("$TAG No changes detected, do not show confirmation dialog") backPressedCallback.isEnabled = false diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt index 9209816b2..56900ac48 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt @@ -61,7 +61,7 @@ class NewContactFragment : GenericMainFragment() { private val backPressedCallback = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { - showAbortConfirmationDialogIfNeededOrGoBack() + showAbortConfirmationDialogIfPendingChanges() } } @@ -126,7 +126,7 @@ class NewContactFragment : GenericMainFragment() { viewModel.findFriendByRefKey("") binding.setBackClickListener { - showAbortConfirmationDialogIfNeededOrGoBack() + showAbortConfirmationDialogIfPendingChanges() } binding.setPickImageClickListener { @@ -217,7 +217,7 @@ class NewContactFragment : GenericMainFragment() { pickMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)) } - private fun showAbortConfirmationDialogIfNeededOrGoBack() { + private fun showAbortConfirmationDialogIfPendingChanges() { if (!viewModel.isPendingChanges()) { Log.i("$TAG No changes detected, do not show confirmation dialog") backPressedCallback.isEnabled = false diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt index 11284139c..fe35eb3dc 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt @@ -76,7 +76,7 @@ class ContactNewOrEditViewModel val jobTitle = MutableLiveData() val saveChangesEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val friendFoundEvent = MutableLiveData>() @@ -85,6 +85,12 @@ class ContactNewOrEditViewModel val removeNewNumberOrAddressFieldEvent = MutableLiveData>() + private val sipAddressesBeforeEdit = arrayListOf() + + private val phoneNumbersBeforeEdit = arrayListOf() + + private val sipAddressesLinkedToPresence = arrayListOf() + init { hideSipAddresses.postValue(corePreferences.hideSipAddresses) } @@ -119,10 +125,14 @@ class ContactNewOrEditViewModel // Prevents showing presence address as editable when in fact it's not if (!LinphoneUtils.isSipAddressLinkedToPhoneNumberByPresence(friend, sipAddress)) { addSipAddress(sipAddress) + sipAddressesBeforeEdit.add(sipAddress) + } else { + sipAddressesLinkedToPresence.add(sipAddress) } } for (number in friend.phoneNumbersWithLabel) { + phoneNumbersBeforeEdit.add(number.phoneNumber) addPhoneNumber(number.phoneNumber, number.label) } @@ -335,20 +345,23 @@ class ContactNewOrEditViewModel phoneNumbers.clear() company.value = "" jobTitle.value = "" + sipAddressesBeforeEdit.clear() + phoneNumbersBeforeEdit.clear() + sipAddressesLinkedToPresence.clear() } @UiThread fun isPendingChanges(): Boolean { if (isEdit.value == true) { + Log.i("$TAG Contact is being edited, checking if at least one field has changed") if (firstName.value.orEmpty() != friend.firstName.orEmpty()) return true if (lastName.value.orEmpty() != friend.lastName.orEmpty()) return true if (picturePath.value.orEmpty() != friend.photo.orEmpty()) return true if (company.value.orEmpty() != friend.organization.orEmpty()) return true if (jobTitle.value.orEmpty() != friend.jobTitle.orEmpty()) return true - for (address in friend.addresses) { - val sipAddress = address.asStringUriOnly() - if (LinphoneUtils.isSipAddressLinkedToPhoneNumberByPresence(friend, sipAddress)) continue + for (sipAddress in sipAddressesBeforeEdit) { + if (sipAddressesLinkedToPresence.contains(sipAddress)) continue val found = sipAddresses.find { it.isSip && it.value.value.orEmpty() == sipAddress @@ -359,12 +372,12 @@ class ContactNewOrEditViewModel val sipAddress = address.value.value.orEmpty() if (sipAddress.isEmpty()) continue - val found = friend.addresses.find { - it.asStringUriOnly() == sipAddress + val found = sipAddressesBeforeEdit.find { + it == sipAddress } if (found == null) return true } - for (number in friend.phoneNumbers) { + for (number in phoneNumbersBeforeEdit) { val found = phoneNumbers.find { !it.isSip && it.value.value.orEmpty() == number } @@ -373,7 +386,7 @@ class ContactNewOrEditViewModel for (number in phoneNumbers) { if (number.value.value.orEmpty().isEmpty()) continue - val found = friend.phoneNumbers.find { + val found = phoneNumbersBeforeEdit.find { it == number.value.value.orEmpty() } if (found == null) return true @@ -382,6 +395,7 @@ class ContactNewOrEditViewModel return false } + Log.i("$TAG Checking if at least a field of the new contact form has been filled") return !picturePath.value.isNullOrEmpty() || !firstName.value.isNullOrEmpty() || !lastName.value.isNullOrEmpty() || diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt index c53e46fe4..2aab2ea51 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt @@ -102,39 +102,39 @@ class ContactViewModel val operationInProgress = MutableLiveData() val showLongPressMenuForNumberOrAddressEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showNumberOrAddressPickerDialogEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val openNativeContactEditor: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val openLinphoneContactEditor: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val goToConversationEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val vCardTerminatedEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val displayTrustProcessDialogEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val startCallToDeviceToIncreaseTrustEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val contactRemovedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var expectedAction: Int = START_AUDIO_CALL diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt index 0e6004bb5..3f23c1552 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt @@ -74,11 +74,11 @@ class ContactsListViewModel val disableAddContact = MutableLiveData() val vCardTerminatedEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val cardDavSynchronizationCompletedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var previousFilter = "NotSet" diff --git a/app/src/main/java/org/linphone/ui/main/fragment/EmptyFragment.kt b/app/src/main/java/org/linphone/ui/main/fragment/EmptyFragment.kt index bc2d19536..9a4ddf861 100644 --- a/app/src/main/java/org/linphone/ui/main/fragment/EmptyFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/fragment/EmptyFragment.kt @@ -35,7 +35,7 @@ import org.linphone.utils.Event class EmptyFragment : GenericFragment() { private lateinit var binding: EmptyFragmentBinding - protected lateinit var sharedViewModel: SharedMainViewModel + private lateinit var sharedViewModel: SharedMainViewModel override fun onCreateView( inflater: LayoutInflater, diff --git a/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt b/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt index 9c4d050ed..c58e4cfa1 100644 --- a/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt @@ -64,31 +64,31 @@ class HelpViewModel val canConfigFileBeViewed = MutableLiveData() val newVersionAvailableEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val versionUpToDateEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val errorEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val debugLogsCleanedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val uploadDebugLogsFinishedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val uploadDebugLogsErrorEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showConfigFileEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var versionClickCount: Int = 0 diff --git a/app/src/main/java/org/linphone/ui/main/history/adapter/HistoryListAdapter.kt b/app/src/main/java/org/linphone/ui/main/history/adapter/HistoryListAdapter.kt index 7b733e087..b42282ab4 100644 --- a/app/src/main/java/org/linphone/ui/main/history/adapter/HistoryListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/history/adapter/HistoryListAdapter.kt @@ -37,15 +37,15 @@ class HistoryListAdapter : ListAdapter(Ca var selectedAdapterPosition = -1 val callLogClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val callLogLongClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val callLogCallBackClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt index 422996ffd..dc8151cab 100644 --- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt @@ -47,11 +47,11 @@ class HistoryListViewModel val fetchInProgress = MutableLiveData() val historyInsertedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val historyDeletedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private val coreListener = object : CoreListenerStub() { diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt index 2da405721..ed81b343d 100644 --- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt @@ -68,19 +68,19 @@ class HistoryViewModel val callLogFoundEvent = MutableLiveData>() val goToMeetingConversationEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val goToConversationEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val conferenceToJoinEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val historyDeletedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private lateinit var address: Address diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt index 817b9f3ba..787bae29f 100644 --- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt @@ -62,27 +62,27 @@ class StartCallViewModel val operationInProgress = MutableLiveData() val appendDigitToSearchBarEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val removedCharacterAtCurrentPositionEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val clearSearchBarEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val requestKeyboardVisibilityChangedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val leaveFragmentEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val initiateBlindTransferEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } private val conferenceListener = object : ConferenceListenerStub() { diff --git a/app/src/main/java/org/linphone/ui/main/meetings/adapter/MeetingsListAdapter.kt b/app/src/main/java/org/linphone/ui/main/meetings/adapter/MeetingsListAdapter.kt index f067bc53e..691c3570b 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/adapter/MeetingsListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/adapter/MeetingsListAdapter.kt @@ -52,11 +52,11 @@ class MeetingsListAdapter : var selectedAdapterPosition = -1 val meetingClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val meetingLongClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } override fun displayHeaderForPosition(position: Int): Boolean { diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/CancelMeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/CancelMeetingViewModel.kt index 57594aa11..ae4b5c5fb 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/CancelMeetingViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/CancelMeetingViewModel.kt @@ -42,7 +42,7 @@ open class CancelMeetingViewModel val operationInProgress = MutableLiveData() val conferenceCancelledEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var sendNotificationForCancelledConference: Boolean = false diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt index 799ed3855..2c889a619 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingViewModel.kt @@ -70,7 +70,7 @@ class MeetingViewModel val endTimeStamp = MutableLiveData() val conferenceInfoDeletedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private lateinit var conferenceInfo: ConferenceInfo diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt index 169191702..045547222 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt @@ -79,15 +79,15 @@ class MeetingWaitingRoomViewModel val conferenceInfoFoundEvent = MutableLiveData>() val showAudioDevicesListEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val leaveWaitingRoomEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val conferenceCreationError: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private lateinit var conferenceAddress: Address diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt index 50f2655df..6c749a6ff 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt @@ -83,7 +83,7 @@ class ScheduleMeetingViewModel val chatDisabled = MutableLiveData() val conferenceCreatedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var startTimestamp = 0L diff --git a/app/src/main/java/org/linphone/ui/main/recordings/adapter/RecordingsListAdapter.kt b/app/src/main/java/org/linphone/ui/main/recordings/adapter/RecordingsListAdapter.kt index bd3d5a208..ac89af58d 100644 --- a/app/src/main/java/org/linphone/ui/main/recordings/adapter/RecordingsListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/recordings/adapter/RecordingsListAdapter.kt @@ -45,11 +45,11 @@ class RecordingsListAdapter : var selectedAdapterPosition = -1 val recordingClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val recordingLongClickedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } override fun displayHeaderForPosition(position: Int): Boolean { diff --git a/app/src/main/java/org/linphone/ui/main/recordings/model/RecordingModel.kt b/app/src/main/java/org/linphone/ui/main/recordings/model/RecordingModel.kt index 4cc1500d4..25d1bae34 100644 --- a/app/src/main/java/org/linphone/ui/main/recordings/model/RecordingModel.kt +++ b/app/src/main/java/org/linphone/ui/main/recordings/model/RecordingModel.kt @@ -83,7 +83,7 @@ class RecordingModel val indexOfSeparator = withoutHeader.indexOf( LinphoneUtils.RECORDING_FILE_NAME_URI_TIMESTAMP_SEPARATOR ) - sipUri = withoutHeader.substring(0, indexOfSeparator) + sipUri = withoutHeader.take(indexOfSeparator) val sipAddress = Factory.instance().createAddress(sipUri) displayName = if (sipAddress != null) { val contact = coreContext.contactsManager.findContactByAddress(sipAddress) diff --git a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt index 31373d065..aba9bd0a6 100644 --- a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingsListViewModel.kt @@ -49,7 +49,7 @@ class RecordingsListViewModel val fetchInProgress = MutableLiveData() val focusSearchBarEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } init { diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt index cf09fa180..72c55e5bf 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt @@ -89,7 +89,7 @@ class AccountProfileViewModel val showDeviceId = MutableLiveData() val accountRemovedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private lateinit var account: Account diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt index 8f93a81f4..6e3d64b8f 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt @@ -64,11 +64,11 @@ class CardDavViewModel var pendingAuthInfo: AuthInfo? = null val syncSuccessfulEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val friendListRemovedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private lateinit var friendList: FriendList diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt index 7e03643f2..8478321a9 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt @@ -68,7 +68,7 @@ class LdapViewModel : GenericViewModel() { val verboseMode = MutableLiveData() val ldapServerOperationSuccessfulEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private lateinit var ldapToEdit: Ldap diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt index 57c8d3baa..b7a43fbd3 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt @@ -66,11 +66,11 @@ class SettingsViewModel val isTunnelAvailable = MutableLiveData() val recreateActivityEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val keepAliveServiceSettingChangedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Security settings @@ -124,18 +124,18 @@ class SettingsViewModel val presenceSubscribe = MutableLiveData() val addLdapServerEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val editLdapServerEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val addCardDavServerEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val editCardDavServerEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Meetings settings diff --git a/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt b/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt index 80e468920..a6cf36d93 100644 --- a/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt @@ -61,11 +61,11 @@ class SingleSignOnViewModel private var username: String = "" val startAuthIntentEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val onErrorEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private lateinit var authState: AuthState diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt index 0e0cba03d..bf509514b 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt @@ -73,31 +73,31 @@ open class AbstractMainViewModel val moreThanOneAccount = MutableLiveData() val focusSearchBarEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val openDrawerMenuEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val navigateToHistoryEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val navigateToContactsEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val navigateToConversationsEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val navigateToMeetingsEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val defaultAccountChangedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } protected var currentFilter = "" diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt index aaad25322..0899f086c 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt @@ -71,11 +71,11 @@ abstract class AddressSelectionViewModel val showResultsLimitReached = MutableLiveData() val showNumberOrAddressPickerDialogEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val dismissNumberOrAddressPickerDialogEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } protected var magicSearchSourceFlags = MagicSearch.Source.All.toInt() diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/DefaultAccountChangedViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/DefaultAccountChangedViewModel.kt index 9862d7139..cccc5ca33 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/DefaultAccountChangedViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/DefaultAccountChangedViewModel.kt @@ -36,7 +36,7 @@ open class DefaultAccountChangedViewModel : GenericViewModel() { } val defaultAccountChangedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private val coreListener = object : CoreListenerStub() { diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt index eb01e13f6..27620dfad 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt @@ -55,23 +55,23 @@ class DrawerMenuViewModel val hideQuitButton = MutableLiveData() val startAssistantEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val closeDrawerEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showAccountPopupMenuEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } val defaultAccountChangedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val openLinkInBrowserEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private val coreListener = object : CoreListenerStub() { diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt index 1891ba0cf..fab860072 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt @@ -83,35 +83,35 @@ class MainViewModel val filesOrTextPendingSharingLabel = MutableLiveData() val goBackToCallEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val openDrawerEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val askPostNotificationsPermissionEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val askFullScreenIntentPermissionEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showNewAccountToastEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val startLoadingContactsEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val lastAccountRemovedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val clearFilesOrTextPendingSharingEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } private var accountsFound = -1 diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt index 952a0b45b..c035463b2 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt @@ -39,27 +39,27 @@ class SharedMainViewModel val isSlidingPaneSlideable = MutableLiveData() val closeSlidingPaneEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val openSlidingPaneEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val navigateToHistoryEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val navigateToContactsEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val navigateToConversationsEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val navigateToMeetingsEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } var currentlyDisplayedFragment = MutableLiveData() @@ -67,40 +67,40 @@ class SharedMainViewModel // Top bar related val searchFilter: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val refreshDrawerMenuAccountsListEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val refreshDrawerMenuQuitButtonEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val forceUpdateAvailableNavigationItems: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Account Profile related val goToAccountProfileEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Contacts related var displayedFriend: Friend? = null // Prevents the need to go look for the friend val showContactEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val showNewContactEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val forceRefreshContactsList: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } var sipAddressToAddToNewContact: String = "" @@ -108,11 +108,11 @@ class SharedMainViewModel // Call logs related val forceRefreshCallLogsListEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val resetMissedCallsCountEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Conversation related @@ -122,48 +122,48 @@ class SharedMainViewModel val filesToShareFromIntent = MutableLiveData>() val messageToForwardEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } var displayedChatRoom: ChatRoom? = null // Prevents the need to go look for the chat room val showConversationEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val hideConversationEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // When using keyboard to share gif or other, see RichContentReceiver & RichEditText classes val richContentUri = MutableLiveData>() val displayFileEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val forceRefreshDisplayedConversationEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val forceRefreshConversationInfoEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val forceRefreshConversationEvents: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val newChatMessageEphemeralLifetimeToSetEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val updateConversationLastMessageEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val updateUnreadMessageCountForCurrentConversationEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } // Meetings related @@ -171,19 +171,19 @@ class SharedMainViewModel var displayedMeeting: ConferenceInfo? = null // Prevents the need to go look for the conference info val meetingEditedEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val forceRefreshMeetingsListEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val goToMeetingWaitingRoomEvent: MutableLiveData> by lazy { - MutableLiveData>() + MutableLiveData() } val goToScheduleMeetingEvent: MutableLiveData>>> by lazy { - MutableLiveData>>>() + MutableLiveData() } // Recordings related @@ -195,6 +195,6 @@ class SharedMainViewModel val mediaViewerFullScreenMode = MutableLiveData() val listOfSelectedSipUrisEvent: MutableLiveData>> by lazy { - MutableLiveData>>() + MutableLiveData() } } diff --git a/app/src/main/java/org/linphone/utils/TimestampUtils.kt b/app/src/main/java/org/linphone/utils/TimestampUtils.kt index 098300030..d0736c6f0 100644 --- a/app/src/main/java/org/linphone/utils/TimestampUtils.kt +++ b/app/src/main/java/org/linphone/utils/TimestampUtils.kt @@ -84,7 +84,7 @@ class TimestampUtils { it.toString() } } ?: "?" - val shorten = upperCased.substring(0, 3) + val shorten = upperCased.take(3) return "$shorten." } diff --git a/app/src/main/res/drawable/shape_empty.xml b/app/src/main/res/drawable/shape_empty.xml deleted file mode 100644 index c3783b5ab..000000000 --- a/app/src/main/res/drawable/shape_empty.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_red_button_background.xml b/app/src/main/res/drawable/shape_red_button_background.xml deleted file mode 100644 index e94a9096f..000000000 --- a/app/src/main/res/drawable/shape_red_button_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6bcbe31f6..50a6393f2 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -74,8 +74,6 @@ Úroveň bezpečnosti byla snížena kvůli %s Maximální počet účastníků byl překročen o %s Klepnutím přidat další účastníky - Smazat schůzku? - Přejete si smazat schůzku? Je vyžadováno ověření Ztracené pakety: %s SAS algoritmus: %s diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cda1bedf2..3770791fc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -819,8 +819,6 @@ Sicherheitsstufe verringert wegen %s Maximale Teilnehmerzahl um %s überschritten Besprechung absagen - Besprechung löschen? - Möchten Sie die Besprechung löschen? Passwort vergessen Sie haben Ihren Account erstellt mit: Benachrichtigungen scheinen auf Ihrem Gerät nicht verfügbar zu sein, sind allerdings nötig um einen Account in der App zu erstellen.\n\nWir laden Sie ein, stattdessen einen Account auf unserer Webplattform zu erstellen: diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 660c1f940..527a72232 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -658,8 +658,6 @@ La réunion va être annulée Voulez-vous envoyer une notification aux participants ? Annuler la réunion - Supprimer la réunion ? - Voulez-vous supprimer la réunion ? Supprimer la réunion Réunion créée Réunion mise à jour diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f9490061f..2967ea235 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -771,8 +771,6 @@ Beschrijving Vergadering bewerken Vergadering annuleren - Vergadering verwijderen? - Wil je de vergadering verwijderen? Vergadering verwijderen Vergadering is aangemaakt Vergadering is bijgewerkt diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index eeb7cefbb..3547b7843 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -18,13 +18,11 @@ Wczoraj %s dzień - %s dni %s dni %s wybrany - %s wybranych %s wybranych @@ -55,13 +53,11 @@ Trwa przesyłanie plików %s plik jest przesyłany - %s plików jest przesyłanych %s plików jest przesyłanych %s plik jest pobierany - %s plików jest pobieranych %s plików jest pobieranych @@ -107,7 +103,7 @@ Załóż konto, podając swój adres e-mail na stronie: Masz już konto? Transport - Niektóre funkcje wymagają konta &appName;, np. wiadomości grupowe, wideokonferencje...\n\nFunkcje te są ukryte, gdy rejestrujesz się za pomocą konta SIP innej firmy.\n\nAby włączyć je w projekcie komercyjnym, skontaktuj się z nami. + Niektóre funkcje wymagają konta &appName;, np. wiadomości grupowe, wideokonferencje…\n\nFunkcje te są ukryte, gdy rejestrujesz się za pomocą konta SIP innej firmy.\n\nAby włączyć je w projekcie komercyjnym, skontaktuj się z nami. Wolę utworzyć konto &appName; Zrozumiałem Powiadomienia push nie wydają się być dostępne na Twoim urządzeniu, ale są one obowiązkowe do utworzenia konta w aplikacji mobilnej.\n\nZapraszamy do utworzenia konta na naszej platformie internetowej: diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 08fd09922..95dcb2146 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -504,8 +504,6 @@ Descrição Editar reunião Cancelar reunião - Excluir a reunião? - Você quer excluir a reunião? Excluir reunião A reunião foi criada A reunião foi atualizada diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a2acfa599..9a210b0c0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -486,8 +486,6 @@ Описание Редактировать встречу Отменить встречу - Удалить встречу? - Вы хотите удалить встречу? Удалить встречу Встреча была обновлена Встреча отменена diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 3ea66d5de..f2c0a0f1a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -566,8 +566,6 @@ Popis Upraviť schôdzku Zrušiť schôdzku - Vymazať schôdzku? - Želáte si vymazať schôdzku? Vymazať schôdzku Schôdzka bola aktualizovaná Schôdzka bola zrušená diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 1d4836840..d06575b00 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -599,8 +599,6 @@ Опис Редагувати нараду Скасувати нараду - Видалити нараду? - Ви хочете видалити нараду? Видалити нараду Нараду створено Нараду оновлено diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a89f8f33e..d8b34f69f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -531,8 +531,6 @@ 描述 编辑会议 取消会议 - 删除会议？ - 您想删除会议吗？ 删除会议 会议已创建 会议已更新 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df6469ca9..205559593 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -701,8 +701,6 @@ Meeting will be cancelled Do you want to send a notification to all participants? Cancel meeting - Delete the meeting? - Do you want to delete the meeting? Delete meeting Meeting has been created Meeting has been updated