1 files changed, 24 insertions, 19 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 8af6f3552..b4e8d4d71 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -94,8 +94,8 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
     private int mPosition = -1;
 
     private Playable media;
-    private ViewPager mPager;
-    private AudioplayerPagerAdapter mPagerAdapter;
+    private ViewPager pager;
+    private AudioplayerPagerAdapter pagerAdapter;
 
     private Subscription subscription;
 
@@ -116,8 +116,8 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
         // don't risk creating memory leaks
         navAdapter = null;
         drawerToggle = null;
-        mPager = null;
-        mPagerAdapter = null;
+        pager = null;
+        pagerAdapter = null;
     }
 
     @Override
@@ -126,27 +126,29 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
     }
 
     private void saveCurrentFragment() {
-        if(mPager == null) {
+        if(pager == null) {
             return;
         }
         Log.d(TAG, "Saving preferences");
         SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
         prefs.edit()
-                .putInt(PREF_KEY_SELECTED_FRAGMENT_POSITION, mPager.getCurrentItem())
+                .putInt(PREF_KEY_SELECTED_FRAGMENT_POSITION, pager.getCurrentItem())
                 .commit();
     }
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        drawerToggle.onConfigurationChanged(newConfig);
+        if(drawerToggle != null) {
+            drawerToggle.onConfigurationChanged(newConfig);
+        }
     }
 
     private void loadLastFragment() {
         Log.d(TAG, "Restoring instance state");
         SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
         int lastPosition = prefs.getInt(PREF_KEY_SELECTED_FRAGMENT_POSITION, -1);
-        mPager.setCurrentItem(lastPosition);
+        pager.setCurrentItem(lastPosition);
     }
 
     @Override
@@ -166,9 +168,9 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
                     true);
             startService(launchIntent);
         }
-        if(mPagerAdapter != null && controller != null && controller.getMedia() != media) {
+        if(pagerAdapter != null && controller != null && controller.getMedia() != media) {
             media = controller.getMedia();
-            mPagerAdapter.onMediaChanged(media);
+            pagerAdapter.onMediaChanged(media);
         }
 
         EventDistributor.getInstance().register(contentUpdate);
@@ -255,13 +257,13 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
             startActivity(new Intent(AudioplayerActivity.this, PreferenceController.getPreferenceActivity()));
         });
 
-        mPager = (ViewPager) findViewById(R.id.pager);
-        mPagerAdapter = new AudioplayerPagerAdapter(getSupportFragmentManager());
-        mPager.setAdapter(mPagerAdapter);
+        pager = (ViewPager) findViewById(R.id.pager);
+        pagerAdapter = new AudioplayerPagerAdapter(getSupportFragmentManager());
+        pager.setAdapter(pagerAdapter);
         CirclePageIndicator pageIndicator = (CirclePageIndicator) findViewById(R.id.page_indicator);
-        pageIndicator.setViewPager(mPager);
+        pageIndicator.setViewPager(pager);
         loadLastFragment();
-        mPager.onSaveInstanceState();
+        pager.onSaveInstanceState();
     }
 
     @Override
@@ -277,13 +279,16 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
         }
         if(controller.getMedia() != media) {
             media = controller.getMedia();
-            mPagerAdapter.onMediaChanged(media);
+            pagerAdapter.onMediaChanged(media);
         }
         return true;
     }
 
     public void notifyMediaPositionChanged() {
-        ChaptersFragment chaptersFragment = mPagerAdapter.getChaptersFragment();
+        if(pagerAdapter == null) {
+            return;
+        }
+        ChaptersFragment chaptersFragment = pagerAdapter.getChaptersFragment();
         if(chaptersFragment != null) {
             ChaptersListAdapter adapter = (ChaptersListAdapter) chaptersFragment.getListAdapter();
             if (adapter != null) {
@@ -411,13 +416,13 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
     public void onBackPressed() {
         if(isDrawerOpen()) {
             drawerLayout.closeDrawer(navDrawer);
-        } else if (mPager.getCurrentItem() == 0) {
+        } else if (pager == null || pager.getCurrentItem() == 0) {
             // If the user is currently looking at the first step, allow the system to handle the
             // Back button. This calls finish() on this activity and pops the back stack.
             super.onBackPressed();
         } else {
             // Otherwise, select the previous step.
-            mPager.setCurrentItem(mPager.getCurrentItem() - 1);
+            pager.setCurrentItem(pager.getCurrentItem() - 1);
         }
     }