From 7c3915abd7dcd170176ce4a54992bf8eaa98a916 Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Fri, 21 Mar 2025 14:27:02 +1030 Subject: [PATCH] Making sure we use the right string for Huawei builds (#1041) --- .../onboarding/messagenotifications/MessageNotifications.kt | 4 +++- .../preferences/NotificationsPreferenceFragment.kt | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt index 436cb890be..2ce667cc57 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt @@ -19,6 +19,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import com.squareup.phrase.Phrase +import network.loki.messenger.BuildConfig import network.loki.messenger.R import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY import org.thoughtcrime.securesms.onboarding.OnboardingBackPressAlertDialog @@ -76,7 +77,8 @@ internal fun MessageNotificationsScreen( NotificationRadioButton( R.string.notificationsFastMode, - R.string.notificationsFastModeDescription, + if(BuildConfig.FLAVOR == "huawei") R.string.notificationsFastModeDescriptionHuawei + else R.string.notificationsFastModeDescription, modifier = Modifier.contentDescription(R.string.AccessibilityId_notificationsFastMode), tag = R.string.recommended, checked = state.pushEnabled, diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.kt index d8aed33e2c..7860526925 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.kt @@ -12,6 +12,7 @@ import android.text.TextUtils import androidx.preference.ListPreference import androidx.preference.Preference import dagger.hilt.android.AndroidEntryPoint +import network.loki.messenger.BuildConfig import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.thoughtcrime.securesms.ApplicationContext @@ -38,6 +39,11 @@ class NotificationsPreferenceFragment : CorrectedPreferenceFragment() { true } + fcmPreference.summary = when (BuildConfig.FLAVOR) { + "huawei" -> getString(R.string.notificationsFastModeDescriptionHuawei) + else -> getString(R.string.notificationsFastModeDescription) + } + prefs.setNotificationRingtone( NotificationChannels.getMessageRingtone(requireContext()).toString() )