Revert "Refactoring"

This reverts commit 004b37d16c.

app/src/main/java/eu/faircode/email/AdapterMedia.java

@@ -282,7 +282,7 @@ public class AdapterMedia extends RecyclerView.Adapter<AdapterMedia.ViewHolder>
                         if (MediaPlayerHelper.isPlaying(uri))
                             MediaPlayerHelper.stopMusic(context);
                         else
-                            MediaPlayerHelper.startMusic(context, owner, uri,
+                            MediaPlayerHelper.startMusic(context, uri,
                                     new RunnableEx("player") {
                                         @Override
                                         public void delegate() {
@@ -390,6 +390,7 @@ public class AdapterMedia extends RecyclerView.Adapter<AdapterMedia.ViewHolder>
             @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
             public void onDestroyed() {
                 Log.d(AdapterMedia.this + " parent destroyed");
+                MediaPlayerHelper.stopMusic(context);
                 AdapterMedia.this.parentFragment = null;
                 owner.getLifecycle().removeObserver(this);
             }

app/src/main/java/eu/faircode/email/MediaPlayerHelper.java

@@ -161,7 +161,7 @@ public class MediaPlayerHelper {
         }
     }
 
-    static void startMusic(Context context, LifecycleOwner owner, Uri uri, Runnable onCompleted) throws IOException {
+    static void startMusic(Context context, Uri uri, Runnable onCompleted) throws IOException {
         synchronized (lock) {
             stopMusic(context);
 
@@ -192,14 +192,6 @@ public class MediaPlayerHelper {
             });
             MediaPlayerHelper.player.prepareAsync();
         }
-
-        owner.getLifecycle().addObserver(new LifecycleObserver() {
-            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-            public void onDestroyed() {
-                MediaPlayerHelper.stopMusic(context);
-                owner.getLifecycle().removeObserver(this);
-            }
-        });
     }
 
     static void stopMusic(Context context) {