From ac3dbb0caca83960777dc9fd15ba6a66685c1c4f Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Sat, 21 Jul 2012 00:56:44 +0200
Subject: [PATCH] Fix Issue 5547: Apollo will not play MP3 files when using
 Root Explorer

Apollo doesn't have an activity registered for support "file" schemas, that are used by file
managers when using the method setDataAndType of Intent class.

This changes adds a new activity (PlayExternal) that registers this kind of schema, and pass
the request to AudioPlayerHolder. Allow direct play the file, or enqueue in the current track list

Patch 2: Remove trailing white-spaces
         Rename removeAllTrack to removeAllTracks

Change-Id: I25b728700bd0d2d58d31e4de4bed81ee3e368e0a
---
 AndroidManifest.xml                                |  21 +++
 res/values/strings.xml                             |   7 +
 res/values/styles.xml                              |  14 ++
 src/com/andrew/apollo/IApolloService.aidl          |   1 +
 .../apollo/activities/AudioPlayerHolder.java       |  15 +-
 src/com/andrew/apollo/activities/PlayExternal.java | 193 +++++++++++++++++++++
 src/com/andrew/apollo/adapters/PagerAdapter.java   |  13 ++
 .../apollo/list/fragments/TracksFragment.java      |  13 +-
 src/com/andrew/apollo/service/ApolloService.java   |  61 ++++++-
 src/com/andrew/apollo/utils/MusicUtils.java        |  15 ++
 .../andrew/apollo/utils/RefreshableFragment.java   |  31 ++++
 11 files changed, 377 insertions(+), 7 deletions(-)
 create mode 100755 src/com/andrew/apollo/activities/PlayExternal.java
 create mode 100644 src/com/andrew/apollo/utils/RefreshableFragment.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f4633bb..b8c4989 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,6 +92,27 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+        <!-- Play External File -->
+        <activity
+            android:name=".activities.PlayExternal"
+            android:clearTaskOnLaunch="true"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.Light.Translucent"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="file" />
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="application/ogg" />
+                <data android:mimeType="application/x-ogg" />
+                <data android:mimeType="application/itunes" />
+            </intent-filter>
+        </activity>
         <!-- Track browser -->
         <activity
             android:name=".activities.TracksBrowser"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 48ce696..3c103d8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -128,6 +128,13 @@
     <string name="tab_playlists">PLAYLISTS</string>
     <string name="tab_genres">GENRES</string>
 
+    <!-- External file dialog -->
+    <string name="play_external_question_msg">Select the action to apply to: \n\n<b><xliff:g id="name">%s</xliff:g></b></string>
+    <string name="play_external_question_button_play">Play</string>
+    <string name="play_external_question_button_queue">Enqueue</string>
+    <string name="play_external_question_button_cancel">Cancel</string>
+    <string name="play_external_error">Failed to play file</string>
+
     <!-- Something went wrong -->
     <string name="error">Error</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b537ff6..294d44e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- Translucent dialog (for @PlayExternal) -->
+    <style name="Theme.Light.Translucent" parent="android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+    </style>
+    <style name="Theme.Light.Translucent.Dialog" parent="@android:style/Theme.Holo.Light.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
     <!-- Custom tabs -->
     <style name="Tabs">
         <item name="android:layout_width">wrap_content</item>
diff --git a/src/com/andrew/apollo/IApolloService.aidl b/src/com/andrew/apollo/IApolloService.aidl
index b44edef..b3a9b39 100644
--- a/src/com/andrew/apollo/IApolloService.aidl
+++ b/src/com/andrew/apollo/IApolloService.aidl
@@ -6,6 +6,7 @@ interface IApolloService
 {
     void openFile(String path);
     void open(in long [] list, int position);
+    long getIdFromPath(String path);
     int getQueuePosition();
     boolean isPlaying();
     void stop();
diff --git a/src/com/andrew/apollo/activities/AudioPlayerHolder.java b/src/com/andrew/apollo/activities/AudioPlayerHolder.java
index ef6eee8..3911684 100644
--- a/src/com/andrew/apollo/activities/AudioPlayerHolder.java
+++ b/src/com/andrew/apollo/activities/AudioPlayerHolder.java
@@ -61,6 +61,8 @@ public class AudioPlayerHolder extends FragmentActivity implements ServiceConnec
 
     private static final int EFFECTS_PANEL = 0;
 
+    private PagerAdapter mPagerAdapter;
+
     @Override
     protected void onCreate(Bundle icicle) {
         // For the theme chooser and overflow MenuItem
@@ -91,6 +93,17 @@ public class AudioPlayerHolder extends FragmentActivity implements ServiceConnec
     }
 
     @Override
+    protected void onNewIntent(Intent intent) {
+        // If an activity is requesting access to this activity, and
+        // the activity is in the stack, the the fragments may need
+        // be refreshed. Update the page adapter
+        if (mPagerAdapter != null) {
+            mPagerAdapter.refresh();
+        }
+        super.onNewIntent(intent);
+    }
+
+    @Override
     public void onServiceConnected(ComponentName name, IBinder obj) {
         MusicUtils.mService = IApolloService.Stub.asInterface(obj);
     }
@@ -264,7 +277,7 @@ public class AudioPlayerHolder extends FragmentActivity implements ServiceConnec
      */
     public void initPager() {
         // Initiate PagerAdapter
-        PagerAdapter mPagerAdapter = new PagerAdapter(getSupportFragmentManager());
+        mPagerAdapter = new PagerAdapter(getSupportFragmentManager());
         Bundle bundle = new Bundle();
         bundle.putString(MIME_TYPE, Audio.Playlists.CONTENT_TYPE);
         bundle.putLong(BaseColumns._ID, PLAYLIST_QUEUE);
diff --git a/src/com/andrew/apollo/activities/PlayExternal.java b/src/com/andrew/apollo/activities/PlayExternal.java
new file mode 100755
index 0000000..c6c87d8
--- /dev/null
+++ b/src/com/andrew/apollo/activities/PlayExternal.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2012 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.andrew.apollo.activities;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ComponentName;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.v4.app.FragmentActivity;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.andrew.apollo.IApolloService;
+import com.andrew.apollo.R;
+import com.andrew.apollo.service.ServiceToken;
+import com.andrew.apollo.utils.MusicUtils;
+
+import java.io.File;
+import java.net.URLDecoder;
+
+/**
+ * An activity that lets external browsers launching music inside Apollo
+ */
+public class PlayExternal extends FragmentActivity
+    implements ServiceConnection, DialogInterface.OnCancelListener {
+
+    private static final String TAG = "PlayExternal";
+
+    private ServiceToken mToken;
+    private Uri mUri;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Get the external file to play
+        Intent intent = getIntent();
+        if (intent == null) {
+            finish();
+            return;
+        }
+        mUri = intent.getData();
+        if (mUri == null) {
+            finish();
+            return;
+        }
+    }
+
+    @Override
+    public void onServiceConnected(ComponentName name, IBinder obj) {
+        MusicUtils.mService = IApolloService.Stub.asInterface(obj);
+        play(this.mUri);
+    }
+
+    @Override
+    public void onServiceDisconnected(ComponentName name) {
+        MusicUtils.mService = null;
+    }
+
+    @Override
+    protected void onStart() {
+        // Bind to Service
+        mToken = MusicUtils.bindToService(this, this);
+        super.onStart();
+    }
+
+    @Override
+    protected void onStop() {
+        // Unbind
+        if (MusicUtils.mService != null)
+            MusicUtils.unbindFromService(mToken);
+        super.onStop();
+    }
+
+    private void play(Uri uri) {
+        try {
+            final String file = URLDecoder.decode( uri.toString(), "UTF-8");
+            final String name = new File(file).getName();
+
+            // Try to resolve the file to a media id
+            final long id = MusicUtils.mService.getIdFromPath(file);
+            if( id == -1 ) {
+                // Open the stream, But we will not have album information
+                openFile(file);
+            }
+            else {
+                // Show a dialog asking the user for play or queue the song
+                AlertDialog.Builder builder =
+                        new AlertDialog.Builder(this, R.style.Theme_Light_Translucent_Dialog);
+                builder.setTitle(R.string.app_name);
+                builder.setMessage(getString(R.string.play_external_question_msg, name));
+
+                DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        try {
+                            switch (which) {
+                                case DialogInterface.BUTTON_POSITIVE:
+                                    playOrEnqueuFile(file, id, false);
+                                    break;
+
+                                case DialogInterface.BUTTON_NEUTRAL:
+                                    playOrEnqueuFile(file, id, true);
+                                    break;
+
+                                case DialogInterface.BUTTON_NEGATIVE:
+                                    break;
+
+                                default:
+                                    break;
+                            }
+                        } finally {
+                            finish();
+                        }
+                    }
+                };
+                builder.setPositiveButton(R.string.play_external_question_button_play, listener);
+                builder.setNeutralButton(R.string.play_external_question_button_queue, listener);
+                builder.setNegativeButton(R.string.play_external_question_button_cancel, listener);
+
+                Dialog dialog = builder.create();
+                dialog.setOnCancelListener(this);
+                dialog.show();
+            }
+
+        } catch (Exception e) {
+            Toast.makeText(
+                    getApplicationContext(),
+                    R.string.play_external_error,
+                    Toast.LENGTH_SHORT);
+            Log.e(TAG, String.format("Failed to play external file: ", uri.toString()), e);
+            try {
+                Thread.sleep(1000L);
+            }catch (Exception e2) {}
+            finish();
+        }
+
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        finish();
+    }
+
+    private void playOrEnqueuFile(String file, long id, boolean enqueue) {
+        final long[] list = new long[] {id};
+        if (!enqueue) {
+            //Remove the actual queue
+            MusicUtils.removeAllTracks();
+            MusicUtils.playAll(getApplicationContext(), list, 0);
+        }
+        else {
+            MusicUtils.addToCurrentPlaylist(getApplicationContext(), list);
+        }
+
+        // Show now playing
+        Intent intent = new Intent(this, AudioPlayerHolder.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+    }
+
+    private void openFile(String file) throws RemoteException {
+        // Stop, load and play
+        MusicUtils.mService.stop();
+        MusicUtils.mService.openFile(file);
+        MusicUtils.mService.play();
+
+        // Show now playing
+        Intent nowPlayingIntent = new Intent(this, AudioPlayerHolder.class);
+        startActivity(nowPlayingIntent);
+    }
+
+}
diff --git a/src/com/andrew/apollo/adapters/PagerAdapter.java b/src/com/andrew/apollo/adapters/PagerAdapter.java
index 263a875..ca61087 100644
--- a/src/com/andrew/apollo/adapters/PagerAdapter.java
+++ b/src/com/andrew/apollo/adapters/PagerAdapter.java
@@ -10,6 +10,8 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 
+import com.andrew.apollo.utils.RefreshableFragment;
+
 /**
  * @author Andrew Neal
  */
@@ -36,4 +38,15 @@ public class PagerAdapter extends FragmentPagerAdapter {
         return mFragments.get(position);
     }
 
+    /**
+     * This method update the fragments that extends the {@link RefreshableFragment} class
+     */
+    public void refresh() {
+        for (int i = 0; i < mFragments.size(); i++) {
+            if( mFragments.get(i) instanceof RefreshableFragment ) {
+                ((RefreshableFragment)mFragments.get(i)).refresh();
+            }
+        }
+    }
+
 }
diff --git a/src/com/andrew/apollo/list/fragments/TracksFragment.java b/src/com/andrew/apollo/list/fragments/TracksFragment.java
index 3f8e39d..8f46dd1 100644
--- a/src/com/andrew/apollo/list/fragments/TracksFragment.java
+++ b/src/com/andrew/apollo/list/fragments/TracksFragment.java
@@ -19,7 +19,6 @@ import android.provider.MediaStore.Audio.AudioColumns;
 import android.provider.MediaStore.Audio.Genres;
 import android.provider.MediaStore.Audio.Playlists;
 import android.provider.MediaStore.MediaColumns;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
@@ -42,6 +41,7 @@ import com.andrew.apollo.adapters.TrackAdapter;
 import com.andrew.apollo.service.ApolloService;
 import com.andrew.apollo.utils.ApolloUtils;
 import com.andrew.apollo.utils.MusicUtils;
+import com.andrew.apollo.utils.RefreshableFragment;
 
 import static com.andrew.apollo.Constants.EXTERNAL;
 import static com.andrew.apollo.Constants.INTENT_ADD_TO_PLAYLIST;
@@ -53,7 +53,7 @@ import static com.andrew.apollo.Constants.PLAYLIST_QUEUE;
 /**
  * @author Andrew Neal
  */
-public class TracksFragment extends Fragment implements LoaderCallbacks<Cursor>,
+public class TracksFragment extends RefreshableFragment implements LoaderCallbacks<Cursor>,
         OnItemClickListener {
 
     // Adapter
@@ -116,6 +116,14 @@ public class TracksFragment extends Fragment implements LoaderCallbacks<Cursor>,
     }
 
     @Override
+    public void refresh() {
+        // The data need to be refreshed
+        if( mListView != null ) {
+            getLoaderManager().restartLoader(0, null, this);
+        }
+    }
+
+    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.listview, container, false);
         mListView = (ListView)root.findViewById(android.R.id.list);
@@ -269,6 +277,7 @@ public class TracksFragment extends Fragment implements LoaderCallbacks<Cursor>,
             mAlbumIndex = data.getColumnIndexOrThrow(AudioColumns.ALBUM);
         }
         mTrackAdapter.changeCursor(data);
+        mListView.invalidateViews();
         mCursor = data;
     }
 
diff --git a/src/com/andrew/apollo/service/ApolloService.java b/src/com/andrew/apollo/service/ApolloService.java
index bbccfcd..b521ab3 100644
--- a/src/com/andrew/apollo/service/ApolloService.java
+++ b/src/com/andrew/apollo/service/ApolloService.java
@@ -1130,10 +1130,16 @@ public class ApolloService extends Service {
                     where = null;
                     selectionArgs = null;
                 } else {
+                    // Remove schema for search in the database
+                    // Otherwise the file will not found
+                    String data = path;
+                    if( data.startsWith("file://") ){
+                        data = data.substring(7);
+                    }
                     uri = MediaStore.Audio.Media.getContentUriForPath(path);
                     where = MediaColumns.DATA + "=?";
                     selectionArgs = new String[] {
-                        path
+                        data
                     };
                 }
 
@@ -1178,6 +1184,48 @@ public class ApolloService extends Service {
     }
 
     /**
+     * Method that query the media database for search a path an translate
+     * to the internal media id
+     *
+     * @param path The path to search
+     * @return long The id of the resource, or -1 if not found
+     */
+    public long getIdFromPath(String path) {
+        try {
+            // Remove schema for search in the database
+            // Otherwise the file will not found
+            String data = path;
+            if( data.startsWith("file://") ){
+                data = data.substring(7);
+            }
+            ContentResolver resolver = getContentResolver();
+            String where = MediaColumns.DATA + "=?";
+            String selectionArgs[] = new String[] {
+                data
+            };
+            Cursor cursor =
+                    resolver.query(
+                            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                            mCursorCols, where, selectionArgs, null);
+            try {
+                if (cursor == null || cursor.getCount() == 0) {
+                    return -1;
+                }
+                cursor.moveToNext();
+                return cursor.getLong(IDCOLIDX);
+            } finally {
+                try {
+                    if( cursor != null )
+                        cursor.close();
+                } catch (Exception ex) {
+                }
+            }
+        } catch (UnsupportedOperationException ex) {
+        }
+        return -1;
+    }
+
+    /**
      * Starts playback of a previously opened file.
      */
     public void play() {
@@ -1801,7 +1849,7 @@ public class ApolloService extends Service {
     public String getArtistName() {
         synchronized (this) {
             if (mCursor == null) {
-                return null;
+                return getString(R.string.unknown);
             }
             return mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST));
         }
@@ -1819,7 +1867,7 @@ public class ApolloService extends Service {
     public String getAlbumName() {
         synchronized (this) {
             if (mCursor == null) {
-                return null;
+                return getString(R.string.unknown);
             }
             return mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ALBUM));
         }
@@ -1837,7 +1885,7 @@ public class ApolloService extends Service {
     public String getTrackName() {
         synchronized (this) {
             if (mCursor == null) {
-                return null;
+                return getString(R.string.unknown);
             }
             return mCursor.getString(mCursor.getColumnIndexOrThrow(MediaColumns.TITLE));
         }
@@ -2117,6 +2165,11 @@ public class ApolloService extends Service {
         }
 
         @Override
+        public long getIdFromPath(String path) {
+            return mService.get().getIdFromPath(path);
+        }
+
+        @Override
         public int getQueuePosition() {
             return mService.get().getQueuePosition();
         }
diff --git a/src/com/andrew/apollo/utils/MusicUtils.java b/src/com/andrew/apollo/utils/MusicUtils.java
index 3d899f0..13f91fa 100644
--- a/src/com/andrew/apollo/utils/MusicUtils.java
+++ b/src/com/andrew/apollo/utils/MusicUtils.java
@@ -920,6 +920,21 @@ public class MusicUtils {
     }
 
     /**
+     * Method that removes all tracks from the current queue
+     */
+    public static void removeAllTracks() {
+        try {
+            if (mService == null) {
+                long[] current = MusicUtils.getQueue();
+                if (current != null) {
+                    mService.removeTracks(0, current.length-1);
+                }
+            }
+        } catch (RemoteException e) {
+        }
+    }
+
+    /**
      * @param id
      * @return removes track from a playlist
      */
diff --git a/src/com/andrew/apollo/utils/RefreshableFragment.java b/src/com/andrew/apollo/utils/RefreshableFragment.java
new file mode 100644
index 0000000..2d2249f
--- /dev/null
+++ b/src/com/andrew/apollo/utils/RefreshableFragment.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.andrew.apollo.utils;
+
+
+import android.support.v4.app.Fragment;
+
+/**
+ * An abstract class that defines a {@link Fragment} like refreshable
+ */
+public abstract class RefreshableFragment extends Fragment {
+
+    /**
+     * Method invoked when the fragment need to be refreshed
+     */
+    public abstract void refresh();
+}
-- 
2.11.0