Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1169-settings-npe' into 'master'

Browse Source 
Disable settings until they have been loaded

Closes #1169

See merge request akwizgran/briar!726
This commit is contained in:
akwizgran
2018-03-08 15:40:13 +00:00
parent 809b9f8919 03b4907311
commit f725c7ab9a
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -128,6 +128,8 @@ public class SettingsFragment extends PreferenceFragmentCompat
"pref_key_notify_lock_screen");
notifySound = findPreference("pref_key_notify_sound");
setSettingsEnabled(false);
enableBluetooth.setOnPreferenceChangeListener(this);
torNetwork.setOnPreferenceChangeListener(this);
notifyPrivateMessages.setOnPreferenceChangeListener(this);
@@ -248,9 +250,22 @@ public class SettingsFragment extends PreferenceFragmentCompat
text = getString(R.string.notify_sound_setting_disabled);
}
notifySound.setSummary(text);
setSettingsEnabled(true);
});
}
private void setSettingsEnabled(boolean enabled) {
enableBluetooth.setEnabled(enabled);
torNetwork.setEnabled(enabled);
notifyPrivateMessages.setEnabled(enabled);
notifyGroupMessages.setEnabled(enabled);
notifyForumPosts.setEnabled(enabled);
notifyBlogPosts.setEnabled(enabled);
notifyVibration.setEnabled(enabled);
notifyLockscreen.setEnabled(enabled);
notifySound.setEnabled(enabled);
}
private void triggerFeedback() {
androidExecutor.runOnBackgroundThread(() -> ACRA.getErrorReporter()
.handleException(new UserFeedback(), false));