Merge pull request #27 from SendSafely/3.1.12

v3.1.12

Author: jhemler

SampleApplication/README.MD

@@ -1,26 +1,9 @@
 SampleApplication is intended to provide a starting point for building custom Java application integrations using the SendSafely Java Client API. 
 
 # Instructions
-Download the most recent release of the SendSafely Client API from [GitHub](https://github.com/SendSafely/Java-Client-API/releases) or a [public maven repository](https://mvnrepository.com/artifact/com.sendsafely/sendsafely-java-api) and copy the jar files into the SampleApplication/lib folder. Alternatively, build and run SampleApplication using the Maven instructions below.
+Build and run SampleApplication using the Maven instructions below.
 
-## Manual
-### Build
-
-`mkdir bin`
-
-`javac -cp "lib/*" -d bin src/*.java`
-
-### Run (macOS/Linux)
-
-```
-java -cp "lib/*:bin" SendSafelyRefApp
-```
-
-### Run (Windows)
 
-```
-java -cp "lib/*;bin/" SendSafelyRefApp
-```
 ## Maven
 ### Build
 ```mvn clean compile package```

SampleApplication/lib/sendsafely-java-api-3.1.11.jar renamed to SampleApplication/lib/sendsafely-java-api-3.1.12.jar

@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>com.sendsafely</groupId>
 			<artifactId>sendsafely-java-api</artifactId>
-			<version>3.1.11</version>
+			<version>3.1.12</version>
 		</dependency>
 	</dependencies>
 

SampleApplication/pom.xml

@@ -6,7 +6,7 @@ Use the following dependency in your project to grab via Maven:
 <dependency>
 	<groupId>com.sendsafely</groupId>
 	<artifactId>sendsafely-java-api</artifactId>
-	<version>3.1.11</version>
+	<version>3.1.12</version>
 </dependency>
 ```
 

SendSafelyAPI/README.md

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sendsafely</groupId>
   <artifactId>sendsafely-java-api</artifactId>
-  <version>3.1.11</version>
+  <version>3.1.12</version>
   <name>SendSafely Java Client API</name>
   <description>The SendSafely Client API allows programmatic access to SendSafely and provides a layer of abstraction from our REST API, which requires developers to perform several complex tasks in a correct manner.</description>
   <url>https://developer.sendsafely.com</url>

SendSafelyAPI/lib/sendsafely-java-api-3.1.11.jar renamed to SendSafelyAPI/lib/sendsafely-java-api-3.1.12.jar

@@ -369,11 +369,27 @@ public static String encryptKeycode(String publicKeyStr, String keycode) throws
                 Iterator kIt = kRing.getPublicKeys();
                 while (key == null && kIt.hasNext()) {
                     PGPPublicKey k = (PGPPublicKey) kIt.next();
-                    if (k.isEncryptionKey() /*&& CanEncrypt(k.getSignatures()*/) { //Enable CanEncrypt check in future version of SDK
+                    if (k.isEncryptionKey() && CanEncrypt(k.getSignatures())) {
                         key = k;
                     }
                 }
             }
+			// if no encrypt key was found then see if we can use the signing key.
+			// this is only to provide legacy support for incorrectly formatted keys that don't have an encryption key.
+			if (key == null) {
+				rIt = pgpPub.getKeyRings();
+				while (key == null && rIt.hasNext()) {
+					PGPPublicKeyRing kRing = (PGPPublicKeyRing) rIt.next();
+					Iterator kIt = kRing.getPublicKeys();
+					while (key == null && kIt.hasNext()) {
+						PGPPublicKey k = (PGPPublicKey) kIt.next();
+						if (k.isEncryptionKey()) { 
+							key = k;
+						}
+					}
+				}
+			}
+			// if the key is still null then throw an exception
             if (key == null) {
                 throw new IllegalArgumentException("Can't find encryption key in key ring.");
             }