TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

SES-2810 - Removing the screenshot privacy toggle

Browse Source
This commit is contained in:
ThomasSession 2024-10-16 14:49:43 +11:00
parent f6d50ac858
commit fea66ece2e
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
View File

@ -127,11 +127,7 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
if (!isResume) { if (!isResume) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
} else { } else {
if (TextSecurePreferences.isScreenSecurityEnabled(this)) { getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
} else {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
} }
} }
} }

6
app/src/main/res/xml/preferences_privacy.xml
View File

@ -11,12 +11,6 @@
android:title="@string/lockApp" android:title="@string/lockApp"
android:summary="@string/lockAppDescription" /> android:summary="@string/lockAppDescription" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="@bool/screen_security_default"
android:key="pref_screen_security"
android:title="@string/screenshotNotifications"
android:summary="@string/screenshotNotificationsDescription" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory

11
libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
View File

@ -115,7 +115,6 @@ interface TextSecurePreferences {
fun isEnterSendsEnabled(): Boolean fun isEnterSendsEnabled(): Boolean
fun isPasswordDisabled(): Boolean fun isPasswordDisabled(): Boolean
fun setPasswordDisabled(disabled: Boolean) fun setPasswordDisabled(disabled: Boolean)
fun isScreenSecurityEnabled(): Boolean
fun getLastVersionCode(): Int fun getLastVersionCode(): Int
fun setLastVersionCode(versionCode: Int) fun setLastVersionCode(versionCode: Int)
fun isPassphraseTimeoutEnabled(): Boolean fun isPassphraseTimeoutEnabled(): Boolean
@ -216,7 +215,6 @@ interface TextSecurePreferences {
const val LED_BLINK_PREF_CUSTOM = "pref_led_blink_custom" const val LED_BLINK_PREF_CUSTOM = "pref_led_blink_custom"
const val PASSPHRASE_TIMEOUT_INTERVAL_PREF = "pref_timeout_interval" const val PASSPHRASE_TIMEOUT_INTERVAL_PREF = "pref_timeout_interval"
const val PASSPHRASE_TIMEOUT_PREF = "pref_timeout_passphrase" const val PASSPHRASE_TIMEOUT_PREF = "pref_timeout_passphrase"
const val SCREEN_SECURITY_PREF = "pref_screen_security"
const val ENTER_SENDS_PREF = "pref_enter_sends" const val ENTER_SENDS_PREF = "pref_enter_sends"
const val THREAD_TRIM_ENABLED = "pref_trim_threads" const val THREAD_TRIM_ENABLED = "pref_trim_threads"
const val LOCAL_NUMBER_PREF = "pref_local_number" const val LOCAL_NUMBER_PREF = "pref_local_number"
@ -687,11 +685,6 @@ interface TextSecurePreferences {
setBooleanPreference(context, DISABLE_PASSPHRASE_PREF, disabled) setBooleanPreference(context, DISABLE_PASSPHRASE_PREF, disabled)
} }
@JvmStatic
fun isScreenSecurityEnabled(context: Context): Boolean {
return getBooleanPreference(context, SCREEN_SECURITY_PREF, context.resources.getBoolean(R.bool.screen_security_default))
}
fun getLastVersionCode(context: Context): Int { fun getLastVersionCode(context: Context): Int {
return getIntegerPreference(context, LAST_VERSION_CODE_PREF, 0) return getIntegerPreference(context, LAST_VERSION_CODE_PREF, 0)
} }
@ -1329,10 +1322,6 @@ class AppTextSecurePreferences @Inject constructor(
setBooleanPreference(TextSecurePreferences.DISABLE_PASSPHRASE_PREF, disabled) setBooleanPreference(TextSecurePreferences.DISABLE_PASSPHRASE_PREF, disabled)
} }
override fun isScreenSecurityEnabled(): Boolean {
return getBooleanPreference(TextSecurePreferences.SCREEN_SECURITY_PREF, true)
}
override fun getLastVersionCode(): Int { override fun getLastVersionCode(): Int {
return getIntegerPreference(TextSecurePreferences.LAST_VERSION_CODE_PREF, 0) return getIntegerPreference(TextSecurePreferences.LAST_VERSION_CODE_PREF, 0)
} }