awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

prefere preference setting from core, closes #64

Browse Source
This commit is contained in:
B. Petersen
2018-10-02 17:41:36 +02:00
parent fca9076059
commit 2887d1b807
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
+1 -5
View File
@@ -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);
}