From ac95bcdaf902921b763618e94985e282591f5c44 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Thu, 10 Mar 2016 17:10:13 -0800
Subject: Snap: Fall back to REVIEW intent before VIEW intent

Change-Id: Ie8f1dac602957cb871d0f8c7043ac0f434f4bfac
---
 src/com/android/camera/CameraActivity.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index e6e1ea4b1..ba79b1cbd 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -599,8 +599,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);
         }
     }
-- 
cgit v1.2.3