From becc90409fcf2d1d81003b2623da13615e8f3f8c Mon Sep 17 00:00:00 2001
From: Tonelico <karyogamy@users.noreply.github.com>
Date: Mon, 7 Aug 2017 06:04:36 -0700
Subject: [PATCH] Added option to resume on audio focus regain. (#624)

---
 .../java/org/schabi/newpipe/player/BasePlayer.java  | 13 +++++++++++++
 app/src/main/res/values/settings_keys.xml           |  2 +-
 app/src/main/res/values/strings.xml                 |  2 ++
 app/src/main/res/xml/settings.xml                   |  6 ++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
index 10f4feb48..8c2e5c6b8 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -47,6 +47,8 @@ import com.google.android.exoplayer2.util.Util;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
 
+import org.schabi.newpipe.R;
+
 import java.io.File;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -321,10 +323,21 @@ public abstract class BasePlayer implements ExoPlayer.EventListener, AudioManage
         }
     }
 
+    private boolean isResumeAfterAudioFocusGain() {
+        if (this.sharedPreferences == null || this.context == null) return false;
+
+        return this.sharedPreferences.getBoolean(
+                this.context.getString(R.string.resume_on_audio_focus_gain_key),
+                false
+        );
+    }
+
     protected void onAudioFocusGain() {
         if (DEBUG) Log.d(TAG, "onAudioFocusGain() called");
         if (simpleExoPlayer != null) simpleExoPlayer.setVolume(DUCK_AUDIO_TO);
         animateAudio(DUCK_AUDIO_TO, 1f, DUCK_DURATION);
+
+        if (isResumeAfterAudioFocusGain()) simpleExoPlayer.setPlayWhenReady(true);
     }
 
     protected void onAudioFocusLoss() {
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 071592b73..2a1398b09 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -14,7 +14,7 @@
     <string name="autoplay_through_intent_key" translatable="false">autoplay_through_intent</string>
     <string name="use_old_player_key" translatable="false">use_oldplayer</string>
     <string name="player_gesture_controls_key" translatable="false">player_gesture_controls</string>
-
+    <string name="resume_on_audio_focus_gain_key" translatable="false">resume_on_audio_focus_gain</string>
     <string name="default_resolution_key" translatable="false">default_resolution_preference</string>
     <string name="default_resolution_value" translatable="false">360p</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a2449e02a..91dc973ef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -71,6 +71,8 @@
     <string name="player_gesture_controls_summary">Use gestures to control the brightness and volume of the player</string>
     <string name="show_search_suggestions_title">Search suggestions</string>
     <string name="show_search_suggestions_summary">Show suggestions when searching</string>
+    <string name="resume_on_audio_focus_gain_title">Resume on focus gain</string>
+    <string name="resume_on_audio_focus_gain_summary">Continue playing after interruptions (e.g. phone calls)</string>
 
     <string name="download_dialog_title">Download</string>
 
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 282aba918..a0c358c4d 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -64,6 +64,12 @@
             android:summary="@string/player_gesture_controls_summary"
             android:title="@string/player_gesture_controls_title"/>
 
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/resume_on_audio_focus_gain_key"
+            android:summary="@string/resume_on_audio_focus_gain_summary"
+            android:title="@string/resume_on_audio_focus_gain_title"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory