Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'remove-redundant-casts' into 'master'

Browse Source 
Remove a few redundant casts

See merge request briar/briar!1436
This commit is contained in:
Torsten Grote
2021-04-21 12:52:04 +00:00
parent a9d88c849a 7397efca80
commit a28a2360f1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerViewModel.java
View File

@@ -121,7 +121,7 @@ public class NavDrawerViewModel extends DbViewModel {
@UiThread @UiThread
void checkDozeWhitelisting() { void checkDozeWhitelisting() {
// check this first, to hit the DbThread only when really necessary // check this first, to hit the DbThread only when really necessary
BriarApplication app = (BriarApplication) getApplication(); BriarApplication app = getApplication();
if (app.isInstrumentationTest() || if (app.isInstrumentationTest() ||
!needsDozeWhitelisting(getApplication())) { !needsDozeWhitelisting(getApplication())) {
shouldAskForDozeWhitelisting.setValue(false); shouldAskForDozeWhitelisting.setValue(false);

6
briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
View File

@@ -51,9 +51,9 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
private void updatePreferences() { private void updatePreferences() {
pm = getActivity().getPackageManager(); pm = getActivity().getPackageManager();
lockPref = (SwitchPreferenceCompat) findPreference(KEY_LOCK); lockPref = findPreference(KEY_LOCK);
panicAppPref = (ListPreference) findPreference(KEY_PANIC_APP); panicAppPref = findPreference(KEY_PANIC_APP);
purgePref = (SwitchPreferenceCompat) findPreference(KEY_PURGE); purgePref = findPreference(KEY_PURGE);
// check for connect/disconnect intents from panic trigger apps // check for connect/disconnect intents from panic trigger apps
if (PanicResponder.checkForDisconnectIntent(getActivity())) { if (PanicResponder.checkForDisconnectIntent(getActivity())) {