Snap: Fall back to REVIEW intent before VIEW intent

Change-Id: Ie8f1dac602957cb871d0f8c7043ac0f434f4bfac

1 files changed, 15 insertions, 1 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index ec794f2cb..d21013169 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -608,8 +608,22 @@ public class CameraActivity extends Activity
             intent.putExtra(KEY_TOTAL_NUMBER, (adapter.getTotalNumber() -1));
             startActivity(intent);
         } catch (ActivityNotFoundException ex) {
-            gotoViewPhoto(uri);
+            gotoReviewPhoto(uri);
         } catch (IllegalArgumentException ex) {
+            gotoReviewPhoto(uri);
+        }
+    }
+
+    private void gotoReviewPhoto(Uri uri) {
+        try {
+            Log.w(TAG, "Gallery not found");
+            Intent intent = new Intent(CameraUtil.REVIEW_ACTION, uri);
+            startActivity(intent);
+            intent.putExtra(KEY_FROM_SNAPCAM, true);
+            intent.putExtra(KEY_TOTAL_NUMBER, getDataAdapter().getTotalNumber() - 1);
+        } catch (ActivityNotFoundException e) {
+            gotoViewPhoto(uri);
+        } catch (IllegalArgumentException e) {
             gotoViewPhoto(uri);
         }
     }