am 0e3c85d4: Photoviewer should only compare paths when matching initialPhotoUri.

* commit '0e3c85d4c62529beed821252355c4a61e21c6070':
  Photoviewer should only compare paths when matching initialPhotoUri.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/com/android/ex/photo/PhotoViewActivity.java b/src/com/android/ex/photo/PhotoViewActivity.java
index 30bc916..9f0bc9f 100644
--- a/src/com/android/ex/photo/PhotoViewActivity.java
+++ b/src/com/android/ex/photo/PhotoViewActivity.java
@@ -310,7 +310,7 @@ public class PhotoViewActivity extends FragmentActivity implements
     }
 
     @Override
-    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+    public void onLoadFinished(final Loader<Cursor> loader, final Cursor data) {
         final int id = loader.getId();
         if (id == LOADER_PHOTO_LIST) {
             if (data == null || data.getCount() == 0) {
@@ -320,10 +320,15 @@ public class PhotoViewActivity extends FragmentActivity implements
 
                 if (mInitialPhotoUri != null) {
                     int index = 0;
-                    int uriIndex = data.getColumnIndex(PhotoContract.PhotoViewColumns.URI);
+                    final int uriIndex = data.getColumnIndex(PhotoContract.PhotoViewColumns.URI);
                     while (data.moveToNext()) {
-                        String uri = data.getString(uriIndex);
-                        if (TextUtils.equals(uri, mInitialPhotoUri)) {
+                        final String uriString = data.getString(uriIndex);
+
+                        // Clear query params. Compare only the path.
+                        final Uri initialPhotoUri = Uri.parse(mInitialPhotoUri).buildUpon()
+                                .clearQuery().build();
+                        final Uri uri = Uri.parse(uriString).buildUpon().clearQuery().build();
+                        if (initialPhotoUri != null && initialPhotoUri.equals(uri)) {
                             mInitialPhotoUri = null;
                             mPhotoIndex = index;
                             break;