TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE in FloatingCalculatorService

Browse Source
This commit is contained in:
serso 2017-07-26 10:32:00 +02:00
parent 14ff42daf7
commit f4cb71ab53
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
View File

@ -159,7 +159,6 @@ public class CalculatorApplication extends android.app.Application implements Sh
} }
private void onPostCreate(@Nonnull final SharedPreferences prefs, @Nonnull Languages languages) { private void onPostCreate(@Nonnull final SharedPreferences prefs, @Nonnull Languages languages) {
App.init(this, prefs);
languages.init(); languages.init();
prefs.registerOnSharedPreferenceChangeListener(this); prefs.registerOnSharedPreferenceChangeListener(this);
@ -198,6 +197,9 @@ public class CalculatorApplication extends android.app.Application implements Sh
.setFormUriBasicAuthLogin("timbeenterumisideffecird") .setFormUriBasicAuthLogin("timbeenterumisideffecird")
.setFormUriBasicAuthPassword("ECL65PO2TH5quIFNAK4hQ5Ng")); .setFormUriBasicAuthPassword("ECL65PO2TH5quIFNAK4hQ5Ng"));
} }
// initializing App before #onCreate as FloatingCalculatorService might be created in
// #onCreate
App.init(this, prefs);
// then we should set default preferences // then we should set default preferences
Preferences.init(this, prefs); Preferences.init(this, prefs);