From d5f63b4b742483575395664bf841498dd40e039c Mon Sep 17 00:00:00 2001
From: Christophe BOUCAUT <christophe.boucaut@geneanet.org>
Date: Tue, 30 Dec 2014 09:36:08 +0100
Subject: [PATCH] =?UTF-8?q?Remise=20en=20place=20de=20l'action=20sur=20le?=
 =?UTF-8?q?=20bouton=20back=20+=20adaptation=20JS=20pour=20r=C3=A9cup?=
 =?UTF-8?q?=C3=A9rer=20le=20code=20d'erreur.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/org/geneanet/customcamera/CameraActivity.java    | 9 +++++++++
 www/customCamera.js                                      | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index 47ef908..3a2c1e8 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -733,4 +733,13 @@ public class CameraActivity extends Activity {
 
     return code == 4 ? 0 : code;
   }
+
+  /**
+   * When the back button is pressed
+   */
+  @Override
+  public void onBackPressed() {
+    this.setResult(3);
+    this.finish();
+  }
 }
diff --git a/www/customCamera.js b/www/customCamera.js
index a916fef..830df8e 100644
--- a/www/customCamera.js
+++ b/www/customCamera.js
@@ -19,8 +19,8 @@ customCameraExport.prototype.startCamera = function(imgBackgroundBase64, success
         successFct(data);
     };
 
-    var failFctCallback = function(message) {
-        failFct(message);
+    var failFctCallback = function(data) {
+        failFct(data.code, data.message);
     };
 
     exec(