From 2887d1b8071da9dcd61364e55892644ec6b08dba Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 2 Oct 2018 17:41:36 +0200 Subject: [PATCH] prefere preference setting from core, closes #64 --- .../preferences/AppProtectionPreferenceFragment.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java index 227c66a18..f3efc663b 100644 --- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java @@ -21,7 +21,6 @@ import org.thoughtcrime.securesms.components.SwitchPreferenceCompat; import org.thoughtcrime.securesms.connect.ApplicationDcContext; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.dependencies.InjectableType; -import org.thoughtcrime.securesms.util.ScreenLockUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; import java.util.concurrent.TimeUnit; @@ -117,9 +116,6 @@ public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment public boolean onPreferenceChange(Preference preference, Object newValue) { boolean enabled = (Boolean) newValue; manageScreenLockChildren(enabled); - if (enabled) { - ScreenLockUtil.shouldLockApp = false; - } TextSecurePreferences.setScreenLockEnabled(getContext(), enabled); return true; } @@ -148,7 +144,7 @@ public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment final String onRes = context.getString(R.string.ApplicationPreferencesActivity_on); final String offRes = context.getString(R.string.ApplicationPreferencesActivity_off); String screenLockState = TextSecurePreferences.isScreenLockEnabled(context) ? onRes : offRes; - String readReceiptState = TextSecurePreferences.isReadReceiptEnabled(context) ? onRes : offRes; + String readReceiptState = DcHelper.getContext(context).getConfigInt("mdns_enabled", DcContext.DC_PREF_DEFAULT_MDNS_ENABLED)!=0? onRes : offRes; return context.getString(privacySummaryResId, screenLockState, readReceiptState); }