fixed leaking singleton

Author: TheHollidayInn

app/build.gradle

@@ -43,6 +43,10 @@ dependencies {
     compile 'com.github.pchmn:MaterialChipsInput:1.0.8'
     compile 'com.google.firebase:firebase-core:10.0.1'
     compile 'com.google.firebase:firebase-crash:10.0.1'
+
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+
     testCompile 'junit:junit:4.12'
 }
 

app/src/main/AndroidManifest.xml

@@ -11,7 +11,8 @@
         android:label="@string/app_name"
         android:roundIcon="@drawable/sedaily_logo"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:name=".SEDailyApplication">
 
         <activity android:name=".MainActivity">
             <intent-filter>

app/src/main/java/com/koalatea/thehollidayinn/softwareengineeringdaily/MainActivity.java

@@ -33,9 +33,13 @@
 
 public class MainActivity extends PlaybackControllerActivity implements SearchView.OnQueryTextListener {
     private UserRepository userRepository;
-    private RecentPodcastFragment firstFragment;
     private FilterRepository filterRepository;
 
+    private RecentPodcastFragment firstFragment;
+    private PodListFragment secondPage;
+    private PodListFragment thirdPage;
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -54,7 +58,9 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void showInitialPage () {
-        firstFragment = RecentPodcastFragment.newInstance();
+        if (firstFragment == null) {
+            firstFragment = RecentPodcastFragment.newInstance();
+        }
         this.getSupportFragmentManager()
                 .beginTransaction()
                 .replace(R.id.fragment_container, firstFragment)
@@ -80,17 +86,21 @@ private Boolean navigationItemSelected(@NonNull MenuItem item) {
                 showInitialPage();
                 break;
             case R.id.action_schedules:
-                PodListFragment second = PodListFragment.newInstance("Greatest Hits", "");
+                if (secondPage == null) {
+                    secondPage = PodListFragment.newInstance("Greatest Hits", "");
+                }
                 this.getSupportFragmentManager()
                         .beginTransaction()
-                        .replace(R.id.fragment_container, second)
+                        .replace(R.id.fragment_container, secondPage)
                         .commit();
                 break;
             case R.id.action_music:
-                PodListFragment third = PodListFragment.newInstance("Just For You", "");
+                if (thirdPage == null) {
+                    thirdPage = PodListFragment.newInstance("Just For You", "");
+                }
                 this.getSupportFragmentManager()
                         .beginTransaction()
-                        .replace(R.id.fragment_container, third)
+                        .replace(R.id.fragment_container, thirdPage)
                         .commit();
                 break;
         }

app/src/main/java/com/koalatea/thehollidayinn/softwareengineeringdaily/PlaybackControllerActivity.java

@@ -3,6 +3,7 @@
 import android.content.ComponentName;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.support.annotation.Nullable;
 import android.support.v4.media.MediaBrowserCompat;
 import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.session.MediaControllerCompat;
@@ -25,6 +26,9 @@ public class PlaybackControllerActivity extends AppCompatActivity {
     private MediaBrowserCompat mMediaBrowser;
     private PlaybackControlsFragment mControlsFragment;
 
+    private PlaybackStateCompat state;
+    private String mCurrentMediaId;
+
     private final MediaBrowserCompat.ConnectionCallback mConnectionCallbacks =
             new MediaBrowserCompat.ConnectionCallback() {
                 @Override
@@ -47,12 +51,10 @@ public void onConnectionFailed() {
                 }
             };
 
-    MediaControllerCompat.Callback controllerCallback =
+    private MediaControllerCompat.Callback controllerCallback =
             new MediaControllerCompat.Callback() {
                 @Override
                 public void onMetadataChanged(MediaMetadataCompat metadata) {
-                    if (metadata != null) {
-                    }
                 }
 
                 @Override
@@ -72,26 +74,37 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     protected void setUp() {
-        mMediaBrowser = new MediaBrowserCompat(this,
-                new ComponentName(this, MusicService.class),
-                mConnectionCallbacks,
-                null); // optional Bundle
+        if (mMediaBrowser == null) {
+            mMediaBrowser = new MediaBrowserCompat(this,
+                    new ComponentName(this, MusicService.class),
+                    mConnectionCallbacks,
+                    null); // optional Bundle
+        }
     }
 
     @Override
     public void onStart() {
         super.onStart();
-        mControlsFragment = (PlaybackControlsFragment) getSupportFragmentManager()
-                .findFragmentById(R.id.fragment_playback_controls);
+        if (mControlsFragment == null) {
+            mControlsFragment = (PlaybackControlsFragment) getSupportFragmentManager()
+                    .findFragmentById(R.id.fragment_playback_controls);
+        }
         mMediaBrowser.connect();
 
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (MediaControllerCompat.getMediaController(this) != null) {
+            MediaControllerCompat.getMediaController(this).unregisterCallback(controllerCallback);
+        }
+        mMediaBrowser.disconnect();
+    }
+
     @Override
     public void onResume() {
         super.onResume();
-
-
     }
 
     @Override
@@ -105,20 +118,17 @@ public void onStop() {
     }
 
     protected void showPlaybackControls() {
-//        if (NetworkHelper.isOnline(this)) {
+        // @TODO: check for network
         getSupportFragmentManager().beginTransaction()
-//                    .setCustomAnimations(
-//                            R.animator.slide_in_from_bottom, R.animator.slide_out_to_bottom,
-//                            R.animator.slide_in_from_bottom, R.animator.slide_out_to_bottom)
                 .show(mControlsFragment)
-                .commit();
-//        }
+                .commitAllowingStateLoss();
+
     }
 
     protected void hidePlaybackControls() {
         getSupportFragmentManager().beginTransaction()
                 .hide(mControlsFragment)
-                .commit();
+                .commitAllowingStateLoss();
     }
 
     /**
@@ -144,7 +154,7 @@ protected boolean shouldShowControls() {
         }
     }
 
-        private void connectToSession(MediaSessionCompat.Token token) throws RemoteException {
+    private void connectToSession(MediaSessionCompat.Token token) throws RemoteException {
         MediaControllerCompat mediaController = new MediaControllerCompat(
                 this, token);
 
@@ -161,4 +171,24 @@ private void connectToSession(MediaSessionCompat.Token token) throws RemoteExcep
             mControlsFragment.onConnected();
         }
     }
+
+    public void onMediaItemSelected(MediaBrowserCompat.MediaItem item, boolean isPlaying) {
+        if (item.isPlayable()) {
+            MediaControllerCompat controller = MediaControllerCompat.getMediaController(this);
+            MediaControllerCompat.TransportControls controls = controller.getTransportControls();
+
+            if (isPlaying) {
+                controls.pause();
+            } else {
+                controls.playFromMediaId(item.getMediaId(), null);
+            }
+        }
+    }
+
+    @Nullable
+    public String getPlayingMediaId() {
+        boolean isPlaying = state != null
+                && state.getState() == PlaybackStateCompat.STATE_PLAYING;
+        return isPlaying ? mCurrentMediaId : null;
+    }
 }

app/src/main/java/com/koalatea/thehollidayinn/softwareengineeringdaily/audio/MediaPlayer.java

@@ -50,7 +50,7 @@ public View onCreateView(LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
         View rootView =  (View) inflater.inflate(
                 R.layout.fragment_podcast_horizontal, container, false);
-
+        Log.v("keithtest", "onCreateView");
         RecyclerView recyclerView = (RecyclerView) rootView.findViewById(R.id.my_recycler_view);
 
         recyclerView.setHasFixedSize(true);

app/src/main/java/com/koalatea/thehollidayinn/softwareengineeringdaily/podcast/PodListFragment.java

@@ -3,18 +3,14 @@
 import android.content.Intent;
 import android.support.v4.app.Fragment;
 import android.support.v4.media.MediaBrowserCompat;
-import android.support.v4.media.MediaMetadataCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.koalatea.thehollidayinn.softwareengineeringdaily.R;
-import com.koalatea.thehollidayinn.softwareengineeringdaily.audio.MediaPlayer;
-import com.koalatea.thehollidayinn.softwareengineeringdaily.audio.MusicProvider;
 import com.koalatea.thehollidayinn.softwareengineeringdaily.data.models.Post;
 import com.squareup.picasso.Picasso;