From b02e8ed6a0439cd22859f90abca2dda6efb71556 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 14 Jun 2015 23:56:38 +0200 Subject: [PATCH] Fix NPE when trying to use context before onCreate() is called; --- .../activities/MusicControllerActivity.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java index 13693056..c2c805f7 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java @@ -79,18 +79,21 @@ public class MusicControllerActivity extends AbsFabActivity { private int lastTextColor = -2; private Thread progressViewsUpdateThread; - private final boolean opaqueStatusBar = PreferenceUtils.getInstance(this).opaqueStatusbarNowPlaying(); - private final boolean opaqueToolBar = opaqueStatusBar && PreferenceUtils.getInstance(this).opaqueToolbarNowPlaying(); - private final boolean forceSquareAlbumArt = PreferenceUtils.getInstance(this).forceAlbumArtSquared(); - private final boolean largerTitleBox = PreferenceUtils.getInstance(this).largerTitleBoxNowPlaying(); - private final boolean alternativeProgressSlider = PreferenceUtils.getInstance(this).alternativeProgressSliderNowPlaying(); - private final boolean showPlaybackControllerCard = PreferenceUtils.getInstance(this).playbackControllerCardNowPlaying(); + private boolean opaqueStatusBar; + private boolean opaqueToolBar; + private boolean forceSquareAlbumArt; + private boolean largerTitleBox; + private boolean alternativeProgressSlider; + private boolean showPlaybackControllerCard; @Override protected void onCreate(Bundle savedInstanceState) { setStatusBarTransparent(); + super.onCreate(savedInstanceState); + initAppeareanceVars(); + setContentView(alternativeProgressSlider ? R.layout.activity_music_controller_alternative_progress_slider : R.layout.activity_music_controller); initViews(); @@ -140,6 +143,15 @@ public class MusicControllerActivity extends AbsFabActivity { } } + private void initAppeareanceVars() { + opaqueStatusBar = PreferenceUtils.getInstance(this).opaqueStatusbarNowPlaying(); + opaqueToolBar = opaqueStatusBar && PreferenceUtils.getInstance(this).opaqueToolbarNowPlaying(); + forceSquareAlbumArt = PreferenceUtils.getInstance(this).forceAlbumArtSquared(); + largerTitleBox = PreferenceUtils.getInstance(this).largerTitleBoxNowPlaying(); + alternativeProgressSlider = PreferenceUtils.getInstance(this).alternativeProgressSliderNowPlaying(); + showPlaybackControllerCard = PreferenceUtils.getInstance(this).playbackControllerCardNowPlaying(); + } + @Override protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState);