[android] cleanup, notes.

frostwire · Feb 8, 2016 · 4bbacdd · 4bbacdd
1 parent 81e3e38
commit 4bbacdd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/android/apollo/src/com/andrew/apollo/ui/activities/BaseActivity.java b/android/apollo/src/com/andrew/apollo/ui/activities/BaseActivity.java
@@ -186,8 +186,6 @@ public boolean onCreateOptionsMenu(final Menu menu) {
         // Theme the search icon
         mResources.setSearchIcon(menu);
 
-        //getMenuInflater().inflate(R.menu.new_playlist, menu);
-
         final SearchView searchView = (SearchView)menu.findItem(R.id.menu_search).getActionView();
         // Add voice search
         final SearchManager searchManager = (SearchManager)getSystemService(Context.SEARCH_SERVICE);
@@ -443,7 +441,7 @@ private final static class PlaybackStatus extends BroadcastReceiver {
          * Constructor of <code>PlaybackStatus</code>
          */
         public PlaybackStatus(final BaseActivity activity) {
-            mReference = new WeakReference<BaseActivity>(activity);
+            mReference = new WeakReference<>(activity);
         }
 
         /**

diff --git a/android/apollo/src/com/andrew/apollo/ui/activities/ProfileActivity.java b/android/apollo/src/com/andrew/apollo/ui/activities/ProfileActivity.java
@@ -43,7 +43,6 @@
 import com.andrew.apollo.widgets.ProfileTabCarousel;
 import com.andrew.apollo.widgets.ProfileTabCarousel.Listener;
 import com.frostwire.android.R;
-import com.frostwire.android.gui.adapters.menu.CreateNewPlaylistMenuAction;
 
 /**
  * The {@link Activity} is used to display the data for specific
@@ -145,7 +144,9 @@ public void onClick(final View v) {
         });
         // Set up the action bar
         final ActionBar actionBar = getActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
 
         /* Set up the artist profile */
         if (isArtist()) {
@@ -307,6 +308,10 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 return true;
 
             case FragmentMenuItems.PLAYLIST_SELECTED: {
+                // TODO: Possibly refactor this entire block to just use
+                //       getIntent().getLongArrayExtra(Config.TRACKS)
+                //       Not sure yet if it'll work for all cases.
+
                 // Add to existing playlist or to new playlist
                 if (isAlbum()) {
                     long playlistId = -1;
@@ -315,6 +320,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                         playlistId = item.getIntent().getLongExtra("playlist", -1);
                     }
 
+                    // TODO: ReDo this by passing list of tracks to Activity on intent.
                     System.out.println("It is an album! Add it to playlist id.");
                     if (playlistId != -1) {
                         System.out.println("playlist we're adding to: " + playlistId);
@@ -335,7 +341,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                     return true;
 
                 } else if (isArtist()){
-
+                      // TODO:
                 }
                 return true;
             }