ready to start debugging sn channels - towards a working version

Author: thsc42

app/src/main/java/net/sharksystem/asap/sharknet/android/SNChannelViewContentAdapter.java

@@ -147,15 +147,29 @@ public static SharkNetMessage parseMessage(byte[] message, String sender, String
             // do we have an decrypted message?
             if(snMessage.couldBeDecrypted()) {
                 byte[] snContent = snMessage.getContent();
-                content2View = String.valueOf(snMessage);
+                content2View = String.valueOf(snContent);
 
                 Timestamp creationTime = snMessage.getCreationTime();
                 timestamp2View = DateTimeHelper.long2DateString(creationTime.getTime());
 
-                sender2View = "from: " + snMessage.getSender();
+                CharSequence senderName = snMessage.getSender();
+                try {
+                    senderName = SNChannelsComponent.getSharkNetChannelComponent().
+                            getPersonName(senderName);
+                }
+                catch(ASAPException e) {
+                    // no name found
+                }
+
+                sender2View = "from: " + senderName;
 
                 if(snMessage.verified()) {
                     verified2View = "verified";
+
+                    int identityAssurance = SNChannelsComponent.getSharkNetChannelComponent().
+                            getAsapPKI().getIdentityAssurance(snMessage.getSender());
+
+                    iA2View = "iA (" + senderName + "): " + identityAssurance;
                 }
             }
 

app/src/main/java/net/sharksystem/asap/sharknet/android/SNChannelsComponent.java

@@ -14,6 +14,7 @@
 import net.sharksystem.asap.android.apps.ASAPComponentNotYetInitializedException;
 import net.sharksystem.asap.android.apps.ASAPMessageReceivedListener;
 import net.sharksystem.crypto.BasicKeyStore;
+import net.sharksystem.persons.ASAPPKI;
 import net.sharksystem.sharknet.android.PersonsStorage;
 import net.sharksystem.sharknet.android.OwnerFactory;
 
@@ -30,15 +31,19 @@ public class SNChannelsComponent implements
     private final BasicKeyStore basicKeyStore;
     private final OwnerFactory ownerFactory;
     private final PersonsStorage personsStorage;
+    private final ASAPPKI asapPKI;
 
     public SNChannelsComponent(ASAPApplication asapApplication,
-                   BasicKeyStore basicKeyStore, OwnerFactory ownerFactory,
+                   BasicKeyStore basicKeyStore,
+                   ASAPPKI asapPKI,
+                   OwnerFactory ownerFactory,
                    PersonsStorage personsStorage) {
 
         // set up component helper
         this.asapComponentHelper = new ASAPApplicationComponentHelper();
         this.asapComponentHelper.setASAPApplication(asapApplication);
         this.basicKeyStore = basicKeyStore;
+        this.asapPKI = asapPKI;
         this.ownerFactory = ownerFactory;
         this.personsStorage = personsStorage;
     }
@@ -49,12 +54,14 @@ public SNChannelsComponent(ASAPApplication asapApplication,
      */
     public static void initialize(ASAPApplication asapApplication,
                       BasicKeyStore basicKeyStore,
+                      ASAPPKI asapPKI,
                       OwnerFactory ownerFactory,
                       PersonsStorage personsStorage) {
         try {
             SNChannelsComponent.instance = new SNChannelsComponent(
                     asapApplication,
                     basicKeyStore,
+                    asapPKI,
                     ownerFactory,
                     personsStorage
             );
@@ -88,6 +95,8 @@ public BasicKeyStore getBasicKeyStore() {
         return this.basicKeyStore;
     }
 
+    public ASAPPKI getAsapPKI() { return this.asapPKI; }
+
     public CharSequence getOwnerID() {
         return this.ownerFactory.getOwner().getUUID();
     }

app/src/main/java/net/sharksystem/sharknet/android/AndroidASAPKeyStorage.java

@@ -13,8 +13,10 @@
 import net.sharksystem.asap.util.DateTimeHelper;
 import net.sharksystem.crypto.ASAPCertificateImpl;
 import net.sharksystem.crypto.ASAPKeyStorage;
+import net.sharksystem.crypto.BasicKeyStore;
 import net.sharksystem.crypto.SharkCryptoException;
 import net.sharksystem.persons.ASAPKeyStoreWithWriteAccess;
+import net.sharksystem.persons.ASAPPKI;
 import net.sharksystem.persons.SampleFullAsapPKIStorage;
 import net.sharksystem.persons.android.PersonsStorageAndroidComponent;
 
@@ -36,7 +38,7 @@
  * Overwrites key creation and add kex persistence to the more general super class
  */
 public class AndroidASAPKeyStorage extends SampleFullAsapPKIStorage
-        implements ASAPKeyStoreWithWriteAccess {
+        implements ASAPKeyStoreWithWriteAccess, ASAPPKI, BasicKeyStore {
 
     private static final String KEYPAIR_CREATION_TIME = "ASAPCertificatesKeyPairCreationTime";
     public static final String KEYSTORE_NAME = "AndroidKeyStore";

app/src/main/java/net/sharksystem/sharknet/android/SharkNetApp.java

@@ -88,6 +88,7 @@ static SharkNetApp initializeSharkNetApp(Activity initActivity) {
             SNChannelsComponent.initialize(
                     SharkNetApp.singleton, // ASAPApplication
                     asapKeyStorage, // BasicKeyStore
+                    asapKeyStorage, // ASAPPKI
                     SharkNetApp.singleton, // OwnerFactory
                     PersonsStorageAndroidComponent.getPersonsStorage() // PersonStorage
             );