fix merge conflicts

.gitignore

@@ -13,11 +13,6 @@ cordova/*.keystore
 cache
 webkitbuilds/*
 !webkitbuilds/README.md
-!webkitbuilds/setup-win.iss
-!webkitbuilds/favicon.ico
-!webkitbuilds/.desktop
-!webkitbuilds/build-osx.sh
-!webkitbuilds/Background.png
 
 # chrome extensions
 chrome-app/build/*
@@ -50,7 +45,7 @@ build/Release
 node_modules
 bower_components
 angular-bitcore-wallet-client/angular-bitcore-wallet-client.js
-angular-pbkdf2/angular-pbkdf2.js
+angular-bitauth/angular-bitauth.js
 
 # Users Environment Variables
 .lock-wscript
@@ -105,25 +100,14 @@ externalServices.json
 cordova/Makefile
 cordova/ProjectMakefile
 app-template/bitpay-wallet
-cordova/ProjectMakefile
 cordova/config.xml
 cordova/wp/Package.appxmanifest
-www/img/logo-negative.svg
-www/img/logo.svg
 src/js/appConfig.js
 src/js/externalServices.js
+chrome-app/manifest.json
+www/img/app
 
 
-cordova/Makefile
-cordova/ProjectMakefile
-app-template/bitpay-wallet
-cordova/ProjectMakefile
-cordova/config.xml
-cordova/wp/Package.appxmanifest
-www/img/logo-negative.svg
-www/img/logo.svg
-src/js/appConfig.js
-
 cordova/android/res/
 cordova/wp/Assets/
 cordova/wp/*.png

Gruntfile.js

@@ -6,6 +6,7 @@ module.exports = function(grunt) {
 
   // Project Configuration
   grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
     exec: {
       appConfig: {
         command: 'node ./util/buildAppConfig.js'
@@ -19,8 +20,8 @@ module.exports = function(grunt) {
       cordovaclean: {
         command: 'make -C cordova clean'
       },
-      osx: {
+      macos: {
-        command: 'webkitbuilds/build-osx.sh sign'
+        command: 'sh webkitbuilds/build-macos.sh sign'
       },
       coveralls: {
         command: 'cat  coverage/report-lcov/lcov.info |./node_modules/coveralls/bin/coveralls.js'
@@ -60,10 +61,10 @@ module.exports = function(grunt) {
         stdin: true,
       },
       desktopsign: {
-        cmd: 'gpg -u 1112CFA1 --output webkitbuilds/Copay-linux.zip.sig --detach-sig webkitbuilds/Copay-linux.zip && gpg -u 1112CFA1 --output webkitbuilds/Copay-win.exe.sig --detach-sig webkitbuilds/Copay-win.exe'
+        cmd: 'gpg -u 1112CFA1 --output webkitbuilds/<%= pkg.title %>-linux.zip.sig --detach-sig webkitbuilds/<%= pkg.title %>-linux.zip && gpg -u 1112CFA1 --output webkitbuilds/<%= pkg.title %>-win.exe.sig --detach-sig webkitbuilds/<%= pkg.title %>-win.exe'
       },
       desktopverify: {
-        cmd: 'gpg --verify webkitbuilds/Copay-linux.zip.sig webkitbuilds/Copay-linux.zip && gpg --verify webkitbuilds/Copay-win.exe.sig webkitbuilds/Copay-win.exe'
+        cmd: 'gpg --verify webkitbuilds/<%= pkg.title %>-linux.zip.sig webkitbuilds/<%= pkg.title %>-linux.zip && gpg --verify webkitbuilds/<%= pkg.title %>-win.exe.sig webkitbuilds/<%= pkg.title %>-win.exe'
       },
     },
     watch: {
@@ -128,7 +129,7 @@ module.exports = function(grunt) {
           'bower_components/angular-md5/angular-md5.js',
           'bower_components/angular-mocks/angular-mocks.js',
           'bower_components/ngtouch/src/ngTouch.js',
-          'angular-pbkdf2/angular-pbkdf2.js',
+          'angular-bitauth/angular-bitauth.js',
           'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js'
         ],
         dest: 'www/lib/angular.js'
@@ -209,49 +210,40 @@ module.exports = function(grunt) {
         files: [{
           expand: true,
           cwd: 'webkitbuilds/',
-          src: ['.desktop', '../www/img/icons/favicon.ico', '../www/img/icons/icon-256.png'],
+          src: ['.desktop', '../www/img/app/favicon.ico', '../www/img/app/512x512.png'],
-          dest: 'webkitbuilds/Copay/linux64/',
+          dest: 'webkitbuilds/<%= pkg.title %>/linux64/',
           flatten: true,
           filter: 'isFile'
         }],
       }
     },
-    karma: {
-      unit: {
-        configFile: 'test/karma.conf.js'
-      },
-      prod: {
-        configFile: 'test/karma.conf.js',
-        singleRun: true
-      }
-    },
     nwjs: {
       options: {
-        appName: 'Copay',
+        appName: '<%= pkg.title %>',
         platforms: ['win64', 'osx64', 'linux64'],
         buildDir: './webkitbuilds',
         version: '0.16.0',
-        macIcns: './www/img/icons/icon.icns',
+        macIcns: './www/img/app/logo.icns',
-        exeIco: './www/img/icons/icon.ico'
+        exeIco: './www/img/app/logo.ico'
       },
       src: ['./package.json', './www/**/*']
     },
     compress: {
       linux: {
         options: {
-          archive: './webkitbuilds/Copay-linux.zip'
+          archive: './webkitbuilds/<%= pkg.title %>-linux.zip'
         },
         expand: true,
-        cwd: './webkitbuilds/Copay/linux64/',
+        cwd: './webkitbuilds/<%= pkg.title %>/linux64/',
         src: ['**/*'],
-        dest: 'copay-linux/'
+        dest: '<%= pkg.title %>-linux/'
       }
     },
     browserify: {
       dist: {
         files: {
           'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js': ['angular-bitcore-wallet-client/index.js'],
-          'angular-pbkdf2/angular-pbkdf2.js': ['angular-pbkdf2/index.js']
+          'angular-bitauth/angular-bitauth.js': ['angular-bitauth/index.js']
         },
       }
     }
@@ -260,10 +252,8 @@ module.exports = function(grunt) {
   grunt.registerTask('default', ['nggettext_compile', 'exec:appConfig', 'exec:externalServices', 'browserify', 'sass', 'concat', 'copy:ionic_fonts', 'copy:ionic_js']);
   grunt.registerTask('prod', ['default', 'uglify']);
   grunt.registerTask('translate', ['nggettext_extract']);
-  grunt.registerTask('test', ['karma:unit']);
-  grunt.registerTask('test-coveralls', ['browserify', 'karma:prod', 'exec:coveralls']);
   grunt.registerTask('desktop', ['prod', 'nwjs', 'copy:linux', 'compress:linux']);
-  grunt.registerTask('osx', ['prod', 'nwjs', 'exec:osx']);
+  grunt.registerTask('macos', ['prod', 'nwjs', 'exec:macos']);
   grunt.registerTask('chrome', ['exec:chrome']);
   grunt.registerTask('wp', ['prod', 'exec:wp']);
   grunt.registerTask('wp-copy', ['default', 'exec:wpcopy']);

angular-bitauth/index.js

@@ -0,0 +1,18 @@
+var bitauthModule = angular.module('bitauthModule', []);
+var bitauth = require('../node_modules/bitauth');
+
+bitauthModule.constant('MODULE_VERSION', '1.0.0');
+
+bitauthModule.provider("bitauthService", function() {
+  var provider = {};
+
+  provider.$get = function() {
+    var service = {};
+
+    service = bitauth;
+
+    return service;
+  };
+
+  return provider;
+});

angular-pbkdf2/index.js

@@ -1,18 +0,0 @@
-var pbkdf2Module = angular.module('pbkdf2Module', []);
-var pbkdf2Sync = require('../node_modules/pbkdf2').pbkdf2Sync;
-
-pbkdf2Module.constant('MODULE_VERSION', '1.0.0');
-
-pbkdf2Module.provider("pbkdf2Service", function() {
-  var provider = {};
-
-  provider.$get = function() {
-    var service = {};
-
-    service.pbkdf2Sync = pbkdf2Sync;
-
-    return service;
-  };
-
-  return provider;
-});

app-template/apply.js

@@ -5,6 +5,7 @@
 //
 
 var templates = {
+  'package.json': '/',
   'Makefile': 'cordova/',
   'ProjectMakefile': 'cordova/',
   'config-template.xml': '/',
@@ -12,11 +13,11 @@ var templates = {
   'Package.appxmanifest': 'cordova/wp/',
   '.desktop': 'webkitbuilds/',
   'setup-win.iss': 'webkitbuilds/',
-  'manifest.json': 'chrome-app/',
+  'build-macos.sh': 'webkitbuilds/',
   //  'bower.json': '/',
 };
 var configDir = process.argv[2] || 'copay';
-var JSONheader = ' { ' + "\n" + '  "//":"PLEASE! Do not edit this file directly",' + "\n" + '  "//":"        Modify it at app-template/", ' + "\n";
+var JSONheader = ' { ' + "\n" + '  "//":"Changes to this file will be overwritten",' + "\n" + '  "//":"        Modify it in the app-template directory", ' + "\n";
 
 var MakefileHeader = "# PLEASE! Do not edit this file directly \n#       Modify it at app-template/\n";
 
@@ -116,6 +117,6 @@ function copyDir(from, to, cb) {
 }
 
 
-copyDir(configDir + '/img/', '../www/img/', function() {
+copyDir(configDir + '/img/', '../www/img/app/', function() {
   console.log("apply.js finished. \n\n");
 });

app-template/bitpay/appConfig.json

@@ -5,18 +5,20 @@
   "purposeLine": "Secure Bitcoin Wallet",
   "bundleName": "wallet",
   "appUri": "bitpay",
-
   "name": "bitpay",
   "nameNoSpace": "bitpay",
   "nameCase": "BitPay",
   "nameCaseNoSpace": "BitPay",
   "gitHubRepoName": "bitpay-wallet",
+  "gitHubRepoUrl": "git://github.com/bitpay/bitpay-wallet.git",
+  "gitHubRepoBugs": "https://github.com/bitpay/bitpay-wallet/issues",
   "disclaimerUrl": "",
   "url": "https://bitpay.com",
   "appDescription": "Secure Bitcoin Wallet",
   "winAppName": "BitPayWallet",
   "wpPublisherId": "{}",
   "wpProductId": "{}",
+  "windowsAppId": "",
   "pushSenderId": "1036948132229",
   "description": "Secure Bitcoin Wallet",
   "version": "0.14.0",

app-template/build-macos.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SHOULD_SIGN=$1
-if [ "$SHOULD_SIGN" ] 
+if [ "$SHOULD_SIGN" ]
 then
   echo "Will sign the APP"
 fi
@@ -16,10 +16,10 @@ if [ -d "$dir" ]; then
 fi
 
 # set up your app name, architecture, and background image file name
-APP_NAME="Copay"
+APP_NAME="*USERVISIBLENAME*"
 DMG_BACKGROUND_IMG="Background.png"
 
-PATH_NAME="Copay/osx64/"
+PATH_NAME="${APP_NAME}/osx64/"
 # you should not need to change these
 APP_EXE="${PATH_NAME}${APP_NAME}.app/Contents/MacOS/nwjs"
 
@@ -35,11 +35,11 @@ _BACKGROUND_IMAGE_DPI_W=`sips -g dpiWidth ${DMG_BACKGROUND_IMG} | grep -Eo '[0-9
 if [ $(echo " $_BACKGROUND_IMAGE_DPI_H != 72.0 " | bc) -eq 1 -o $(echo " $_BACKGROUND_IMAGE_DPI_W != 72.0 " | bc) -eq 1 ]; then
    echo "WARNING: The background image's DPI is not 72.  This will result in distorted backgrounds on Mac OS X 10.7+."
    echo "         I will convert it to 72 DPI for you."
-   
+
    _DMG_BACKGROUND_TMP="${DMG_BACKGROUND_IMG%.*}"_dpifix."${DMG_BACKGROUND_IMG##*.}"
 
    sips -s dpiWidth 72 -s dpiHeight 72 ${DMG_BACKGROUND_IMG} --out ${_DMG_BACKGROUND_TMP}
-   
+
    DMG_BACKGROUND_IMG="${_DMG_BACKGROUND_TMP}"
 fi
 
@@ -66,11 +66,11 @@ if [ $? -ne 0 ]; then
 # Sign Code (MATIAS)
 if [ $SHOULD_SIGN ]
 then
-  echo "Signing Copay DMG"
+  echo "Signing ${APP_NAME} DMG"
 
   export IDENTITY="3rd Party Mac Developer Application: BitPay, Inc. (884JRH5R93)"
 
-  # not need for 'out of app store' distribution (?)  
+  # not need for 'out of app store' distribution (?)
 #  export PARENT_PLIST=parent.plist
 #  export CHILD_PLIST=child.plist
   export APP_PATH=${STAGING_DIR}/${APP_NAME}.app

app-template/config-template.xml

@@ -16,7 +16,8 @@
     <preference name="iosPersistentFileLocation" value="Library" />
     <preference name="DisallowOverscroll" value="true"/>
     <preference name="HideKeyboardFormAccessoryBar" value="true"/>
-    <preference name="KeyboardDisplayRequiresUserAction" value="false" />
+    <!-- #355 -->
+    <!-- <preference name="KeyboardDisplayRequiresUserAction" value="false" /> -->
     <preference name="StatusBarBackgroundColor" value="#1e3186" />
     <preference name="BackupWebStorage" value="none"/>
     <preference name="windows-target-version" value="8.1"/>
@@ -56,8 +57,9 @@
     <plugin name="cordova-plugin-whitelist" spec="~1.3.0" />
     <plugin name="cordova-plugin-wkwebview-engine" spec="https://github.com/driftyco/cordova-plugin-wkwebview-engine.git" />
     <plugin name="cordova-plugin-qrscanner" spec="~2.4.0" />
-    <plugin name="cordova-plugin-customurlscheme" spec="~4.2.0">
+    <plugin name="cordova-plugin-customurlscheme" spec="https://github.com/cmgustavo/Custom-URL-scheme.git">
-      <variable name="URL_SCHEME" value="UNUSED" />
+      <variable name="URL_SCHEME" value="bitcoin" />
+      <variable name="SECOND_URL_SCHEME" value="*APPURI*" />
     </plugin>
     <plugin name="phonegap-plugin-push" spec="~1.8.2">
       <variable name="SENDER_ID" value="*PUSHSENDERID*"/>

app-template/copay/appConfig.json

@@ -3,20 +3,22 @@
   "packageDescription": "Copay Bitcoin Wallet",
   "userVisibleName": "Copay",
   "purposeLine": "Copay Bitcoin Wallet",
+  "bundleName": "copay",
   "appUri": "copay",
-
   "name": "copay",
   "nameNoSpace": "copay",
   "nameCase": "Copay",
   "nameCaseNoSpace": "Copay",
-  "bundleName": "copay",
   "gitHubRepoName": "copay",
+  "gitHubRepoUrl": "git://github.com/bitpay/copay.git",
+  "gitHubRepoBugs": "https://github.com/bitpay/copay/issues",
   "disclaimerUrl": "https://copay.io/disclaimer",
   "url": "https://copay.io",
   "appDescription": "Copay Bitcoin Wallet",
   "winAppName": "CopayWallet",
   "wpPublisherId": "{31cdd08b-457c-413d-b440-f6665eec847d}",
   "wpProductId": "{5381aa50-9069-11e4-84cc-293caf9cbdc8}",
+  "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
   "pushSenderId": "1036948132229",
   "description": "A Secure Bitcoin Wallet",
   "version": "2.5.0",