From 2f66f3b1169c107133aa3af515339ee6cfdaf887 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Tue, 16 Apr 2013 16:16:24 +0100
Subject: [PATCH] Re-enable de.schildbach.wallet_test

---
 metadata/de.schildbach.wallet.txt      | 16 ++++++++--------
 metadata/de.schildbach.wallet_test.txt |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index 2eff9d2927..12983e15c6 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -1,13 +1,9 @@
 Category:Office
 License:GPLv3
 Web Site:http://code.google.com/p/bitcoin-wallet/
-Source Code:http://code.google.com/p/bitcoin-wallet/source/checkout
+Source Code:http://code.google.com/p/bitcoin-wallet/source/list?name=prodnet
 Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
 
-#There's a separate version of this application that uses a test version of the
-#Bitcoin network. It would be wise to use that first, to verify that everything
-#works for you without using real Bitcoins.
-
 Summary:Wallet for the Bitcoin currency
 Description:
 Since v2.41 it is able to export private keys to local storage, encrypted
@@ -36,6 +32,11 @@ the wallet, either;
 # Use ADB backup from the Android SDK if you have Android 4+ on the phone (root not required, but check that it works properly: since v2 is installed to sdcard by default, the shared storage needs backing up too), or
 # Manually back up the files in /data/data/de.schildbach.wallet/files/: #tar cf /sdcard/wallet.tar /data/data/de.schildbach.wallet/files and you may have to change the ownership of the files that you restore (root required)
 
+There's a separate version of this application that uses a test version of the
+Bitcoin network: [[de.schildbach.wallet_test]]. 
+It could be a good idea to use that first, to verify that everything
+works for you without using real Bitcoins.
+
 [http://code.google.com/p/bitcoin-wallet/source/browse/wallet/CHANGES Changelog]
 .
 
@@ -62,9 +63,8 @@ cd ../integration-android && mvn3 install && cd ../wallet && \
 mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
 # Build from prodnet branch which cherry picks some old commits and commits after tags
-# The git reset (or specific commit instead of a tag) is from the bitcoinj wiki and is used for security
-Build Version:3.01,121,master,maven=yes,init=\
-git fetch origin && git checkout origin/prodnet,patch=pom.patch,\
+# Use specific commit instead of git fetch origin && git checkout origin/prodnet
+Build Version:3.01,121,742241f59df1,maven=yes,patch=pom.patch,\
 bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
 sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
 cp -r $$BitcoinJWallet$$/ . && rm -rf market/
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index ac91919535..8daef7c457 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -1,4 +1,3 @@
-Disabled:We don't allow debuggable apps any more
 Category:Office
 License:GPLv3
 Web Site:http://code.google.com/p/bitcoin-wallet/
@@ -13,6 +12,7 @@ it can happen that the app shows only a white display for some seconds.
 
 This is a test version of [[de.schildbach.wallet]]
 that uses the test Bitcoin network, not the real one.
+The apk is not debuggable, however.
 
 [http://code.google.com/p/bitcoin-wallet/source/browse/wallet/CHANGES Changelog]
 .
@@ -47,6 +47,7 @@ mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
 Build Version:3.01-test,121,v3.01,maven=yes,patch=pom.patch,\
 bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
+sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
 cp -r $$BitcoinJWallet$$/ . && rm -rf market/
 
 Auto Update Mode:None