From bc972210485319444b090e6989cce93439f391e8 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Tue, 26 Jan 2016 11:46:54 +0100 Subject: Only setup player activities once --- .../java/de/danoeh/antennapod/activity/AudioplayerActivity.java | 6 ++++++ .../java/de/danoeh/antennapod/activity/VideoplayerActivity.java | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'app/src/main/java/de') 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 50d557735..66c3205ee 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -28,6 +28,7 @@ import android.widget.ListView; import com.viewpagerindicator.CirclePageIndicator; import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.ChaptersListAdapter; @@ -83,6 +84,8 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe AddFeedFragment.TAG }; + private AtomicBoolean isSetup = new AtomicBoolean(false); + private DrawerLayout drawerLayout; private NavListAdapter navAdapter; private ListView navList; @@ -193,6 +196,9 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe @Override protected void setupGUI() { + if(isSetup.getAndSet(true)) { + return; + } super.setupGUI(); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java index fbea102eb..ee459dbc6 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -20,6 +20,7 @@ import android.widget.ProgressBar; import android.widget.SeekBar; import java.lang.ref.WeakReference; +import java.util.concurrent.atomic.AtomicBoolean; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.MediaType; @@ -43,6 +44,8 @@ public class VideoplayerActivity extends MediaplayerActivity { private VideoControlsHider videoControlsHider = new VideoControlsHider(this); + private AtomicBoolean isSetup = new AtomicBoolean(false); + private LinearLayout controls; private LinearLayout videoOverlay; private AspectRatioVideoView videoview; @@ -115,6 +118,9 @@ public class VideoplayerActivity extends MediaplayerActivity { @Override protected void setupGUI() { + if(isSetup.getAndSet(true)) { + return; + } super.setupGUI(); getSupportActionBar().setDisplayHomeAsUpEnabled(true); controls = (LinearLayout) findViewById(R.id.controls); -- cgit v1.2.3