Prepare SharkNetMessage to be used in SN2 Android App

Author: thsc42

src/net/sharksystem/asap/ASAPInMemoMessages.java

@@ -20,7 +20,7 @@ class ASAPInMemoMessages implements ASAPMessages {
     private List<ASAPChunk> chunkList;
 
     /** the internal message Cache */
-    private List<CharSequence> messageCache;
+    private List<byte[]> messageCache;
     private int firstIndexMessageCache = -1;
     private int lastIndexMessageCache = -1;
     private int maxCacheLen;
@@ -142,7 +142,12 @@ public Iterator<byte[]> getMessages() throws IOException {
     }
 
     @Override
-    public CharSequence getMessage(int position, boolean chronologically) 
+    public CharSequence getMessageAsCharSequence(int position, boolean chronologically) throws ASAPException, IOException {
+        return new String(this.getMessage(position, chronologically));
+    }
+
+    @Override
+    public byte[] getMessage(int position, boolean chronologically)
             throws ASAPException, IOException {
 
         this.initialize();
@@ -193,7 +198,8 @@ public CharSequence getMessage(int position, boolean chronologically)
         // simple approach in that first implementation ... we keep fitting chunk in memory
         /////////////////////////////////////////////////////////////////
 
-        Iterator<CharSequence> messages = fittingChunk.getMessagesAsCharSequence();
+//        Iterator<CharSequence> messages = fittingChunk.getMessagesAsCharSequence();
+        Iterator<byte[]> messages = fittingChunk.getMessages();
 
         // chunk bigger than max cache size?
         int chunkSize = fittingChunk.getNumberMessage();

src/net/sharksystem/asap/ASAPMessages.java

@@ -63,8 +63,9 @@ public interface ASAPMessages {
      * not exist
      * @throws IOException couldn't read from storage
      */
-    CharSequence getMessage(int position, boolean chronologically)
+    CharSequence getMessageAsCharSequence(int position, boolean chronologically)
             throws ASAPException, IOException;
 
-
+    byte[] getMessage(int position, boolean chronologically)
+            throws ASAPException, IOException;
 }

src/net/sharksystem/crypto/BasicCryptoKeyStorage.java

@@ -37,6 +37,10 @@ public SecretKey generateSymmetricKey() throws ASAPSecurityException {
                 DEFAULT_SYMMETRIC_KEY_TYPE, DEFAULT_AES_KEY_SIZE);
     }
 
+    public int getSymmetricKeyLen() {
+        return BasicKeyStore.DEFAULT_AES_KEY_SIZE;
+    }
+
     private String getLogStart() {
         return this.getClass().getSimpleName() + ": ";
     }

src/net/sharksystem/crypto/BasicKeyStore.java

@@ -48,6 +48,8 @@ public interface BasicKeyStore {
 
     String getSymmetricKeyType();
 
+    int getSymmetricKeyLen();
+
     /**
      *
      * @param peerID

test/net/sharksystem/asap/ChunkCacheTests.java

@@ -52,14 +52,14 @@ public void chunkTest0() throws IOException, ASAPException {
         // now get message chain
         ASAPMessages chunkChain = aliceStorage.getChunkChain(TEST_URI);
         for(int i = 0; i < 0x10; i++) {
-            Assert.assertTrue(chunkChain.getMessage(i, true).toString()
+            Assert.assertTrue(chunkChain.getMessageAsCharSequence(i, true).toString()
                     .equalsIgnoreCase(message[i]));
         }
 
         // now get message chain - reverse order
         chunkChain = aliceStorage.getChunkChain(TEST_URI);
         for(int i = 0; i < 0x10; i++) {
-            Assert.assertTrue(chunkChain.getMessage(i, false).toString()
+            Assert.assertTrue(chunkChain.getMessageAsCharSequence(i, false).toString()
                     .equalsIgnoreCase(message[0xF - i]));
         }
     }