- remove nacl_factory when using Android or iOS - fix #333

- private message was badly encrypted - fix #345

www/css/ionic.app.css

@@ -15054,3 +15054,12 @@ a.underline:hover,
   font-size: 16px;
   left: 25px;
   top: -7px; }
+
+div[dropzone] {
+  border: 2px dashed #bbb;
+  border-radius: 5px;
+  padding: 15px;
+  text-align: center;
+  font: 20pt bold;
+  color: #bbb;
+  margin-bottom: 20px; }

www/index.html

@@ -30,7 +30,6 @@
   <script src="js/vendor/socket-io.js"></script>
   <script src="js/vendor/underscore.js"></script>
   <script src="js/vendor/qrcode.min.js"></script>
-  <!--script src="js/vendor/strophe.min.js"></script-->
 
   <!-- ionic/angularjs js -->
   <script src="lib/ionic/js/ionic.bundle.js"></script>
@@ -45,13 +44,13 @@
   <script src="lib/ionic/js/angular/angular-image-crop.js"></script>
   <script src="lib/ionic/js/angular/angular-file-saver.bundle.js"></script>
   <script src="js/vendor/base58.js" async></script>
-  <!--removeIf(device-android)-->
-  <!--removeIf(device-ios)-->
+  <!--removeIf(android)-->
+  <!--removeIf(ios)-->
   <script src="js/vendor/nacl_factory.js" async></script>
   <script src="js/vendor/scrypt-em.js" async></script>
   <script src="js/vendor/base64.js" async></script>
-  <!--endRemoveIf(device-ios)-->
-  <!--endRemoveIf(device-android)-->
+  <!--endRemoveIf(ios)-->
+  <!--endRemoveIf(android)-->
   <!--removeIf(no-device)-->
   <script src="js/vendor/sha256.min.js" async></script>
   <script src="js/vendor/ng-cordova.min.js"></script>

www/js/services/crypto-services.js

@@ -137,8 +137,8 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services'
       this.util.decode_base64 = function (a) {
         return that.base64.decode(a);
       };
-      this.util.encode_base64 = function () {
-        return that.base64.encode(arguments);
+      this.util.encode_base64 = function (b) {
+        return that.base64.encode(b);
       };
 
       this.util.hash_sha256 = function (message) {
@@ -177,7 +177,7 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services'
       /**
        * Encrypt a message, from a key pair
        */
-      this.box = function (message, nonce, recipientPk, senderSk) {
+      this.box = function(message, nonce, recipientPk, senderSk) {
         return $q(function (resolve, reject) {
           if (!message) {
             resolve(message);
@@ -192,6 +192,7 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services'
           try {
             var ciphertextBin = that.nacl.crypto_box(messageBin, nonce, recipientPk, senderSk);
             var ciphertext = that.util.encode_base64(ciphertextBin);
+
             //console.debug('Encrypted message: ' + ciphertext);
             resolve(ciphertext);
           }
@@ -350,7 +351,6 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services'
 
       // libraries handlers
       this.nacl = null; // the cordova plugin
-      this.nacl_js= null; // the full JS lib (need for random values)
       this.base58= null;
       this.sha256= null;
       var that = this;
@@ -373,18 +373,19 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services'
         for (i = 0; i < a.length; i++) b[i] = a[i];
         return b;
       };
+      this.util.decode_base64 = function (a) {
+        return that.nacl.from_base64(a);
+      };
+      this.util.encode_base64 = function (b) {
+        return that.nacl.to_base64(b);
+      };
       this.util.hash_sha256 = function(message) {
         return $q.when(that.sha256(message).toUpperCase());
       };
       this.util.random_nonce = function() {
-        if (that.crypto && that.crypto.getRandomValues) {
-          var nonce = new Uint8Array(that.constants.crypto_secretbox_NONCEBYTES);
-          that.crypto.getRandomValues(nonce);
-          return $q.when(nonce);
-        }
-        else {
-          return $q.when(that.nacl_js.crypto_box_random_nonce());
-        }
+        var nonce = new Uint8Array(that.constants.crypto_secretbox_NONCEBYTES);
+        that.crypto.getRandomValues(nonce);
+        return $q.when(nonce);
       };
 
       /**
@@ -518,7 +519,7 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services'
 
         that.nacl.crypto_box_easy(messageBin, nonce, recipientPk, senderSk, function(err, ciphertextBin) {
           if (err) { deferred.reject(err); return;}
-          var ciphertext = that.nacl.to_base64(ciphertextBin);
+          var ciphertext = that.util.encode_base64(ciphertextBin);
           //console.debug('Encrypted message: ' + ciphertext);
           deferred.resolve(ciphertext);
         });
@@ -558,10 +559,9 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services'
         else {
           that.nacl = window.plugins.MiniSodium;
           var loadedLib = 0;
-          var expectedLoadedLib = 2;
           var checkAllLibLoaded = function() {
             loadedLib++;
-            if (loadedLib == expectedLoadedLib) {
+            if (loadedLib == 2) {
               that.loaded = true;
               deferred.resolve();
             }
@@ -574,14 +574,6 @@ angular.module('cesium.crypto.services', ['ngResource', 'cesium.device.services'
             that.sha256 = lib;
             checkAllLibLoaded();
           });
-          if (!that.crypto || !that.crypto.getRandomValues) {
-            console.debug('[crypto] Web Crypto API (window.crypto) NOT exists with getRandomValues. Will load nacl_factory');
-            expectedLoadedLib++;
-            that.async_load_nacl_js(function(lib) {
-              that.nacl_js = lib;
-              checkAllLibLoaded();
-            });
-          }
         }
 
         return deferred.promise;