Merge pull request #307 from qccoders/android-photo-bug

Android app build 8

Author: jpdillingham

mobile/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.qccoders.qcvoc"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 7
-        versionName "0.7"
+        versionCode 8
+        versionName "0.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

mobile/app/release/app-release.apk

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"0.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"0.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

mobile/app/release/output.json

@@ -21,6 +21,15 @@
             </intent-filter>
         </activity>
         <activity android:name="com.google.android.gms.samples.vision.barcodereader.BarcodeCaptureActivity"/>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="org.qccoders.qcvoc.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths"></meta-data>
+        </provider>
     </application>
 
 </manifest>

mobile/app/src/main/AndroidManifest.xml

@@ -11,13 +11,14 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.graphics.Matrix;
 import android.net.Uri;
 import android.os.Environment;
-import android.os.StrictMode;
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.FileProvider;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Base64;
@@ -92,7 +93,7 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
 
                 if (query != null) {
                     String queryCommand = query.substring(0, query.indexOf('&'));
-                    callback = query.substring(query.indexOf('&') + 1);
+                    callback = query.substring(query.indexOf('=') + 1);
 
                     if (queryCommand.equals("scan")) {
                         scanBarcode();
@@ -132,15 +133,13 @@ public void takePhoto() {
     }
 
     private void captureImage() {
-        StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
-        StrictMode.setVmPolicy(builder.build());
-
         Intent cameraIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
         File photo;
         try
         {
             // place where to store camera taken picture
-            photo = File.createTempFile("photo", ".jpg", Environment.getExternalStorageDirectory());
+            File photoDir = getExternalFilesDir(Environment.DIRECTORY_PICTURES);
+            photo = File.createTempFile("photo", ".jpg", photoDir);
             photo.delete();
         }
         catch(Exception e)
@@ -149,7 +148,10 @@ private void captureImage() {
             Toast.makeText(this, "Error creating temporary file to store photo", Toast.LENGTH_LONG).show();
             return;
         }
-        mImageUri = Uri.fromFile(photo);
+
+        mImageUri = FileProvider.getUriForFile(this,
+                "org.qccoders.qcvoc.fileprovider",
+                photo);
         cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, mImageUri);
 
         startActivityForResult(cameraIntent, PHOTO_REQUEST);
@@ -192,7 +194,12 @@ private Bitmap transformPhoto(Bitmap bitmap) {
             );
         }
         // Scale down
-        return Bitmap.createScaledBitmap(bitmap, 300, 300, false);
+        bitmap = Bitmap.createScaledBitmap(bitmap, 300, 300, false);
+        // Rotate
+        Matrix matrix = new Matrix();
+        matrix.postRotate(90);
+        return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+
     }
 
     @Override
@@ -232,7 +239,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
             Log.d("MainActivity", "Photo of size " + photo.length() + " bytes taken");
             webview.evaluateJavascript(
-                    callback + "(" + photo + ")",
+                    callback + "('" + photo + "')",
                     null
             );
         }

mobile/app/src/main/java/org/qccoders/qcvoc/MainActivity.java

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="images" path="Android/data/org.qccoders.qcvoc/files/Pictures" />
+</paths>