I would call it release candidate

Author: thsc42

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

@@ -7,10 +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 SENDER_POINT2POINT = "senderP2P";
-    public static final String VERIFIED = "verified";
-    public static final String ENCRYPTED = "encrypted";
-    public static final String CONNECTION_TYPE = "connectionType";
+    public static final String ASAP_HOP = "asapHop";
 
     public static final String ASAP_CHUNK_RECEIVED_ACTION = "net.sharksystem.asap.received";
 

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

@@ -2,16 +2,17 @@
 
 import android.content.Intent;
 
-import net.sharksystem.EncounterConnectionType;
 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;
 
 public class ASAPChunkReceivedBroadcastIntent extends Intent {
 
-    private final String senderPoint2Point;
-    private final boolean verified;
-    private final boolean encrypted;
-    private final EncounterConnectionType connectionType;
+    private final ASAPHop asapHop;
     private CharSequence folder;
     private CharSequence uri;
     private int era;
@@ -21,8 +22,7 @@ public class ASAPChunkReceivedBroadcastIntent extends Intent {
     public ASAPChunkReceivedBroadcastIntent(CharSequence format, CharSequence senderE2E,
                 CharSequence folderName,
                 CharSequence uri, int era,
-                String senderPoint2Point, boolean verified, boolean encrypted,
-                EncounterConnectionType connectionType) throws ASAPException {
+                ASAPHop asapHop) throws ASAPException {
 
         super();
 
@@ -36,23 +36,24 @@ public ASAPChunkReceivedBroadcastIntent(CharSequence format, CharSequence sender
         this.putExtra(ASAPAndroid.FOLDER, folderName);
         this.putExtra(ASAPServiceMethods.URI_TAG, uri);
         this.putExtra(ASAPAndroid.SENDER_E2E, senderE2E);
-        this.putExtra(ASAPAndroid.SENDER_POINT2POINT, senderPoint2Point);
-        this.putExtra(ASAPAndroid.VERIFIED, verified);
-        this.putExtra(ASAPAndroid.ENCRYPTED, encrypted);
-        this.putExtra(ASAPAndroid.CONNECTION_TYPE, connectionType);
+        try {
+            byte[] asapHopBytes = ASAPSerialization.asapHop2ByteArray(asapHop);
+            this.putExtra(ASAPAndroid.ASAP_HOP, asapHopBytes);
+        }
+        catch(IOException e) {
+            // ignore
+            Log.writeLogErr(this, "cannot serialize ASAPHop: " + asapHop);
+        }
 
         this.format = format;
         this.folder = folderName;
         this.uri = uri;
         this.era = era;
         this.senderE2E = senderE2E;
-        this.senderPoint2Point = senderPoint2Point;
-        this.verified = verified;
-        this.encrypted = encrypted;
-        this.connectionType = connectionType;
+        this.asapHop = asapHop;
     }
 
-    public ASAPChunkReceivedBroadcastIntent(Intent intent) throws ASAPException {
+    public ASAPChunkReceivedBroadcastIntent(Intent intent) throws ASAPException, IOException {
         super();
 
         // just parse extras
@@ -61,10 +62,8 @@ public ASAPChunkReceivedBroadcastIntent(Intent intent) throws ASAPException {
         this.uri = intent.getStringExtra(ASAPServiceMethods.URI_TAG);
         this.era = intent.getIntExtra(ASAPServiceMethods.ERA_TAG, 0);
         this.senderE2E = intent.getStringExtra(ASAPAndroid.SENDER_E2E);
-        this.senderPoint2Point = intent.getStringExtra(ASAPAndroid.SENDER_POINT2POINT);
-        this.verified = intent.getBooleanExtra(ASAPAndroid.VERIFIED, false);
-        this.encrypted = intent.getBooleanExtra(ASAPAndroid.ENCRYPTED, false);
-        this.connectionType = null;
+        byte[] asapHopBytes = intent.getByteArrayExtra(ASAPAndroid.ASAP_HOP);
+        this.asapHop = ASAPSerialization.byteArray2ASAPHop(asapHopBytes);
     }
 
     public CharSequence getFoldername() {
@@ -86,20 +85,7 @@ public int getEra() {
 
     public CharSequence getFormat() { return this.format; }
 
-    public String getSenderPoint2Point() {
-        return this.senderPoint2Point;
-    }
-
-    public boolean getVerified() {
-        return this.verified;
-    }
-
-    public boolean getEncrypted() {
-        return this.encrypted;
-    }
-
-    // TODO
-    public EncounterConnectionType getConnectionType() {
-        throw new SharkNotSupportedException("no implemented yet");
+    public ASAPHop getASAPHop() {
+        return this.asapHop;
     }
 }

app/src/main/java/net/sharksystem/asap/android/apps/ASAPAndroidPeer.java

@@ -578,10 +578,7 @@ void chunkReceived(String format, String senderE2E, String uri, int era, // E2E
                     asapReceivedIntent.getSenderE2E().toString(),
                     asapReceivedIntent.getUri().toString(),
                     asapReceivedIntent.getEra(),
-                    asapReceivedIntent.getSenderPoint2Point(),
-                    asapReceivedIntent.getVerified(),
-                    asapReceivedIntent.getEncrypted(),
-                    asapReceivedIntent.getConnectionType()
+                    asapReceivedIntent.getASAPHop()
                     );
         } catch (ASAPException | IOException e) {
             Log.w(this.getLogStart(), "could call chunk received in local peer proxy: "

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

@@ -7,8 +7,8 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
-import net.sharksystem.EncounterConnectionType;
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.ASAPHop;
 import net.sharksystem.asap.ASAPMessageReceivedListener;
 import net.sharksystem.asap.android.R;
 import net.sharksystem.asap.android.apps.ASAPActivity;
@@ -45,8 +45,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void asapMessagesReceived(ASAPMessages asapMessages,
                                              String senderE2E, // E2E part
-                                             String senderPoint2Point, boolean verified, boolean encrypted, // Point2Point part
-                                             EncounterConnectionType connectionType) {
+                                             ASAPHop asapHop) {
                 Log.d(getLogStart(), "asapMessageReceived");
                 ASAPExampleMessagingActivity.this.doHandleReceivedMessages(asapMessages);
             }

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

@@ -11,9 +11,9 @@
 import androidx.core.content.ContextCompat;
 import android.util.Log;
 
-import net.sharksystem.EncounterConnectionType;
 import net.sharksystem.asap.ASAPEnvironmentChangesListener;
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.ASAPHop;
 import net.sharksystem.asap.ASAPPeer;
 import net.sharksystem.asap.ASAPPeerFS;
 import net.sharksystem.asap.ASAPPeerService;
@@ -401,17 +401,15 @@ public void run() {
 
     @Override
     public void chunkReceived(String format, String senderE2E, String uri, int era, // E2E part
-                              String senderPoint2Point, boolean verified, boolean encrypted, // Point2Point part
-                              EncounterConnectionType connectionType) {
+                              ASAPHop asapHop) {
 
         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,
-                    senderPoint2Point, verified, encrypted, connectionType);
+                    format, senderE2E, this.getASAPRootFolderName(), uri, era, asapHop);
         } catch (ASAPException e) {
             e.printStackTrace();
             return;