From a73e48347820e5a205e300dad63ee86f784f1e70 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 18 Jul 2024 09:50:51 +0200 Subject: [PATCH] Fixed issue in permissions layout in landscape + post_notifications permission not granted alert when it was in fact granted --- app/src/main/java/org/linphone/ui/main/MainActivity.kt | 1 + .../main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt | 4 +--- app/src/main/res/layout/assistant_permissions_fragment.xml | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) 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 7b9cf9219..f726aee24 100644 --- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt +++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt @@ -344,6 +344,7 @@ class MainActivity : GenericActivity() { viewModel.checkForNewAccount() viewModel.updateNetworkReachability() + viewModel.updatePostNotificationsPermission() } override fun onNewIntent(intent: Intent) { 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 fe7e57af5..1b79f9056 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 @@ -283,9 +283,7 @@ class MainViewModel @UiThread constructor() : ViewModel() { addAlert(NETWORK_NOT_REACHABLE, label) } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - checkPostNotificationsPermission() - } + updatePostNotificationsPermission() if (core.callsNb > 0) { updateCallAlert() diff --git a/app/src/main/res/layout/assistant_permissions_fragment.xml b/app/src/main/res/layout/assistant_permissions_fragment.xml index d2894f17e..6dff04a4f 100644 --- a/app/src/main/res/layout/assistant_permissions_fragment.xml +++ b/app/src/main/res/layout/assistant_permissions_fragment.xml @@ -216,11 +216,12 @@ android:layout_marginTop="32dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:layout_marginBottom="@dimen/screen_bottom_margin" + android:layout_marginBottom="20dp" android:paddingStart="20dp" android:paddingEnd="20dp" android:text="@string/assistant_permissions_skip_permissions" app:layout_constraintWidth_max="@dimen/button_max_width" + app:layout_constraintVertical_bias="1" app:layout_constraintTop_toBottomOf="@id/access_camera_title" app:layout_constraintBottom_toTopOf="@id/grant_all_permissions" app:layout_constraintStart_toStartOf="parent"