From 96f859a57a509396d6d9192c7150b77733394108 Mon Sep 17 00:00:00 2001
From: Christophe BOUCAUT <christophe.boucaut@geneanet.org>
Date: Mon, 12 Jan 2015 10:28:43 +0100
Subject: [PATCH] =?UTF-8?q?On=20donne=20la=20possibili=C3=A9=20de=20lancer?=
 =?UTF-8?q?=20le=20plugin=20sans=20background.=20On=20masque=20la=20barre?=
 =?UTF-8?q?=20d'opacit=C3=A9=20et=20le=20bouton=20miniature.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/android/CameraLauncher.java               | 26 ++++++++++---------
 .../geneanet/customcamera/CameraActivity.java |  7 ++++-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index 30cbbc4..f995f9d 100644
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -34,20 +34,22 @@ public class CameraLauncher extends CordovaPlugin {
 
             Intent intent = new Intent(this.cordova.getActivity(), CameraActivity.class);
 
-            byte[] imgBackgroundBase64;
-            try {
-                imgBackgroundBase64 = Base64.decode(args.getString(0), Base64.NO_WRAP);
-            } catch (IllegalArgumentException e) {
-                this.callbackContext.error(
-                    generateError(
-                        CameraLauncher.RESULT_ERROR,
-                        "Error decode base64 picture."
-                    )
-                );
+            if (args.getString(0) != "null") {
+                byte[] imgBackgroundBase64;
+                try {
+                    imgBackgroundBase64 = Base64.decode(args.getString(0), Base64.NO_WRAP);
+                } catch (IllegalArgumentException e) {
+                    this.callbackContext.error(
+                        generateError(
+                            CameraLauncher.RESULT_ERROR,
+                            "Error decode base64 picture."
+                        )
+                    );
 
-                return false;
+                    return false;
+                }
+                TransferBigData.setImgBackgroundBase64(imgBackgroundBase64);
             }
-            TransferBigData.setImgBackgroundBase64(imgBackgroundBase64);
 
             intent.putExtra("miniature", args.getBoolean(1));
 
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index d2f152e..dd6993e 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -342,6 +342,11 @@ public class CameraActivity extends Activity {
           RelativeLayout.TRUE);
       
       background.setLayoutParams(paramsMiniature);
+    } else {
+      Button miniature = (Button) findViewById(R.id.miniature);
+      miniature.setVisibility(View.INVISIBLE);
+      SeekBar switchOpacity = (SeekBar) findViewById(R.id.switchOpacity);
+      switchOpacity.setVisibility(View.INVISIBLE);
     }
   }
   
@@ -354,7 +359,7 @@ public class CameraActivity extends Activity {
     // Set new size for miniature layout.
     setParamsMiniature(background, true);
     // Hide the miniature button.
-    miniature.setVisibility(View.INVISIBLE);  
+    miniature.setVisibility(View.INVISIBLE);
       
     // Add event on click action for the miniature picture.
     background.setOnClickListener(new View.OnClickListener() {