- Updated to latest version of Google Play Services

- Added permissions check

Author: Gnzlt

AndroidVisionQRReader/build.gradle

@@ -20,6 +20,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile 'com.android.support:appcompat-v7:23.0.+'
-    compile 'com.google.android.gms:play-services-vision:7.8.+'
+    compile 'com.android.support:appcompat-v7:23.1.+'
+    compile 'com.google.android.gms:play-services-vision:8.1.+'
 }

AndroidVisionQRReader/src/main/AndroidManifest.xml

@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gnzlt.AndroidVisionQRReader">
+<manifest
+    package="com.gnzlt.AndroidVisionQRReader"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.CAMERA"/>
 
     <meta-data
         android:name="com.google.android.gms.vision.DEPENDENCIES"
-        android:value="barcode" />
+        android:value="barcode"/>
 
     <application
         android:label="@string/app_name">
         <activity
             android:name=".QRActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            android:label="@string/app_name"
+            android:launchMode="singleTask">
         </activity>
     </application>
 

AndroidVisionQRReader/src/main/java/com/gnzlt/AndroidVisionQRReader/QRActivity.java

@@ -1,12 +1,18 @@
 package com.gnzlt.AndroidVisionQRReader;
 
+import android.Manifest;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.media.AudioManager;
 import android.media.ToneGenerator;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.util.SparseArray;
+import android.widget.Toast;
 
 import com.gnzlt.AndroidVisionQRReader.camera.CameraSourcePreview;
 import com.google.android.gms.vision.CameraSource;
@@ -20,6 +26,7 @@ public class QRActivity extends AppCompatActivity {
 
     private static final String TAG = "QRActivity";
     public static final String EXTRA_QR_RESULT = "EXTRA_QR_RESULT";
+    private static final int PERMISSIONS_REQUEST = 100;
 
     private BarcodeDetector mBarcodeDetector;
     private CameraSource mCameraSource;
@@ -32,14 +39,41 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mPreview = (CameraSourcePreview) findViewById(R.id.cameraSourcePreview);
 
-        setupBarcodeDetector();
-        setupCameraSource();
+        if (isPermissionGranted()) {
+            setupBarcodeDetector();
+            setupCameraSource();
+        } else {
+            requestPermission();
+        }
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        startCameraSource();
+        if (isPermissionGranted())
+            startCameraSource();
+    }
+
+    private boolean isPermissionGranted() {
+        return ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPermission() {
+        ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA}, PERMISSIONS_REQUEST);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode == PERMISSIONS_REQUEST) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+                    recreate();
+                }
+            } else {
+                Toast.makeText(this, "This application needs Camera permission to read QR codes", Toast.LENGTH_SHORT).show();
+                finish();
+            }
+        }
     }
 
     private void setupBarcodeDetector() {
@@ -50,7 +84,7 @@ private void setupBarcodeDetector() {
         mBarcodeDetector.setProcessor(new Detector.Processor<Barcode>() {
             @Override
             public void release() {
-                
+
             }
 
             @Override
@@ -81,6 +115,7 @@ private void setupCameraSource() {
     }
 
     private void startCameraSource() {
+        Log.d(TAG, "Camera Source started");
         if (mCameraSource != null) {
             try {
                 mPreview.start(mCameraSource);

app/build.gradle

@@ -21,6 +21,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.0.+'
+    compile 'com.android.support:appcompat-v7:23.1.+'
     compile project(':AndroidVisionQRReader')
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.qrtest">
+<manifest package="com.example.qrtest"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@mipmap/ic_launcher"
@@ -10,19 +10,11 @@
             android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-
-        <activity
-            android:name="com.gnzlt.AndroidVisionQRReader.QRActivity"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.example.qrtest.MainActivity" />
-        </activity>
     </application>
 
 </manifest>