Merge branch 'dev' into commentsAndRelatedUx

app/src/main/java/org/schabi/newpipe/player/AudioServiceLeakFix.java

@@ -0,0 +1,30 @@
+package org.schabi.newpipe.player;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+
+/**
+ * Fixes a leak caused by AudioManager using an Activity context.
+ * Tracked at https://android-review.googlesource.com/#/c/140481/1 and
+ * https://github.com/square/leakcanary/issues/205
+ * Source:
+ * https://gist.github.com/jankovd/891d96f476f7a9ce24e2
+ */
+public class AudioServiceLeakFix extends ContextWrapper {
+
+	AudioServiceLeakFix(Context base) {
+		super(base);
+	}
+
+	public static ContextWrapper preventLeakOf(Context base) {
+		return new AudioServiceLeakFix(base);
+	}
+
+	@Override
+	public Object getSystemService(String name) {
+		if (Context.AUDIO_SERVICE.equals(name)) {
+			return getApplicationContext().getSystemService(name);
+		}
+		return super.getSystemService(name);
+	}
+}

app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java

@@ -130,6 +130,11 @@ public final class BackgroundPlayer extends Service {
         onClose();
     }
 
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(AudioServiceLeakFix.preventLeakOf(base));
+    }
+
     @Override
     public IBinder onBind(Intent intent) {
         return mBinder;

app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java

@@ -241,6 +241,11 @@ public final class MainVideoPlayer extends AppCompatActivity
         isBackPressed = false;
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(AudioServiceLeakFix.preventLeakOf(newBase));
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // State Saving
     //////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

@@ -181,6 +181,11 @@ public final class PopupVideoPlayer extends Service {
         closePopup();
     }
 
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(AudioServiceLeakFix.preventLeakOf(base));
+    }
+
     @Override
     public IBinder onBind(Intent intent) {
         return mBinder;