From 8a39529fd14fe4fa419cd65f09af29994b333751 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 10 Oct 2024 11:18:41 +0200 Subject: [PATCH] Code cleanup --- .../java/org/linphone/LinphoneApplication.kt | 23 +++++++++---------- .../org/linphone/contacts/ContactsManager.kt | 3 +-- .../java/org/linphone/core/CoreContext.kt | 4 ++-- .../java/org/linphone/ui/call/CallActivity.kt | 3 +-- .../ui/call/viewmodel/CurrentCallViewModel.kt | 6 ++--- .../ui/file_viewer/FileViewerActivity.kt | 3 +-- .../java/org/linphone/ui/main/MainActivity.kt | 5 ++-- .../ui/main/chat/model/ConversationModel.kt | 2 +- .../AbstractConversationViewModel.kt | 2 ++ .../viewmodel/ContactsListViewModel.kt | 2 +- .../adapter/ContactHistoryListAdapter.kt | 2 +- .../meetings/fragment/MeetingsListFragment.kt | 1 - .../meetings/viewmodel/MeetingViewModel.kt | 2 +- .../viewmodel/MeetingsListViewModel.kt | 4 ++-- .../ui/main/settings/model/CodecModel.kt | 2 +- .../viewmodel/AddressSelectionViewModel.kt | 1 - .../java/org/linphone/utils/LinphoneUtils.kt | 2 +- .../res/layout/drawer_shortcuts_list_cell.xml | 1 + app/src/main/res/values-fr/strings.xml | 4 ---- app/src/main/res/values/strings.xml | 4 ---- 20 files changed, 32 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/org/linphone/LinphoneApplication.kt b/app/src/main/java/org/linphone/LinphoneApplication.kt index 800aa390c..66e1740bf 100644 --- a/app/src/main/java/org/linphone/LinphoneApplication.kt +++ b/app/src/main/java/org/linphone/LinphoneApplication.kt @@ -21,7 +21,6 @@ package org.linphone import android.annotation.SuppressLint import android.app.Application -import android.content.ComponentCallbacks2 import androidx.annotation.MainThread import coil.ImageLoader import coil.ImageLoaderFactory @@ -93,10 +92,10 @@ class LinphoneApplication : Application(), ImageLoaderFactory { override fun onTrimMemory(level: Int) { Log.w("$TAG onTrimMemory called with level [${trimLevelToString(level)}]($level) !") when (level) { - ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW, - ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL, - ComponentCallbacks2.TRIM_MEMORY_MODERATE, - ComponentCallbacks2.TRIM_MEMORY_COMPLETE -> { + TRIM_MEMORY_RUNNING_LOW, + TRIM_MEMORY_RUNNING_CRITICAL, + TRIM_MEMORY_MODERATE, + TRIM_MEMORY_COMPLETE -> { Log.i("$TAG Memory trim required, clearing imageLoader memory cache") imageLoader.memoryCache?.clear() } @@ -139,13 +138,13 @@ class LinphoneApplication : Application(), ImageLoaderFactory { private fun trimLevelToString(level: Int): String { return when (level) { - ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN -> "Hidden UI" - ComponentCallbacks2.TRIM_MEMORY_RUNNING_MODERATE -> "Moderate (Running)" - ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW -> "Low" - ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL -> "Critical" - ComponentCallbacks2.TRIM_MEMORY_BACKGROUND -> "Background" - ComponentCallbacks2.TRIM_MEMORY_MODERATE -> "Moderate" - ComponentCallbacks2.TRIM_MEMORY_COMPLETE -> "Complete" + TRIM_MEMORY_UI_HIDDEN -> "Hidden UI" + TRIM_MEMORY_RUNNING_MODERATE -> "Moderate (Running)" + TRIM_MEMORY_RUNNING_LOW -> "Low" + TRIM_MEMORY_RUNNING_CRITICAL -> "Critical" + TRIM_MEMORY_BACKGROUND -> "Background" + TRIM_MEMORY_MODERATE -> "Moderate" + TRIM_MEMORY_COMPLETE -> "Complete" else -> level.toString() } } diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt index 4d2328beb..65c8521ef 100644 --- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt +++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt @@ -602,7 +602,7 @@ class ContactsManager @UiThread constructor() { @WorkerThread fun getMePerson(localAddress: Address): Person { val account = coreContext.core.accountList.find { - it.params.identityAddress?.weakEqual(localAddress) ?: false + it.params.identityAddress?.weakEqual(localAddress) == true } val name = account?.params?.identityAddress?.displayName ?: LinphoneUtils.getDisplayName( localAddress @@ -627,7 +627,6 @@ class ContactsManager @UiThread constructor() { @WorkerThread fun updateContactsModelDependingOnDefaultAccountMode() { - val account = coreContext.core.defaultAccount val showTrust = true Log.i( "$TAG Default account mode is [${if (showTrust) "end-to-end encryption mandatory" else "interoperable"}], update all contact models showTrust value" diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt index a8c4921e1..4b1947564 100644 --- a/app/src/main/java/org/linphone/core/CoreContext.kt +++ b/app/src/main/java/org/linphone/core/CoreContext.kt @@ -608,7 +608,7 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C @WorkerThread fun isAddressMyself(address: Address): Boolean { val found = core.accountList.find { - it.params.identityAddress?.weakEqual(address) ?: false + it.params.identityAddress?.weakEqual(address) == true } return found != null } @@ -675,7 +675,7 @@ class CoreContext @UiThread constructor(val context: Context) : HandlerThread("C if (localAddress != null) { val account = core.accountList.find { account -> - account.params.identityAddress?.weakEqual(localAddress) ?: false + account.params.identityAddress?.weakEqual(localAddress) == true } if (account != null) { params.account = account diff --git a/app/src/main/java/org/linphone/ui/call/CallActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt index 3860bb658..cd44fd8b8 100644 --- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt +++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt @@ -20,7 +20,6 @@ package org.linphone.ui.call import android.Manifest -import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.content.res.Resources @@ -144,7 +143,7 @@ class CallActivity : GenericActivity() { WindowInsetsCompat.CONSUMED } - val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager + val powerManager = getSystemService(POWER_SERVICE) as PowerManager if (!powerManager.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) { Log.w("$TAG PROXIMITY_SCREEN_OFF_WAKE_LOCK isn't supported on this device!") } 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 4d4cf1fca..addae1256 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 @@ -636,7 +636,7 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() { coreContext.postOnCoreThread { if (::currentCall.isInitialized) { val micMuted = if (currentCall.conference != null) { - currentCall.conference?.microphoneMuted ?: false + currentCall.conference?.microphoneMuted == true } else { currentCall.microphoneMuted } @@ -660,7 +660,7 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() { coreContext.postOnCoreThread { if (::currentCall.isInitialized) { val micMuted = if (currentCall.conference != null) { - currentCall.conference?.microphoneMuted ?: false + currentCall.conference?.microphoneMuted == true } else { currentCall.microphoneMuted } @@ -1135,7 +1135,7 @@ class CurrentCallViewModel @UiThread constructor() : GenericViewModel() { isRecording.postValue(call.params.isRecording) - val isRemoteRecording = call.remoteParams?.isRecording ?: false + val isRemoteRecording = call.remoteParams?.isRecording == true if (isRemoteRecording) { Log.w("$TAG Remote end [${displayedName.value.orEmpty()}] is recording the call") isRemoteRecordingEvent.postValue(Event(Pair(true, displayedName.value.orEmpty()))) diff --git a/app/src/main/java/org/linphone/ui/file_viewer/FileViewerActivity.kt b/app/src/main/java/org/linphone/ui/file_viewer/FileViewerActivity.kt index 8756b738d..96b5b1bdd 100644 --- a/app/src/main/java/org/linphone/ui/file_viewer/FileViewerActivity.kt +++ b/app/src/main/java/org/linphone/ui/file_viewer/FileViewerActivity.kt @@ -1,6 +1,5 @@ package org.linphone.ui.file_viewer -import android.app.Activity import android.content.Intent import android.net.Uri import android.os.Bundle @@ -147,7 +146,7 @@ class FileViewerActivity : GenericActivity() { @Deprecated("Deprecated in Java") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - if (requestCode == EXPORT_FILE_AS_DOCUMENT && resultCode == Activity.RESULT_OK) { + if (requestCode == EXPORT_FILE_AS_DOCUMENT && resultCode == RESULT_OK) { data?.data?.also { documentUri -> Log.i("$TAG Exported file should be stored in URI [$documentUri]") viewModel.copyFileToUri(documentUri) diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt index 72fc995fd..7e24a8bff 100644 --- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt +++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt @@ -22,7 +22,6 @@ package org.linphone.ui.main import android.Manifest import android.annotation.SuppressLint import android.app.Dialog -import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.graphics.Color @@ -339,7 +338,7 @@ class MainActivity : GenericActivity() { HISTORY_FRAGMENT_ID } } - with(getPreferences(Context.MODE_PRIVATE).edit()) { + with(getPreferences(MODE_PRIVATE).edit()) { putInt(DEFAULT_FRAGMENT_KEY, defaultFragmentId) apply() } @@ -403,7 +402,7 @@ class MainActivity : GenericActivity() { } } - val defaultFragmentId = getPreferences(Context.MODE_PRIVATE).getInt( + val defaultFragmentId = getPreferences(MODE_PRIVATE).getInt( DEFAULT_FRAGMENT_KEY, HISTORY_FRAGMENT_ID ) diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt index e35b512e5..4e3bacc9c 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt @@ -379,7 +379,7 @@ class ConversationModel @WorkerThread constructor(val chatRoom: ChatRoom) { composingFriends.add(name) label += "$name, " } - if (composingFriends.size > 0) { + if (composingFriends.isNotEmpty()) { label = label.dropLast(2) val format = AppUtils.getStringWithPlural( 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 c411b67be..aeba594a5 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 @@ -17,6 +17,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +@file:Suppress("EmptyMethod") + package org.linphone.ui.main.chat.viewmodel import androidx.annotation.UiThread 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 cbbb03cab..38a1de817 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 @@ -295,7 +295,7 @@ class ContactsListViewModel @UiThread constructor() : AbstractMainViewModel() { list.add(model) count += 1 - val starred = friend?.starred ?: false + val starred = friend?.starred == true model.isFavourite.postValue(starred) if (starred) { favouritesList.add(model) diff --git a/app/src/main/java/org/linphone/ui/main/history/adapter/ContactHistoryListAdapter.kt b/app/src/main/java/org/linphone/ui/main/history/adapter/ContactHistoryListAdapter.kt index a9482b9d5..fc1feba30 100644 --- a/app/src/main/java/org/linphone/ui/main/history/adapter/ContactHistoryListAdapter.kt +++ b/app/src/main/java/org/linphone/ui/main/history/adapter/ContactHistoryListAdapter.kt @@ -46,7 +46,7 @@ class ContactHistoryListAdapter : ListAdapter Unit) ) { 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 89918cf5b..ed64fc883 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 @@ -30,7 +30,6 @@ import org.linphone.R import org.linphone.contacts.ContactsManager import org.linphone.core.Address import org.linphone.core.ChatRoom -import org.linphone.core.Friend import org.linphone.core.MagicSearch import org.linphone.core.MagicSearchListenerStub import org.linphone.core.SearchResult diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt index a0db7c3e8..4e63b9c9c 100644 --- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt +++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt @@ -75,7 +75,7 @@ class LinphoneUtils { @WorkerThread fun applyInternationalPrefix(account: Account? = null): Boolean { return account?.params?.useInternationalPrefixForCallsAndChats - ?: (getDefaultAccount()?.params?.useInternationalPrefixForCallsAndChats ?: false) + ?: (getDefaultAccount()?.params?.useInternationalPrefixForCallsAndChats == true) } @WorkerThread diff --git a/app/src/main/res/layout/drawer_shortcuts_list_cell.xml b/app/src/main/res/layout/drawer_shortcuts_list_cell.xml index f18bfcea0..61690e472 100644 --- a/app/src/main/res/layout/drawer_shortcuts_list_cell.xml +++ b/app/src/main/res/layout/drawer_shortcuts_list_cell.xml @@ -22,6 +22,7 @@ android:layout_height="@dimen/icon_size" android:adjustViewBounds="true" coilUrl="@{model.iconUrl}" + android:contentDescription="@null" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 479703304..a0ca0bcf7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -489,7 +489,6 @@ Aucune adresse à ajouter au contact Démarrer un appel de groupe ? Tous les participants de la conversation recevront un appel. - Démarrer l\'appel de groupe Vous avez rejoint le groupe Vous avez quitté le groupe @@ -526,7 +525,6 @@ message vocal - Aucune réunion pour le moment… Aucune réunion aujourd\'hui Nouvelle réunion @@ -534,9 +532,7 @@ Webinar Informations sur le mode Webinar.\nEn savoir plus Ajouter un titre… - Toute la journée Date de début - Date de fin Heure de début Heure de fin Fuseau horaire diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d10928761..4b7074cde 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -527,7 +527,6 @@ No address to add to contact Start a group call? All participants will receive a call. - Start a group call You have joined the group You have left the group @@ -564,7 +563,6 @@ voice message - No meeting for the moment… No meeting scheduled for today New meeting @@ -572,9 +570,7 @@ Broadcast Info about broadcast.\nLearn more Add title… - All day Choose the start date - Choose the end date Choose the start time Choose the end time Timezone