Add support for XMediaNotificationTrackSelector

app/build.gradle

@@ -50,6 +50,7 @@ dependencies {
     compile 'com.squareup.okhttp:okhttp-urlconnection:2.3.0'
     compile 'com.squareup.okhttp:okhttp:2.3.0'
     compile 'com.google.code.gson:gson:2.3'
+    compile 'de.Maxr1998:track-selector-lib:1.1'
 
     compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') {
         transitive = true

app/src/main/AndroidManifest.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.naman14.timber">
 
+    <uses-sdk tools:overrideLibrary="de.Maxr1998.trackselectorlib" />
+
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

app/src/main/java/com/naman14/timber/MusicService.java

@@ -43,6 +43,7 @@
 import android.media.session.PlaybackState;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
@@ -78,6 +79,10 @@
 import java.util.Random;
 import java.util.TreeSet;
 
+import de.Maxr1998.trackselectorlib.ModNotInstalledException;
+import de.Maxr1998.trackselectorlib.NotificationHelper;
+import de.Maxr1998.trackselectorlib.TrackItem;
+
 @SuppressLint("NewApi")
 public class MusicService extends Service {
     public static final String PLAYSTATE_CHANGED = "com.naman14.timber.playstatechanged";
@@ -142,6 +147,10 @@ public class MusicService extends Service {
             MediaStore.Audio.Albums.ALBUM, MediaStore.Audio.Albums.ARTIST,
             MediaStore.Audio.Albums.LAST_YEAR
     };
+    private static final String[] NOTIFICATION_PROJECTION = new String[]{
+            "audio._id AS _id", AudioColumns.ALBUM_ID, AudioColumns.TITLE,
+            AudioColumns.ARTIST, AudioColumns.DURATION
+    };
     private static final Shuffler mShuffler = new Shuffler();
     private static final int NOTIFY_MODE_NONE = 0;
     private static final int NOTIFY_MODE_FOREGROUND = 1;
@@ -464,6 +473,11 @@ private void handleCommandIntent(Intent intent) {
 
         if (D) Log.d(TAG, "handleCommandIntent: action = " + action + ", command = " + command);
 
+        if (NotificationHelper.checkIntent(intent)) {
+            goToPosition(mPlayPos + NotificationHelper.getPosition(intent));
+            return;
+        }
+
         if (CMDNEXT.equals(command) || NEXT_ACTION.equals(action)) {
             gotoNext(true);
         } else if (CMDPREVIOUS.equals(command) || PREVIOUS_ACTION.equals(action)
@@ -1143,8 +1157,39 @@ private Notification buildNotification() {
         }
         if (artwork != null && TimberUtils.isLollipop())
             builder.setColor(Palette.from(artwork).generate().getVibrantColor(Color.parseColor("#403f4d")));
+        Notification n = builder.build();
 
-        return builder.build();
+        // Add Track Selector to notification
+        if (NotificationHelper.isSupported(n)) {
+            StringBuilder selection = new StringBuilder();
+            StringBuilder order = new StringBuilder().append("CASE _id \n");
+            for (int i = 0; i < mPlaylist.size(); i++) {
+                selection.append("_id=").append(mPlaylist.get(i).mId).append(" OR ");
+                order.append("WHEN ").append(mPlaylist.get(i).mId).append(" THEN ").append(i).append("\n");
+            }
+            order.append("END");
+            Cursor c = getContentResolver().query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, NOTIFICATION_PROJECTION, selection.substring(0, selection.length() - 3), null, order.toString());
+            if (c != null && c.getCount() != 0) {
+                c.moveToFirst();
+                ArrayList<Bundle> list = new ArrayList<>();
+                do {
+                    TrackItem t = new TrackItem()
+                            .setArt(ImageLoader.getInstance()
+                                    .loadImageSync(TimberUtils.getAlbumArtUri(c.getLong(c.getColumnIndexOrThrow(AudioColumns.ALBUM_ID))).toString()))
+                            .setTitle(c.getString(c.getColumnIndexOrThrow(AudioColumns.TITLE)))
+                            .setArtist(c.getString(c.getColumnIndexOrThrow(AudioColumns.ARTIST)))
+                            .setDuration(TimberUtils.makeShortTimeString(this, c.getInt(c.getColumnIndexOrThrow(AudioColumns.DURATION)) / 1000));
+                    list.add(t.get());
+                } while (c.moveToNext());
+                try {
+                    NotificationHelper.insertToNotification(n, list, this, getQueuePosition());
+                } catch (ModNotInstalledException e) {
+                    e.printStackTrace();
+                }
+                c.close();
+            }
+        }
+        return n;
     }
 
     private final PendingIntent retrievePlaybackAction(final String action) {
@@ -1861,6 +1906,30 @@ public void gotoNext(final boolean force) {
         }
     }
 
+    public void goToPosition(int pos) {
+        synchronized (this) {
+            if (mPlaylist.size() <= 0) {
+                if (D) Log.d(TAG, "No play queue");
+                scheduleDelayedShutdown();
+                return;
+            }
+            if (pos < 0) {
+                return;
+            }
+            if (pos == mPlayPos) {
+                if (!isPlaying()) {
+                    play();
+                }
+                return;
+            }
+            stop(false);
+            setAndRecordPlayPos(pos);
+            openCurrentAndNext();
+            play();
+            notifyChange(META_CHANGED);
+        }
+    }
+
     public void setAndRecordPlayPos(int nextPos) {
         synchronized (this) {
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha3'
+        classpath 'com.android.tools.build:gradle:2.0.0-alpha6'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Dec 31 18:07:01 IST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip