works with new ASAPJava version.

Author: thsc42

app/src/main/java/net/sharksystem/asap/android/ASAPAndroid.java

@@ -7,7 +7,7 @@ public class ASAPAndroid {
     public static final String SENDER_E2E = "senderE2E";
     public static final String FOLDER = "folder";
     public static final String RECEIVER = "receiver";
-    public static final String ASAP_HOP = "asapHop";
+    public static final String ASAP_HOPS = "asapHops";
 
     public static final String ASAP_CHUNK_RECEIVED_ACTION = "net.sharksystem.asap.received";
 

app/src/main/java/net/sharksystem/asap/android/ASAPChunkReceivedBroadcastIntent.java

@@ -2,27 +2,27 @@
 
 import android.content.Intent;
 
-import net.sharksystem.SharkNotSupportedException;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPHop;
 import net.sharksystem.asap.utils.ASAPSerialization;
 import net.sharksystem.utils.Log;
 
 import java.io.IOException;
+import java.util.List;
 
 public class ASAPChunkReceivedBroadcastIntent extends Intent {
 
-    private final ASAPHop asapHop;
+    private final List<ASAPHop> asapHops;
     private CharSequence folder;
     private CharSequence uri;
     private int era;
     private CharSequence senderE2E;
     private CharSequence format;
 
     public ASAPChunkReceivedBroadcastIntent(CharSequence format, CharSequence senderE2E,
-                CharSequence folderName,
-                CharSequence uri, int era,
-                ASAPHop asapHop) throws ASAPException {
+                                            CharSequence folderName,
+                                            CharSequence uri, int era,
+                                            List<ASAPHop> asapHops) throws ASAPException {
 
         super();
 
@@ -37,20 +37,20 @@ public ASAPChunkReceivedBroadcastIntent(CharSequence format, CharSequence sender
         this.putExtra(ASAPServiceMethods.URI_TAG, uri);
         this.putExtra(ASAPAndroid.SENDER_E2E, senderE2E);
         try {
-            byte[] asapHopBytes = ASAPSerialization.asapHop2ByteArray(asapHop);
-            this.putExtra(ASAPAndroid.ASAP_HOP, asapHopBytes);
+            byte[] asapHopBytes = ASAPSerialization.asapHopList2ByteArray(asapHops);
+            this.putExtra(ASAPAndroid.ASAP_HOPS, asapHopBytes);
         }
         catch(IOException e) {
             // ignore
-            Log.writeLogErr(this, "cannot serialize ASAPHop: " + asapHop);
+            Log.writeLogErr(this, "cannot serialize ASAPHop: " + asapHops);
         }
 
         this.format = format;
         this.folder = folderName;
         this.uri = uri;
         this.era = era;
         this.senderE2E = senderE2E;
-        this.asapHop = asapHop;
+        this.asapHops = asapHops;
     }
 
     public ASAPChunkReceivedBroadcastIntent(Intent intent) throws ASAPException, IOException {
@@ -62,8 +62,8 @@ public ASAPChunkReceivedBroadcastIntent(Intent intent) throws ASAPException, IOE
         this.uri = intent.getStringExtra(ASAPServiceMethods.URI_TAG);
         this.era = intent.getIntExtra(ASAPServiceMethods.ERA_TAG, 0);
         this.senderE2E = intent.getStringExtra(ASAPAndroid.SENDER_E2E);
-        byte[] asapHopBytes = intent.getByteArrayExtra(ASAPAndroid.ASAP_HOP);
-        this.asapHop = ASAPSerialization.byteArray2ASAPHop(asapHopBytes);
+        byte[] asapHopsBytes = intent.getByteArrayExtra(ASAPAndroid.ASAP_HOPS);
+        this.asapHops = ASAPSerialization.byteArray2ASAPHopList(asapHopsBytes);
     }
 
     public CharSequence getFoldername() {
@@ -85,7 +85,7 @@ public int getEra() {
 
     public CharSequence getFormat() { return this.format; }
 
-    public ASAPHop getASAPHop() {
-        return this.asapHop;
+    public List<ASAPHop> getASAPHop() {
+        return this.asapHops;
     }
 }

app/src/main/java/net/sharksystem/asap/android/example/ASAPExampleMessagingActivity.java

@@ -45,7 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void asapMessagesReceived(ASAPMessages asapMessages,
                                              String senderE2E, // E2E part
-                                             ASAPHop asapHop) {
+                                             List<ASAPHop> asapHops) {
                 Log.d(getLogStart(), "asapMessageReceived");
                 ASAPExampleMessagingActivity.this.doHandleReceivedMessages(asapMessages);
             }

app/src/main/java/net/sharksystem/asap/android/service/ASAPService.java

@@ -401,15 +401,15 @@ public void run() {
 
     @Override
     public void chunkReceived(String format, String senderE2E, String uri, int era, // E2E part
-                              ASAPHop asapHop) {
+                              List<ASAPHop> asapHops) {
 
         Log.d(this.getLogStart(), "was notified by asap engine that chunk received - broadcast. Uri: "
                 + uri);
         // issue broadcast
         ASAPChunkReceivedBroadcastIntent intent = null;
         try {
             intent = new ASAPChunkReceivedBroadcastIntent(
-                    format, senderE2E, this.getASAPRootFolderName(), uri, era, asapHop);
+                    format, senderE2E, this.getASAPRootFolderName(), uri, era, asapHops);
         } catch (ASAPException e) {
             e.printStackTrace();
             return;