From 67e3c51a8436349ef4711b913c7d51fc8fa03a40 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 20 Jun 2025 13:52:03 +0200 Subject: [PATCH] Code cleanup, bumped dependencies & gradle --- app/src/main/java/org/linphone/core/CorePreferences.kt | 2 +- .../org/linphone/notifications/NotificationsManager.kt | 2 +- .../org/linphone/ui/call/fragment/ActiveCallFragment.kt | 8 ++++---- app/src/main/java/org/linphone/ui/main/MainActivity.kt | 4 ++-- .../ui/main/settings/viewmodel/SettingsViewModel.kt | 8 -------- app/src/main/res/drawable/files.xml | 9 --------- .../drawable/shape_squircle_gray_200_r15_background.xml | 5 ----- app/src/main/res/drawable/shape_squircle_main2_200.xml | 5 ----- app/src/main/res/layout-land/call_outgoing_fragment.xml | 2 +- .../res/layout-sw600dp-land/main_activity_top_bar.xml | 3 +-- .../res/layout-sw600dp-land/sliding_pane_separator.xml | 4 +++- .../call_conference_participants_list_fragment.xml | 2 +- app/src/main/res/layout/call_outgoing_fragment.xml | 2 +- app/src/main/res/layout/calls_list_fragment.xml | 2 +- app/src/main/res/layout/chat_media_content_grid_cell.xml | 3 +-- .../main/res/layout/file_media_viewer_child_fragment.xml | 2 +- app/src/main/res/values-fr/strings.xml | 3 --- app/src/main/res/values/dimen.xml | 1 - app/src/main/res/values/strings.xml | 3 --- gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 21 files changed, 21 insertions(+), 55 deletions(-) delete mode 100644 app/src/main/res/drawable/files.xml delete mode 100644 app/src/main/res/drawable/shape_squircle_gray_200_r15_background.xml delete mode 100644 app/src/main/res/drawable/shape_squircle_main2_200.xml diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt index afed6ddce..5a710f403 100644 --- a/app/src/main/java/org/linphone/core/CorePreferences.kt +++ b/app/src/main/java/org/linphone/core/CorePreferences.kt @@ -49,7 +49,7 @@ class CorePreferences @get:WorkerThread @set:WorkerThread var printLogsInLogcat: Boolean - get() = config.getBool("app", "debug", org.linphone.BuildConfig.DEBUG) + get() = config.getBool("app", "debug", BuildConfig.DEBUG) set(value) { config.setBool("app", "debug", value) } diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 0964df3d5..c8e8fba9f 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -1817,7 +1817,7 @@ class NotificationsManager return TaskStackBuilder.create(context).run { addNextIntentWithParentStack( Intent(context, MainActivity::class.java).apply { - setAction(Intent.ACTION_MAIN) // Needed as well + action = Intent.ACTION_MAIN // Needed as well putExtras(args) // Need to pass args here for Chat extra } ) diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt index 7cd1a9137..0d1cac9fc 100644 --- a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt +++ b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt @@ -258,7 +258,7 @@ class ActiveCallFragment : GenericCallFragment() { ) } else { // Only allow "trying again" once - showZrtpAlertDialog(false) + showZrtpAlertDialog() } } } @@ -408,7 +408,7 @@ class ActiveCallFragment : GenericCallFragment() { if (callViewModel.isZrtpAlertDialogVisible) { Log.i("$TAG Fragment resuming, showing ZRTP alert dialog") - showZrtpAlertDialog(false) + showZrtpAlertDialog() } else if (callViewModel.isZrtpDialogVisible) { Log.i("$TAG Fragment resuming, showing ZRTP SAS validation dialog") callViewModel.showZrtpSasDialogIfPossible() @@ -481,12 +481,12 @@ class ActiveCallFragment : GenericCallFragment() { callViewModel.isZrtpDialogVisible = true } - private fun showZrtpAlertDialog(allowTryAgain: Boolean = true) { + private fun showZrtpAlertDialog() { if (zrtpSasDialog != null) { zrtpSasDialog?.dismiss() } - val model = ZrtpAlertDialogModel(allowTryAgain) + val model = ZrtpAlertDialogModel(false) val dialog = DialogUtils.getZrtpAlertDialog(requireActivity(), model) model.tryAgainEvent.observe(viewLifecycleOwner) { event -> 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 bfc169be1..9a2a6acaf 100644 --- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt +++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt @@ -77,6 +77,7 @@ import org.linphone.utils.DialogUtils import org.linphone.utils.Event import org.linphone.utils.FileUtils import org.linphone.utils.LinphoneUtils +import androidx.core.content.edit @UiThread class MainActivity : GenericActivity() { @@ -414,9 +415,8 @@ class MainActivity : GenericActivity() { HISTORY_FRAGMENT_ID } } - with(getPreferences(MODE_PRIVATE).edit()) { + getPreferences(MODE_PRIVATE).edit { putInt(DEFAULT_FRAGMENT_KEY, defaultFragmentId) - apply() } Log.i("$TAG Stored [$defaultFragmentId] as default page") 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 156cdd74e..774235503 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 @@ -207,8 +207,6 @@ class SettingsViewModel val deviceName = MutableLiveData() val remoteProvisioningUrl = MutableLiveData() - val expandAdvancedCalls = MutableLiveData() - val mediaEncryptionIndex = MutableLiveData() val mediaEncryptionLabels = arrayListOf() private val mediaEncryptionValues = arrayListOf() @@ -288,7 +286,6 @@ class SettingsViewModel expandNetwork.value = false expandUserInterface.value = false expandTunnel.value = false - expandAdvancedCalls.value = false expandAudioDevices.value = false expandAudioCodecs.value = false expandVideoCodecs.value = false @@ -1002,11 +999,6 @@ class SettingsViewModel } } - @UiThread - fun toggleAdvancedCallsExpand() { - expandAdvancedCalls.value = expandAdvancedCalls.value == false - } - @UiThread fun toggleAudioDevicesExpand() { expandAudioDevices.value = expandAudioDevices.value == false diff --git a/app/src/main/res/drawable/files.xml b/app/src/main/res/drawable/files.xml deleted file mode 100644 index 41d445997..000000000 --- a/app/src/main/res/drawable/files.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/shape_squircle_gray_200_r15_background.xml b/app/src/main/res/drawable/shape_squircle_gray_200_r15_background.xml deleted file mode 100644 index 2b7fce250..000000000 --- a/app/src/main/res/drawable/shape_squircle_gray_200_r15_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_main2_200.xml b/app/src/main/res/drawable/shape_squircle_main2_200.xml deleted file mode 100644 index 3dfc17f17..000000000 --- a/app/src/main/res/drawable/shape_squircle_main2_200.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-land/call_outgoing_fragment.xml b/app/src/main/res/layout-land/call_outgoing_fragment.xml index c936b5027..22f38d31c 100644 --- a/app/src/main/res/layout-land/call_outgoing_fragment.xml +++ b/app/src/main/res/layout-land/call_outgoing_fragment.xml @@ -127,7 +127,7 @@ android:layout_marginBottom="10dp" app:alignTopRight="true" app:displayMode="black_bars" - roundCornersRadius="@dimen/call_round_corners_texture_view_radius" + app:radius="@dimen/call_round_corners_texture_view_radius" app:layout_constraintBottom_toTopOf="@id/bottom_bar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_max="@dimen/call_video_preview_max_size" diff --git a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml index 24cef6184..3345c9f5a 100644 --- a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml +++ b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml @@ -1,7 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/layout-sw600dp-land/sliding_pane_separator.xml b/app/src/main/res/layout-sw600dp-land/sliding_pane_separator.xml index 1c6b7c206..f4a32b4f8 100644 --- a/app/src/main/res/layout-sw600dp-land/sliding_pane_separator.xml +++ b/app/src/main/res/layout-sw600dp-land/sliding_pane_separator.xml @@ -1,7 +1,9 @@ + android:background="?attr/color_separator" + tools:ignore="Overdraw"> \ No newline at end of file diff --git a/app/src/main/res/layout/call_conference_participants_list_fragment.xml b/app/src/main/res/layout/call_conference_participants_list_fragment.xml index dffa03d9b..7548fc158 100644 --- a/app/src/main/res/layout/call_conference_participants_list_fragment.xml +++ b/app/src/main/res/layout/call_conference_participants_list_fragment.xml @@ -88,7 +88,7 @@ android:layout_marginEnd="10dp" app:alignTopRight="true" app:displayMode="black_bars" - roundCornersRadius="@dimen/call_round_corners_texture_view_radius" + app:radius="@dimen/call_round_corners_texture_view_radius" app:layout_constraintBottom_toTopOf="@id/add_participants" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_max="@dimen/call_video_preview_max_size" diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml index 8ff439d8c..873a8d495 100644 --- a/app/src/main/res/layout/call_outgoing_fragment.xml +++ b/app/src/main/res/layout/call_outgoing_fragment.xml @@ -121,7 +121,7 @@ android:layout_marginBottom="10dp" app:alignTopRight="true" app:displayMode="black_bars" - roundCornersRadius="@dimen/call_round_corners_texture_view_radius" + app:radius="@dimen/call_round_corners_texture_view_radius" app:layout_constraintBottom_toTopOf="@id/bottom_bar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_max="@dimen/call_video_preview_max_size" diff --git a/app/src/main/res/layout/calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml index 697c5fcf6..277d58ece 100644 --- a/app/src/main/res/layout/calls_list_fragment.xml +++ b/app/src/main/res/layout/calls_list_fragment.xml @@ -86,7 +86,7 @@ android:layout_marginEnd="10dp" app:alignTopRight="true" app:displayMode="black_bars" - roundCornersRadius="@dimen/call_round_corners_texture_view_radius" + app:radius="@dimen/call_round_corners_texture_view_radius" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_max="@dimen/call_video_preview_max_size" diff --git a/app/src/main/res/layout/chat_media_content_grid_cell.xml b/app/src/main/res/layout/chat_media_content_grid_cell.xml index 80b82a7d3..e623476f5 100644 --- a/app/src/main/res/layout/chat_media_content_grid_cell.xml +++ b/app/src/main/res/layout/chat_media_content_grid_cell.xml @@ -1,7 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/layout/file_media_viewer_child_fragment.xml b/app/src/main/res/layout/file_media_viewer_child_fragment.xml index 4941c83ce..d3274339e 100644 --- a/app/src/main/res/layout/file_media_viewer_child_fragment.xml +++ b/app/src/main/res/layout/file_media_viewer_child_fragment.xml @@ -69,7 +69,7 @@ android:padding="10dp" android:src="@{viewModel.isMediaPlaying ? @drawable/pause_fill : @drawable/play_fill, default=@drawable/play_fill}" android:adjustViewBounds="true" - android:contentDescription="@string/content_description_play_pause_audio_playback" + android:contentDescription="@string/content_description_play_pause_video_playback" android:background="@drawable/circle_transparent_dark_button_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c43405463..3a640ce44 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -33,7 +33,6 @@ Accepter Annuler Continuer - OK Appeler Supprimer Installer @@ -86,7 +85,6 @@ Adresse copiée Nouveau compte ajouté - Erreur de connexion ! Média exporté Échec de l\'exportation Document exporté @@ -372,7 +370,6 @@ Mot de passe Le compte selectionné est introuvable ! - Historique d\'appel Nouvel appel Cherchez un contact ou une suggestion Démarrer un appel de groupe diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 5c1da0257..26999c2e9 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -6,7 +6,6 @@ 10dp 80dp - 12sp 350dp 300dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f27aa60d5..634a43771 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -73,7 +73,6 @@ Accept Cancel Continue - OK Call Delete Install @@ -127,7 +126,6 @@ SIP address copied into clipboard New account configured - Connection error! File has been exported to native gallery Error trying to export file to native gallery File has been exported to documents @@ -414,7 +412,6 @@ Failed to find matching account! - Call history New call Search contact or history call Create a group call diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5f4eeaa10..7eeed4798 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,8 +2,8 @@ agp = "8.10.1" kotlin = "2.0.21" gmsGoogleServices = "4.4.2" -firebaseCrashlytics = "3.0.3" -firebaseBomVersion = "33.14.0" +firebaseCrashlytics = "3.0.4" +firebaseBomVersion = "33.15.0" ktlint = "12.1.2" annotations = "1.9.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f0fad5900..c210b9aaf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Jun 22 12:11:25 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists