From a1441e0da8e21bd12f7439d4fb8aa1c4ac5fbdd7 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Sun, 25 Oct 2015 23:06:29 -0300 Subject: [PATCH 1/7] fixes callback --- src/js/services/profileService.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 74049e9f1..b574e2a93 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -338,7 +338,9 @@ angular.module('copayApp.services') if (w) { return cb(gettext('Wallet already in Copay' + ": ") + w.walletName); } - root.storeData(walletClient, opts.bwsurl, cb); + root.storeData(walletClient, opts.bwsurl, function(err){ + return cb(err, walletId); + }); }; root.importWallet = function(str, opts, cb) { From 8f619786ddfa7347f41553b190379ba8bf8e2d0a Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Sun, 25 Oct 2015 23:25:44 -0300 Subject: [PATCH 2/7] refactor store data --- src/js/services/profileService.js | 43 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index b574e2a93..d78f1f889 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -247,30 +247,11 @@ angular.module('copayApp.services') }, function(err, secret) { if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb); - root.storeData(walletClient, opts.bwsurl, cb); + root._addWalletClient(walletClient, opts, cb); }) }); }; - root.storeData = function(walletClient, bwsurl, cb) { - var walletId = walletClient.credentials.walletId; - var defaults = configService.getDefaults(); - var opts_ = { - bwsFor: {} - }; - opts_.bwsFor[walletId] = bwsurl || defaults.bws.url; - configService.set(opts_, function(err) { - if (err) console.log(err); - - root.profile.credentials.push(JSON.parse(walletClient.export())); - root.setWalletClients(); - - root.setAndStoreFocus(walletId, function() { - storageService.storeProfile(root.profile, cb); - }); - }); - } - root.joinWallet = function(opts, cb) { var walletClient = bwcService.getClient(); $log.debug('Joining Wallet:', opts); @@ -296,7 +277,7 @@ angular.module('copayApp.services') walletClient.joinWallet(opts.secret, opts.myName || 'me', {}, function(err) { if (err) return bwsError.cb(err, gettext('Could not join wallet'), cb); - root.storeData(walletClient, opts.bwsurl, cb); + root._addWalletClient(walletClient, opts, cb); }); }); }; @@ -338,8 +319,24 @@ angular.module('copayApp.services') if (w) { return cb(gettext('Wallet already in Copay' + ": ") + w.walletName); } - root.storeData(walletClient, opts.bwsurl, function(err){ - return cb(err, walletId); + + var defaults = configService.getDefaults(); + var bwsFor = {}; + bwsFor[walletId] = opts.bwsurl || defaults.bws.url; + + configService.set({ + bwsFor: bwsFor, + }, function(err) { + if (err) console.log(err); + + root.profile.credentials.push(JSON.parse(walletClient.export())); + root.setWalletClients(); + + root.setAndStoreFocus(walletId, function() { + storageService.storeProfile(root.profile, function(err){ + return cb(err, walletId); + }); + }); }); }; From bc251b303c48945d60cc616defc8b2b1774cd732 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 26 Oct 2015 01:18:19 -0300 Subject: [PATCH 3/7] New release v1.4.1 --- cordova/config.xml | 6 +++--- cordova/ios/Copay-Info.plist | 4 ++-- cordova/wp/Package.appxmanifest | 2 +- package.json | 2 +- webkitbuilds/.desktop | 2 +- webkitbuilds/setup-win32.iss | 2 +- webkitbuilds/setup-win64.iss | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cordova/config.xml b/cordova/config.xml index 6cd0c70c9..9a55e492c 100644 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -1,8 +1,8 @@ + version="1.4.1" + android-versionCode="51" + ios-CFBundleVersion="1.4.1"> Copay A secure bitcoin wallet for friends and companies. diff --git a/cordova/ios/Copay-Info.plist b/cordova/ios/Copay-Info.plist index 9c6b2fcbd..0eb24c975 100644 --- a/cordova/ios/Copay-Info.plist +++ b/cordova/ios/Copay-Info.plist @@ -57,11 +57,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.0 + 1.4.1 CFBundleSignature ???? CFBundleVersion - 1.4.0 + 1.4.1 LSRequiresIPhoneOS NSMainNibFile diff --git a/cordova/wp/Package.appxmanifest b/cordova/wp/Package.appxmanifest index 10c9e375e..5ba5f6c11 100644 --- a/cordova/wp/Package.appxmanifest +++ b/cordova/wp/Package.appxmanifest @@ -1,6 +1,6 @@  - + Copay Wallet diff --git a/package.json b/package.json index a410d4a42..ec8a52fd2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "copay", "description": "A multisignature wallet", "author": "BitPay", - "version": "1.4.0", + "version": "1.4.1", "keywords": [ "wallet", "copay", diff --git a/webkitbuilds/.desktop b/webkitbuilds/.desktop index 2d6bd3a0c..473b8eeec 100644 --- a/webkitbuilds/.desktop +++ b/webkitbuilds/.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.4.0 +Version=1.4.1 Name=Copay Comment=A multisignature wallet Exec=copay diff --git a/webkitbuilds/setup-win32.iss b/webkitbuilds/setup-win32.iss index de7cbc27d..2f12f30e9 100755 --- a/webkitbuilds/setup-win32.iss +++ b/webkitbuilds/setup-win32.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.4.0" +#define MyAppVersion "1.4.1" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe" diff --git a/webkitbuilds/setup-win64.iss b/webkitbuilds/setup-win64.iss index 5f99d48c5..1c84dab16 100755 --- a/webkitbuilds/setup-win64.iss +++ b/webkitbuilds/setup-win64.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Copay" -#define MyAppVersion "1.4.0" +#define MyAppVersion "1.4.1" #define MyAppPublisher "BitPay" #define MyAppURL "https://copay.io" #define MyAppExeName "copay.exe" From cdba64fad908e9fa46031855c21b907f9762986e Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 26 Oct 2015 11:56:38 -0300 Subject: [PATCH 4/7] Fix barcodescanner plugin for cordova 5 --- cordova/android/build-extras.gradle | 6 ++++++ cordova/build.sh | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 cordova/android/build-extras.gradle diff --git a/cordova/android/build-extras.gradle b/cordova/android/build-extras.gradle new file mode 100644 index 000000000..bd21ff7f3 --- /dev/null +++ b/cordova/android/build-extras.gradle @@ -0,0 +1,6 @@ +android { + lintOptions { + disable 'MissingTranslation' + disable 'ExtraTranslation' + } +} diff --git a/cordova/build.sh b/cordova/build.sh index 736ba8136..ba85d6ed0 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -174,6 +174,9 @@ if [ $CURRENT_OS == "ANDROID" ]; then # cp android/AndroidManifest.xml $PROJECT/platforms/android/AndroidManifest.xml # checkOK + + cp android/build-extras.gradle $PROJECT/platforms/android/build-extras.gradle + checkOK cp android/project.properties $PROJECT/platforms/android/project.properties checkOK From e7d929a224705e1098a4879fc615bb067c363e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 21 Oct 2015 14:47:01 -0300 Subject: [PATCH 5/7] fix animation in preference Bws Url --- src/js/services/animationService.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/js/services/animationService.js b/src/js/services/animationService.js index 7bad8546a..6ce701cbe 100644 --- a/src/js/services/animationService.js +++ b/src/js/services/animationService.js @@ -7,10 +7,10 @@ angular.module('copayApp.services').factory('animationService', function(isCordo // DISABLE ANIMATION ON DESKTOP root.modalAnimated = { - slideUp : isCordova ? 'full animated slideInUp' : 'full', - slideRight : isCordova ? 'full animated slideInRight' : 'full', - slideOutDown : isCordova ? 'slideOutDown' : 'hideModal', - slideOutRight : isCordova ? 'slideOutRight' : 'hideModal', + slideUp: isCordova ? 'full animated slideInUp' : 'full', + slideRight: isCordova ? 'full animated slideInRight' : 'full', + slideOutDown: isCordova ? 'slideOutDown' : 'hideModal', + slideOutRight: isCordova ? 'slideOutRight' : 'hideModal', }; var pageWeight = { @@ -34,7 +34,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo preferencesUnit: 12, preferencesFee: 12, preferencesAltCurrency: 12, - preferencesBwsUrl: 12, + preferencesBwsUrl: 13, preferencesAlias: 12, preferencesEmail: 12, export: 13, @@ -51,7 +51,8 @@ angular.module('copayApp.services').factory('animationService', function(isCordo }; function cleanUpLater(e, e2) { - var cleanedUp = false, timeoutID; + var cleanedUp = false, + timeoutID; var cleanUp = function() { if (cleanedUp) return; cleanedUp = true; @@ -72,7 +73,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo timeoutID = setTimeout(cleanUp, 500); }; - root.transitionAnimated = function (fromState, toState, event) { + root.transitionAnimated = function(fromState, toState, event) { if (isaosp) return true; @@ -94,7 +95,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo var entering = null, - leaving = null; + leaving = null; // Horizontal Slide Animation? if (isCordova && fromWeight && toWeight) { @@ -108,7 +109,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo } else if (isCordova && fromName && fromWeight >= 0 && toWeight >= 0) { if (toWeight) { entering = 'CslideInUp'; - + } else { leaving = 'CslideOutDown'; } @@ -150,4 +151,4 @@ angular.module('copayApp.services').factory('animationService', function(isCordo } return root; -}); +}); \ No newline at end of file From e8f53349011358035d975d8ac8560a7c5864dde0 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 26 Oct 2015 12:22:53 -0300 Subject: [PATCH 6/7] fix makefile --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index c79ed65cd..7ce7538b6 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,8 @@ android-prod: cordova/build.sh ANDROID --clear cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg cd cordova/project && cordova build android --release + jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play + android-debug: cordova/build.sh ANDROID --dbgjs --clear From 5186ac992447115cc7ab81ce21579c62747f6bd6 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 26 Oct 2015 12:52:38 -0300 Subject: [PATCH 7/7] fix signed --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7ce7538b6..2cc12a548 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,8 @@ android-prod: cordova/build.sh ANDROID --clear cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg cd cordova/project && cordova build android --release - jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play + jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play + ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-signed-aligned.apk android-debug: