summaryrefslogtreecommitdiff
path: root/sample/src/main/java/example/zxing/MainActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'sample/src/main/java/example/zxing/MainActivity.java')
-rw-r--r--sample/src/main/java/example/zxing/MainActivity.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java
index 9c879278..99a3b620 100644
--- a/sample/src/main/java/example/zxing/MainActivity.java
+++ b/sample/src/main/java/example/zxing/MainActivity.java
@@ -128,8 +128,14 @@ public class MainActivity extends AppCompatActivity {
IntentResult result = IntentIntegrator.parseActivityResult(resultCode, data);
if(result.getContents() == null) {
- Log.d("MainActivity", "Cancelled scan");
- Toast.makeText(this, "Cancelled", Toast.LENGTH_LONG).show();
+ Intent originalIntent = result.getOriginalIntent();
+ if (originalIntent == null) {
+ Log.d("MainActivity", "Cancelled scan");
+ Toast.makeText(this, "Cancelled", Toast.LENGTH_LONG).show();
+ } else if(originalIntent.hasExtra(Intents.Scan.MISSING_CAMERA_PERMISSION)) {
+ Log.d("MainActivity", "Cancelled scan due to missing camera permission");
+ Toast.makeText(this, "Cancelled due to missing camera permission", Toast.LENGTH_LONG).show();
+ }
} else {
Log.d("MainActivity", "Scanned");
Toast.makeText(this, "Scanned: " + result.getContents(), Toast.LENGTH_LONG).show();