Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 12:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix several settings issues.

Browse Source
This commit is contained in:
Alex Hart
2021-05-13 16:59:31 -03:00
parent ee09793ef2
commit 81ec9e96c7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/AccountSettingsFragment.kt
View File

@@ -127,7 +127,7 @@ class AccountSettingsFragment : DSLSettingsFragment(R.string.AccountSettingsFrag
val context: Context = requireContext() val context: Context = requireContext()
val metrics: DisplayMetrics = resources.displayMetrics val metrics: DisplayMetrics = resources.displayMetrics
val dialog: AlertDialog = MaterialAlertDialogBuilder(context, if (ThemeUtil.isDarkTheme(context)) R.style.Theme_Signal_AlertDialog_Dark_Cornered_ColoredAccent else R.style.Theme_Signal_AlertDialog_Light_Cornered_ColoredAccent) val dialog: AlertDialog = AlertDialog.Builder(context, if (ThemeUtil.isDarkTheme(context)) R.style.Theme_Signal_AlertDialog_Dark_Cornered_ColoredAccent else R.style.Theme_Signal_AlertDialog_Light_Cornered_ColoredAccent)
.setView(R.layout.pin_disable_reminders_dialog) .setView(R.layout.pin_disable_reminders_dialog)
.create() .create()

9
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
View File

@@ -6,6 +6,7 @@ import android.content.Intent
import android.text.SpannableStringBuilder import android.text.SpannableStringBuilder
import android.text.Spanned import android.text.Spanned
import android.text.style.TextAppearanceSpan import android.text.style.TextAppearanceSpan
import android.view.WindowManager
import android.widget.Toast import android.widget.Toast
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
@@ -218,7 +219,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
clickPref( clickPref(
title = DSLSettingsText.from(R.string.preferences_app_protection__screen_lock_inactivity_timeout), title = DSLSettingsText.from(R.string.preferences_app_protection__screen_lock_inactivity_timeout),
summary = DSLSettingsText.from(getScreenLockInactivityTimeoutSummary(state.screenLockActivityTimeout)), summary = DSLSettingsText.from(getScreenLockInactivityTimeoutSummary(state.screenLockActivityTimeout)),
isEnabled = isKeyguardSecure, isEnabled = isKeyguardSecure && state.screenLock,
onClick = { onClick = {
TimeDurationPickerDialog( TimeDurationPickerDialog(
context, context,
@@ -238,6 +239,12 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
isChecked = state.screenSecurity, isChecked = state.screenSecurity,
onClick = { onClick = {
viewModel.setScreenSecurityEnabled(!state.screenSecurity) viewModel.setScreenSecurityEnabled(!state.screenSecurity)
if (TextSecurePreferences.isScreenSecurityEnabled(requireContext())) {
requireActivity().window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
} else {
requireActivity().window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
}
} }
) )