Fix camera on dismiss popup

openfoodfacts · Apr 25, 2016 · eeed6ed · eeed6ed
1 parent 44b5f2f
commit eeed6ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...src/main/java/openfoodfacts/github/scrachx/openfood/fragments/BarCodeScannerFragment.java b/...src/main/java/openfoodfacts/github/scrachx/openfood/fragments/BarCodeScannerFragment.java
@@ -169,7 +169,7 @@ public void setupFormats() {
 
     private void goToProduct(Result rawResult, ZXingScannerView scannerView) {
         FoodAPIRestClientUsage api = new FoodAPIRestClientUsage();
-        api.getProduct(rawResult.getText(), getActivity(), scannerView);
+        api.getProduct(rawResult.getText(), getActivity(), scannerView, this);
     }
 
     @Override

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/models/FoodAPIRestClientUsage.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/models/FoodAPIRestClientUsage.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.Toast;
@@ -28,7 +29,7 @@
 
 public class FoodAPIRestClientUsage {
 
-    public void getProduct(final String barcode, final Activity activity, final ZXingScannerView scannerView){
+    public void getProduct(final String barcode, final Activity activity, final ZXingScannerView scannerView, final ZXingScannerView.ResultHandler rs){
         FoodAPIRestClient.getAsync("/api/v0/produit/"+barcode+".json", null, new AsyncHttpResponseHandler() {
 
             LoadToast lt = new LoadToast(activity);
@@ -59,15 +60,18 @@ public void onSuccess(int statusCode, cz.msebera.android.httpclient.Header[] hea
                                 .callback(new MaterialDialog.ButtonCallback() {
                                     @Override
                                     public void onPositive(MaterialDialog dialog) {
+                                        SharedPreferences settings = activity.getSharedPreferences("temp", 0);
+                                        SharedPreferences.Editor editor = settings.edit();
+                                        editor.putString("barcode", barcode);
+                                        editor.apply();
                                         Intent intent = new Intent(activity, SaveProductOfflineActivity.class);
-                                        intent.putExtra("barcode",barcode);
                                         activity.startActivity(intent);
                                         activity.finish();
                                     }
 
                                     @Override
                                     public void onNegative(MaterialDialog dialog) {
-                                        scannerView.startCamera();
+                                        scannerView.resumeCameraPreview(rs);
                                         return;
                                     }
                                 })