Merge pull request #31 from codedust/master

Fixed 'TypeError: Promise.resolve is not a constructor' in Firefox

js/crypto.js

@@ -87,9 +87,9 @@ window.textsecure.crypto = new function() {
 				priv[0] |= 0x0001;
 
 			//TODO: fscking type conversion
-			return new Promise.resolve({ pubKey: prependVersion(toArrayBuffer(curve25519(priv))), privKey: privKey});
+			return Promise.resolve({ pubKey: prependVersion(toArrayBuffer(curve25519(priv))), privKey: privKey});
 		}
-	
+
 	}
 	var privToPub = function(privKey, isIdentity) { return testing_only.privToPub(privKey, isIdentity); }
 

js/webcrypto.js

@@ -73,7 +73,7 @@ window.crypto.subtle = (function() {
 		function promise(implementation) {
 			var args = Array.prototype.slice.call(arguments);
 			args.shift();
-			return new Promise.resolve(toArrayBuffer(implementation.apply(this, args)));
+			return Promise.resolve(toArrayBuffer(implementation.apply(this, args)));
 		}
 
 		// public interface functions