From c4fa68858c8890ef4d224dab521216d54123f228 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 2 Jul 2024 10:10:21 +0200 Subject: [PATCH] Fixed display issue if upload logs button is hidden --- app/src/main/java/org/linphone/core/CorePreferences.kt | 4 ++++ .../java/org/linphone/ui/main/help/viewmodel/HelpViewModel.kt | 4 ++-- app/src/main/res/layout/help_debug_fragment.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt index e89837335..94a89ea7b 100644 --- a/app/src/main/java/org/linphone/core/CorePreferences.kt +++ b/app/src/main/java/org/linphone/core/CorePreferences.kt @@ -57,6 +57,10 @@ class CorePreferences @UiThread constructor(private val context: Context) { config.setBool("app", "first_6.0_launch", value) } + @get:WorkerThread + val checkForUpdateServerUrl: String + get() = config.getString("misc", "version_check_url_root", "").orEmpty() + @get:WorkerThread @set:WorkerThread var conditionsAndPrivacyPolicyAccepted: Boolean get() = config.getBool("app", "read_and_agree_terms_and_privacy", false) 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 d9af47f78..dd484db7e 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 @@ -26,6 +26,7 @@ import androidx.lifecycle.viewModelScope import kotlinx.coroutines.launch import org.linphone.BuildConfig import org.linphone.LinphoneApplication.Companion.coreContext +import org.linphone.LinphoneApplication.Companion.corePreferences import org.linphone.R import org.linphone.core.Core import org.linphone.core.CoreListenerStub @@ -136,8 +137,7 @@ class HelpViewModel @UiThread constructor() : GenericViewModel() { coreContext.postOnCoreThread { core -> core.addListener(coreListener) - val checkUpdateServerUrl = core.config.getString("misc", "version_check_url_root", "") - checkUpdateAvailable.postValue(!checkUpdateServerUrl.isNullOrEmpty()) + checkUpdateAvailable.postValue(corePreferences.checkForUpdateServerUrl.isNotEmpty()) uploadLogsAvailable.postValue(!core.logCollectionUploadServerUrl.isNullOrEmpty()) } } diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml index 32bb80f04..da591d8c3 100644 --- a/app/src/main/res/layout/help_debug_fragment.xml +++ b/app/src/main/res/layout/help_debug_fragment.xml @@ -113,7 +113,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="24dp" android:text="@string/help_troubleshooting_app_version_title" - app:layout_constraintTop_toBottomOf="@id/send_logs" + app:layout_constraintTop_toBottomOf="@id/clean_logs" app:layout_constraintStart_toEndOf="@id/app_version_icon" app:layout_constraintEnd_toEndOf="parent"/>