From b3c31d14adf66af20f686857ea41dee0c6c79efb Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 18 Mar 2024 15:14:23 +0100 Subject: [PATCH] Use default string from resources if a contact's device has no name, updated TODOs & FIXMEs comments --- app/src/main/java/org/linphone/core/CorePreferences.kt | 6 +++--- app/src/main/java/org/linphone/telecom/TelecomManager.kt | 4 ++-- .../java/org/linphone/ui/call/model/ConferenceModel.kt | 2 +- .../ui/main/chat/viewmodel/StartConversationViewModel.kt | 8 ++++---- .../main/contacts/viewmodel/ContactNewOrEditViewModel.kt | 8 ++++---- .../ui/main/contacts/viewmodel/ContactViewModel.kt | 9 +++++---- .../ui/main/history/viewmodel/ContactHistoryViewModel.kt | 4 ++-- .../main/meetings/viewmodel/ScheduleMeetingViewModel.kt | 4 ++-- .../fragment/CardDavAddressBookConfigurationFragment.kt | 2 +- .../main/settings/viewmodel/AccountProfileViewModel.kt | 2 +- .../ui/main/settings/viewmodel/CardDavViewModel.kt | 4 ++-- .../linphone/ui/main/settings/viewmodel/LdapViewModel.kt | 2 +- .../java/org/linphone/ui/main/viewmodel/MainViewModel.kt | 2 +- app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 15 files changed, 31 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt index 209fca3af..43c6ae520 100644 --- a/app/src/main/java/org/linphone/core/CorePreferences.kt +++ b/app/src/main/java/org/linphone/core/CorePreferences.kt @@ -131,7 +131,7 @@ class CorePreferences @UiThread constructor(private val context: Context) { get() = config.getBool("ui", "dark_mode_allowed", true) @get:WorkerThread - val onlyDisplaySipUriUsername: Boolean // TODO: use it + val onlyDisplaySipUriUsername: Boolean // TODO FIXME: use it get() = config.getBool("ui", "only_display_sip_uri_username", true) @get:WorkerThread @@ -144,11 +144,11 @@ class CorePreferences @UiThread constructor(private val context: Context) { @get:WorkerThread val disableBroadcasts: Boolean - get() = config.getBool("ui", "disable_broadcast_feature", true) // TODO: not implemented + get() = config.getBool("ui", "disable_broadcast_feature", true) // TODO FIXME: not implemented yet @get:WorkerThread val disableCallRecordings: Boolean - get() = config.getBool("ui", "disable_call_recordings_feature", true) // TODO: not implemented + get() = config.getBool("ui", "disable_call_recordings_feature", true) // TODO FIXME: not implemented yet @get:WorkerThread val oneAccountMax: Boolean diff --git a/app/src/main/java/org/linphone/telecom/TelecomManager.kt b/app/src/main/java/org/linphone/telecom/TelecomManager.kt index d87f6765f..2f790afd0 100644 --- a/app/src/main/java/org/linphone/telecom/TelecomManager.kt +++ b/app/src/main/java/org/linphone/telecom/TelecomManager.kt @@ -96,7 +96,7 @@ class TelecomManager @WorkerThread constructor(context: Context) { coreContext.postOnCoreThread { if (LinphoneUtils.isCallIncoming(call.state)) { Log.i("$TAG Answering call") - coreContext.answerCall(call) // TODO: use call type + coreContext.answerCall(call) // TODO FIXME: use call type } } }, @@ -108,7 +108,7 @@ class TelecomManager @WorkerThread constructor(context: Context) { Log.i( "$TAG Terminating call [${call.remoteAddress.asStringUriOnly()}]" ) - call.terminate() // TODO: use cause + call.terminate() // TODO FIXME: use cause } }, { // onSetActive diff --git a/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt b/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt index c1c99b100..8449e641c 100644 --- a/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt +++ b/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt @@ -546,7 +546,7 @@ class ConferenceModel { "$TAG Too many participant devices for grid layout, switching to active speaker layout" ) setNewLayout(ACTIVE_SPEAKER_LAYOUT) - // TODO FIXME: notify user + // TODO: notify user } } } 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 1d70350b1..dbab74da1 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 @@ -81,7 +81,7 @@ class StartConversationViewModel @UiThread constructor() : AddressSelectionViewM Log.e("$TAG Conversation [$id] creation has failed!") chatRoom.removeListener(this) operationInProgress.postValue(false) - chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO FIXME: use translated string + chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO: use translated string } } } @@ -165,7 +165,7 @@ class StartConversationViewModel @UiThread constructor() : AddressSelectionViewM } else { Log.e("$TAG Failed to create group conversation [$groupChatRoomSubject]!") operationInProgress.postValue(false) - chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO FIXME: use translated string + chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO: use translated string } } } @@ -212,7 +212,7 @@ class StartConversationViewModel @UiThread constructor() : AddressSelectionViewM "$TAG Account is in secure mode, can't chat with SIP address of different domain [${remote.asStringUriOnly()}]" ) operationInProgress.postValue(false) - chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO FIXME: use translated string + chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO: use translated string return } @@ -258,7 +258,7 @@ class StartConversationViewModel @UiThread constructor() : AddressSelectionViewM } else { Log.e("$TAG Failed to create 1-1 conversation with [${remote.asStringUriOnly()}]!") operationInProgress.postValue(false) - chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO FIXME: use translated string + chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO: use translated string } } else { Log.w( 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 25abd1c53..7a305864e 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 @@ -94,7 +94,7 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() { firstName.postValue(vCard.givenName) lastName.postValue(vCard.familyName) } else { - // TODO ? What to do when vCard is null + // TODO: What to do if vCard is null? } id.postValue(friend.refKey ?: friend.vcard?.uid) @@ -137,7 +137,7 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() { val organization = company.value.orEmpty().trim() if (fn.isEmpty() && ln.isEmpty() && organization.isEmpty()) { Log.e("$TAG At least a mandatory field wasn't filled, aborting save") - // TODO FIXME: notify user + // TODO: notify user return } @@ -224,7 +224,7 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() { ) } else { Log.e("$TAG Failed to generate a ref key using vCard's generateUniqueId()") - // TODO? : generate unique ref key + // TODO: generate unique ref key? } friend.isSubscribesEnabled = false @@ -313,7 +313,7 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() { @UiThread fun isPendingChanges(): Boolean { if (isEdit.value == true) { - // TODO: check if values of each field match friend values + // TODO FIXME: check if values of each field match friend values return true } 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 446015ee8..4010de674 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 @@ -209,7 +209,7 @@ class ContactViewModel @UiThread constructor() : ViewModel() { Log.e("$TAG Conversation [$id] creation has failed!") chatRoom.removeListener(this) operationInProgress.postValue(false) - chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO FIXME: use translated string + chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO: use translated string } } } @@ -603,7 +603,7 @@ class ContactViewModel @UiThread constructor() : ViewModel() { "$TAG Failed to create 1-1 conversation with [${remote.asStringUriOnly()}]!" ) operationInProgress.postValue(false) - chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO FIXME: use translated string + chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO: use translated string } } } @@ -623,11 +623,12 @@ class ContactViewModel @UiThread constructor() : ViewModel() { val trusted = device.securityLevel == SecurityLevel.EndToEndEncryptedAndVerified devicesList.add( ContactDeviceModel( - device.displayName ?: "???", // TODO: what to do if device name isn't available? + device.displayName ?: AppUtils.getString( + R.string.contact_device_without_name + ), device.address, trusted ) { - // TODO: check if do not show dialog anymore setting is set if (::friend.isInitialized) { startCallToDeviceToIncreaseTrustEvent.value = Event(Pair(friend.name.orEmpty(), it.address.asStringUriOnly())) diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/ContactHistoryViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/ContactHistoryViewModel.kt index 0acf0eb01..5d7e8c051 100644 --- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/ContactHistoryViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/ContactHistoryViewModel.kt @@ -82,7 +82,7 @@ class ContactHistoryViewModel @UiThread constructor() : ViewModel() { Log.e("$TAG Conversation [$id] creation has failed!") chatRoom.removeListener(this) operationInProgress.postValue(false) - chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO FIXME: use translated string + chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO: use translated string } } } @@ -254,7 +254,7 @@ class ContactHistoryViewModel @UiThread constructor() : ViewModel() { "$TAG Failed to create 1-1 conversation with [${remote.asStringUriOnly()}]!" ) operationInProgress.postValue(false) - chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO FIXME: use translated string + chatRoomCreationErrorEvent.postValue(Event("Error!")) // TODO: use translated string } } } 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 027b04c3d..0f73a2e97 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 @@ -233,7 +233,7 @@ class ScheduleMeetingViewModel @UiThread constructor() : ViewModel() { subject.postValue(conferenceInfo.subject) description.postValue(conferenceInfo.description) - isBroadcastSelected.postValue(false) // TODO FIXME + isBroadcastSelected.postValue(false) // TODO FIXME: not implemented yet startHour = 0 startMinutes = 0 @@ -365,7 +365,7 @@ class ScheduleMeetingViewModel @UiThread constructor() : ViewModel() { } } - // TODO FIXME handle speakers when in broadcast mode + // TODO FIXME: handle speakers when in broadcast mode @UiThread fun schedule() { diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/CardDavAddressBookConfigurationFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/CardDavAddressBookConfigurationFragment.kt index 052c66ad4..8fd402b00 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/fragment/CardDavAddressBookConfigurationFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/CardDavAddressBookConfigurationFragment.kt @@ -57,7 +57,7 @@ class CardDavAddressBookConfigurationFragment : GenericFragment() { viewModel.cardDavOperationSuccessfulEvent.observe(viewLifecycleOwner) { it.consume { Log.i("$TAG CardDAV friend list operation was successful, going back") - // TODO FIXME: show green toast + // TODO: show green toast goBack() } } 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 9d9956985..9d7543db3 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 @@ -110,7 +110,7 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() { showModeSelection.postValue(showMode) val devicesList = arrayListOf() - // TODO FIXME: use real devices list from API + // TODO FIXME: use real devices list from API, not implemented yet devices.postValue(devicesList) val prefix = account.params.internationalPrefix 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 d11d3d848..5b5408368 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 @@ -147,7 +147,7 @@ class CardDavViewModel : ViewModel() { val name = displayName.value.orEmpty().trim() val server = serverUrl.value.orEmpty().trim() if (name.isEmpty() || server.isEmpty()) { - // TODO FIXME: improve toast + // TODO: improve toast showErrorToastEvent.postValue(Event(Pair(R.drawable.x, "Name or Server is empty!"))) return } @@ -157,7 +157,7 @@ class CardDavViewModel : ViewModel() { val authRealm = realm.value.orEmpty().trim() coreContext.postOnCoreThread { core -> - // TODO FIXME: add dialog to ask user before removing existing friend list & auth info ? + // TODO: add dialog to ask user before removing existing friend list & auth info ? if (isEdit.value == false) { val foundFriendList = core.getFriendListByName(name) if (foundFriendList != null) { 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 b3fe476c0..9c6f1eff0 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 @@ -169,7 +169,7 @@ class LdapViewModel : ViewModel() { ldapServerOperationSuccessfulEvent.postValue(Event(true)) } catch (e: Exception) { Log.e("$TAG Exception while creating LDAP: $e") - // TODO FIXME: improve toast + // TODO: improve toast showErrorToastEvent.postValue( Event(Pair(R.drawable.x, e.toString())) ) 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 f972279bd..84e0c34b3 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 @@ -230,7 +230,7 @@ class MainViewModel @UiThread constructor() : ViewModel() { removeAlert(NON_DEFAULT_ACCOUNT_NOTIFICATIONS) - // TODO: compute other calls notifications count + // TODO FIXME: compute other accounts notifications count } @WorkerThread diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fe476d5fe..4d821fcff 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -357,6 +357,7 @@ Message Appel vidéo Vérifier + Appareil sans nom Aucune conversation pour le moment… En cours de suppression… diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 246b47123..84e1b5e57 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -404,6 +404,7 @@ Message Video Call Verify + Unnamed device No conversation for the moment…