Prepare SNMessage to be used in SN2 Android App

Author: thsc42

src/net/sharksystem/asap/sharknet/InMemoSNMessage.java

@@ -20,8 +20,9 @@
  * can be encrypted.
  */
 public class InMemoSNMessage implements SNMessage {
+    private ASAPCryptoAlgorithms.EncryptedMessagePackage encryptedMessagePackage;
     private byte[] snContent;
-    private final CharSequence snSender;
+    private CharSequence snSender;
     private boolean verified;
     private boolean encrypted;
     private Set<CharSequence> snRecipients;
@@ -45,6 +46,12 @@ private InMemoSNMessage(byte[] message, CharSequence sender,
         this.creationTime = creationTime;
     }
 
+    private InMemoSNMessage(ASAPCryptoAlgorithms.EncryptedMessagePackage encryptedMessagePackage) {
+        this.encryptedMessagePackage = encryptedMessagePackage;
+        this.snRecipients = new HashSet<>();
+        this.snRecipients.add(encryptedMessagePackage.getRecipient());
+    }
+
     public static byte[] serializeMessage(byte[] content, CharSequence sender, CharSequence recipient)
             throws IOException, ASAPException {
 
@@ -144,23 +151,60 @@ public static byte[] serializeMessage(byte[] content, CharSequence sender, Set<C
     }
 
     @Override
-    public byte[] getContent() { return this.snContent;}
+    public byte[] getContent() throws ASAPSecurityException {
+        if(this.encryptedMessagePackage != null) {
+            throw new ASAPSecurityException("content could not be encrypted");
+        }
+        return this.snContent;
+    }
+
     @Override
-    public CharSequence getSender() { return this.snSender; }
+    public CharSequence getSender() throws ASAPSecurityException {
+        if(this.encryptedMessagePackage != null) {
+            throw new ASAPSecurityException("content could not be encrypted");
+        }
+
+        return this.snSender;
+    }
+
     @Override
-    public Set<CharSequence> getRecipients() { return this.snRecipients; }
+    public Set<CharSequence> getRecipients() {
+        return this.snRecipients;
+    }
+
     @Override
-    public boolean verified() { return this.verified; }
+    public boolean verified() throws ASAPSecurityException {
+        if(this.encryptedMessagePackage != null) {
+            throw new ASAPSecurityException("content could not be encrypted");
+        }
+
+        return this.verified;
+    }
+
     @Override
-    public boolean encrypted() { return this.encrypted; }
+    public boolean encrypted() {
+        return this.encrypted;
+    }
+
+    public boolean couldBeDecrypted() {
+        return this.encryptedMessagePackage != null;
+    }
 
     @Override
-    public Timestamp getCreationTime() {
+    public Timestamp getCreationTime() throws ASAPSecurityException {
+        if(this.encryptedMessagePackage != null) {
+            throw new ASAPSecurityException("content could not be encrypted");
+        }
+
         return this.creationTime;
     }
 
     @Override
     public boolean isLaterThan(SNMessage message) throws ASAPException, IOException {
+        if(this.encryptedMessagePackage != null) {
+            throw new ASAPSecurityException("content could not be encrypted");
+        }
+
         Timestamp messageCreationTime = message.getCreationTime();
         return messageCreationTime.after(this.getCreationTime());
     }
@@ -194,7 +238,8 @@ public static InMemoSNMessage parseMessage(byte[] message, BasicKeyStore basicKe
 
             // for me?
             if (!basicKeyStore.isOwner(encryptedMessagePackage.getRecipient())) {
-                throw new ASAPException("SharkNetMessage: message not for me");
+                return new InMemoSNMessage(encryptedMessagePackage);
+                //throw new ASAPException("SharkNetMessage: message not for me");
             }
 
             // replace message with decrypted message

src/net/sharksystem/asap/sharknet/SNMessage.java

@@ -1,6 +1,7 @@
 package net.sharksystem.asap.sharknet;
 
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.ASAPSecurityException;
 
 import java.io.IOException;
 import java.sql.Timestamp;
@@ -15,14 +16,16 @@ public interface SNMessage {
     /**
      * Content - can be encrypted and signed
      * @return
+     * @throws ASAPSecurityException if message could not be encrypted
      */
-    byte[] getContent();
+    byte[] getContent() throws ASAPSecurityException;
 
     /**
      * Sender - can be encrypted and signed
      * @return
+     * @throws ASAPSecurityException if message could not be encrypted
      */
-    CharSequence getSender();
+    CharSequence getSender() throws ASAPSecurityException;
 
     /**
      * Recipients are always visible - the only recipient is in the unencrypted head if message
@@ -37,8 +40,9 @@ public interface SNMessage {
      * right certificate arrives. A verifiable message can become non-verifiable due to loss of certificates
      * validity. In short: Result can change state of your local PKI
      * @return
+     * @throws ASAPSecurityException if message could not be encrypted
      */
-    boolean verified();
+    boolean verified() throws ASAPSecurityException;
 
     /**
      * Not part of the transferred message - just a flag that indicates if this message can be encrypted.
@@ -48,13 +52,21 @@ public interface SNMessage {
      */
     boolean encrypted();
 
+    /**
+     *
+     * @return true if this message was not encrypted in the first place or could be encrypted.
+     * false. We have an encrypted message and cannot read it. We know its receiver, though.
+     */
+    boolean couldBeDecrypted();
+
     /**
      * Creation date is produced when an object is serialized. It becomes part of the message.
      * @return
      * @throws ASAPException
      * @throws IOException
+     * @throws ASAPSecurityException if message could not be encrypted
      */
-    Timestamp getCreationTime() throws ASAPException, IOException;
+    Timestamp getCreationTime() throws ASAPException, ASAPSecurityException, IOException;
 
     /**
      * Compare two message what creation date is earlier. It depends on local clocks. It is a hint not more.
@@ -64,6 +76,7 @@ public interface SNMessage {
      * @return
      * @throws ASAPException
      * @throws IOException
+     * @throws ASAPSecurityException if message could not be encrypted
      */
-    boolean isLaterThan(SNMessage message) throws ASAPException, IOException;
+    boolean isLaterThan(SNMessage message) throws ASAPException, ASAPSecurityException, IOException;
 }