v0.1.7 Updated checkpoints; Added DNS Nodes

HashEngineeringArchives · May 31, 2014 · 25318e5 · 25318e5
1 parent c573e21
commit 25318e5
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 8 deletions.
diff --git a/market/Thumbs.db b/market/Thumbs.db
diff --git a/market/market-description-hu.txt b/market/market-description-hu.txt
@@ -10,7 +10,6 @@ ELŐNYÖK:
 • Offline állapotban is fizethetsz - Bluetooth segítségével.
 • Rendszerüzenet digitalcoin érkezésekor.
 • Widget a digitalcoin egyenlegről.
->>>>>>> upstream/prod
 
 Bővebben a digitalcoin-ról:
 http://digitalcoin.co

diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
@@ -5,8 +5,8 @@
 	package="hashengineering.digitalcoin.wallet"
 	android:installLocation="internalOnly"
 
-	android:versionCode="10016"
-	android:versionName="0.1.6" >
+	android:versionCode="10017"
+	android:versionName="0.1.7" >
 
 
 	<uses-sdk

diff --git a/wallet/CHANGES b/wallet/CHANGES
@@ -1,5 +1,12 @@
 digitalcoin Wallet
 -----------------
+v0.1.7-beta
+* updated checkpoints
+* added DNS nodes from Digitalcoin Core 2.0 source
+
+v0.1.6-beta
+* Bug fix associated with Peer Discovery
+
 v0.1.5-beta
 * update to bitcoin-wallet 3.46
 * added Litecoin's PeerDBDiscovery System

diff --git a/wallet/assets/checkpoints b/wallet/assets/checkpoints
diff --git a/wallet/assets/checkpoints-testnet b/wallet/assets/checkpoints-testnet
diff --git a/wallet/res/drawable-hdpi-v11/Thumbs.db b/wallet/res/drawable-hdpi-v11/Thumbs.db
diff --git a/wallet/res/drawable-hdpi-v14/Thumbs.db b/wallet/res/drawable-hdpi-v14/Thumbs.db
diff --git a/wallet/res/drawable-hdpi/Thumbs.db b/wallet/res/drawable-hdpi/Thumbs.db
diff --git a/wallet/res/drawable-xhdpi-v11/Thumbs.db b/wallet/res/drawable-xhdpi-v11/Thumbs.db
diff --git a/wallet/res/drawable-xhdpi-v14/Thumbs.db b/wallet/res/drawable-xhdpi-v14/Thumbs.db
diff --git a/wallet/res/drawable-xhdpi/Thumbs.db b/wallet/res/drawable-xhdpi/Thumbs.db
diff --git a/wallet/res/drawable-xxhdpi/Thumbs.db b/wallet/res/drawable-xxhdpi/Thumbs.db
diff --git a/wallet/src/de/schildbach/wallet/util/PaymentProtocol.java b/wallet/src/de/schildbach/wallet/util/PaymentProtocol.java
@@ -32,7 +32,7 @@
 import com.google.bitcoin.core.Transaction;
 import com.google.bitcoin.protocols.payments.PaymentRequestException;
 import com.google.bitcoin.protocols.payments.PaymentSession;
-import com.google.bitcoin.protocols.payments.PaymentSession.PkiVerificationData;
+import com.google.bitcoin.protocols.payments.PaymentProtocol.PkiVerificationData;
 import com.google.bitcoin.script.Script;
 import com.google.bitcoin.script.ScriptBuilder;
 import com.google.protobuf.ByteString;
@@ -92,8 +92,8 @@ public static PaymentIntent parsePaymentRequest(@Nonnull final byte[] serialized
 			{
 				// implicitly verify PKI signature
 				final PkiVerificationData verificationData = new PaymentSession(paymentRequest, true).pkiVerificationData;
-				pkiName = verificationData.name;
-				pkiOrgName = verificationData.orgName;
+				pkiName = verificationData.displayName;
+				pkiOrgName = verificationData.displayName;
 				pkiCaName = verificationData.rootAuthorityName;
 			}
 			else

diff --git a/wallet/wallet.iml b/wallet/wallet.iml
@@ -41,12 +41,13 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:annotations:4.1.1.4" level="project" />
     <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
     <orderEntry type="module" module-name="digitalcoinj" />
-    <orderEntry type="library" name="Maven: com.madgag:sc-light-jdk15on:1.47.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.madgag.spongycastle:core:1.50.0.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.lambdaworks:scrypt:1.3.3" level="project" />
+    <orderEntry type="module" module-name="orchid" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
     <orderEntry type="module" module-name="integration-android" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.0.1" level="project" />