From 2bd14faf0ad4b8a19039b854bafcc80e7ff569a8 Mon Sep 17 00:00:00 2001 From: Lawrence Nahum Date: Tue, 21 Aug 2018 16:02:23 +0200 Subject: [PATCH 1/4] testnet app has been merged in mainnet app greenbits --- ...enaddress.greenbits_android_wallet.testnet.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt b/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt index d9e87dab23..1348a4f976 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt +++ b/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt @@ -9,8 +9,11 @@ Name:GreenBits Testnet Auto Name:GreenBits Summary:GreenAddress Testnet client Description: -GreenBits Testnet is a Bitcoin Wallet for Android provided by GreenAddress for -the Testnet network. +'''This app has been deprecated as it has been merged into +[[com.greenaddress.greenbits_android_wallet]].''' + +Original description: GreenBits Testnet is a Bitcoin Wallet for Android provided +by GreenAddress for the Testnet network. The wallet main strengths are security, privacy, easy of use and aims is to provide a great user experience. @@ -224,7 +227,11 @@ Build:2.05_testnet,205 build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh ndk=r17b -Auto Update Mode:Version r%v -Update Check Mode:Tags +Maintainer Notes: +This app has been merged in com.greenaddress.greenbits. +. + +Auto Update Mode:None +Update Check Mode:None Current Version:2.05_testnet Current Version Code:205 From 3c4be67f6995b37646ed4b15ad9e35bd45cf234c Mon Sep 17 00:00:00 2001 From: Lawrence Nahum Date: Tue, 21 Aug 2018 16:12:32 +0200 Subject: [PATCH 2/4] remove now unnecessary sedding of split --- metadata/com.greenaddress.greenbits_android_wallet.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/metadata/com.greenaddress.greenbits_android_wallet.txt b/metadata/com.greenaddress.greenbits_android_wallet.txt index bf64f0888b..74bb1f6c0d 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.txt +++ b/metadata/com.greenaddress.greenbits_android_wallet.txt @@ -687,8 +687,7 @@ Build:2.06,206 subdir=app gradle=production forcevercode=yes - prebuild=sed -i -e 's/enable true/enable false/g' build.gradle && \ - sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle + prebuild=sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/production/assets/checkpoints scandelete=app/src/btctestnet/assets/checkpoints build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh From 97d5090605f5abf109fbe1c0dd148671e7796d98 Mon Sep 17 00:00:00 2001 From: Lawrence Nahum Date: Tue, 21 Aug 2018 16:03:50 +0200 Subject: [PATCH 3/4] remove reference to broken link/unmaintained app, update description --- ...com.greenaddress.greenbits_android_wallet.testnet.txt | 9 +-------- metadata/com.greenaddress.greenbits_android_wallet.txt | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt b/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt index 1348a4f976..c89b99651c 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt +++ b/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt @@ -18,16 +18,9 @@ by GreenAddress for the Testnet network. The wallet main strengths are security, privacy, easy of use and aims is to provide a great user experience. -* It supports the payment protocol via both click and qrcode scanning and instant confirmation. +* It supports the payment protocol via both click and qrcode scanning. * Supports paper wallet scanning in both WIF and BIP38 format. * Uses multisignature for improved security and per transaction two factor authentication. - -Please note that another GreenAddress app is available for Android: it has more -features available however it consumes more resources and even on recent Android -devices it may not be as good of a user experience as this new Android native -version. - -You can find it at [[it.greenaddress.cordova]]. . Repo Type:git diff --git a/metadata/com.greenaddress.greenbits_android_wallet.txt b/metadata/com.greenaddress.greenbits_android_wallet.txt index 74bb1f6c0d..3c027494aa 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.txt +++ b/metadata/com.greenaddress.greenbits_android_wallet.txt @@ -13,16 +13,9 @@ GreenBits is a Bitcoin Wallet for Android provided by GreenAddress. The wallet main strengths are security, privacy, easy of use and aims is to provide a great user experience. -* It supports the payment protocol via both click and qrcode scanning and instant confirmation. +* It supports the payment protocol via both click and qrcode scanning. * Supports paper wallet scanning in both WIF and BIP38 format. * Uses multisignature for improved security and per transaction two factor authentication. - -Please note that another GreenAddress app is available for Android: it has more -features available however it consumes more resources and even on recent Android -devices it may not be as good of a user experience as this new Android native -version. - -You can find it at [[it.greenaddress.cordova]]. . Repo Type:git From 4d3409e173762d3ce08e6baae84f48bc3610b600 Mon Sep 17 00:00:00 2001 From: Lawrence Nahum Date: Thu, 23 Aug 2018 15:52:18 +0200 Subject: [PATCH 4/4] fix scandelete & scanignore for unified app --- metadata/com.greenaddress.greenbits_android_wallet.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/com.greenaddress.greenbits_android_wallet.txt b/metadata/com.greenaddress.greenbits_android_wallet.txt index 3c027494aa..819f51f4b3 100644 --- a/metadata/com.greenaddress.greenbits_android_wallet.txt +++ b/metadata/com.greenaddress.greenbits_android_wallet.txt @@ -681,8 +681,8 @@ Build:2.06,206 gradle=production forcevercode=yes prebuild=sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle - scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/production/assets/checkpoints - scandelete=app/src/btctestnet/assets/checkpoints + scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/main/assets/production/checkpoints + scandelete=app/src/main/assets/btctestnet/checkpoints build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh ndk=r17b