works with new ASAPJava version.

thsc42 · thsc42 · commit 2475c26b5b91 · 2021-05-21T09:31:34.000+02:00
diff --git a/app/src/main/java/net/sharksystem/asap/android/ASAPAndroid.java b/app/src/main/java/net/sharksystem/asap/android/ASAPAndroid.java
@@ -4,9 +4,13 @@
  * Be sure to have the ASAPEngine in one of your library directories!
  */
 public class ASAPAndroid {
-    public static final String USER = "user";
+    public static final String SENDER_E2E = "senderE2E";
     public static final String FOLDER = "folder";
-    public static final String RECIPIENT = "recipient";
+    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_CHUNK_RECEIVED_ACTION = "net.sharksystem.asap.received";
 
@@ -15,4 +19,5 @@ public class ASAPAndroid {
     public static final String ONLINE_EXCHANGE_PARAMETER_NAME = "ASAP_ONLINE_EXCHANGE";
     public static final String MAX_EXECUTION_TIME_PARAMETER_NAME = "ASAP_MAX_EXECUTION_TIME";
     public static final String SUPPORTED_FORMATS_PARAMETER_NAME = "ASAP_SUPPORTED_FORMATS";
+
 }
diff --git a/app/src/main/java/net/sharksystem/asap/android/ASAPChunkReceivedBroadcastIntent.java b/app/src/main/java/net/sharksystem/asap/android/ASAPChunkReceivedBroadcastIntent.java
@@ -2,36 +2,54 @@
 
 import android.content.Intent;
 
+import net.sharksystem.EncounterConnectionType;
+import net.sharksystem.SharkNotSupportedException;
 import net.sharksystem.asap.ASAPException;
 
 public class ASAPChunkReceivedBroadcastIntent extends Intent {
 
+    private final String senderPoint2Point;
+    private final boolean verified;
+    private final boolean encrypted;
+    private final EncounterConnectionType connectionType;
     private CharSequence folder;
     private CharSequence uri;
     private int era;
-    private CharSequence user;
+    private CharSequence senderE2E;
     private CharSequence format;
 
-    public ASAPChunkReceivedBroadcastIntent(CharSequence format, CharSequence user, CharSequence folderName,
-                                            CharSequence uri, int eraInt) throws ASAPException {
+    public ASAPChunkReceivedBroadcastIntent(CharSequence format, CharSequence senderE2E,
+                CharSequence folderName,
+                CharSequence uri, int era,
+                String senderPoint2Point, boolean verified, boolean encrypted,
+                EncounterConnectionType connectionType) throws ASAPException {
+
         super();
 
-        if(format == null || folderName == null || uri == null || user == null)
+        if(format == null || folderName == null || uri == null || senderE2E == null)
             throw new ASAPException("parameters must no be null");
 
         this.setAction(ASAPAndroid.ASAP_CHUNK_RECEIVED_ACTION);
 
-        this.putExtra(ASAPServiceMethods.ERA_TAG, eraInt);
+        this.putExtra(ASAPServiceMethods.ERA_TAG, era);
         this.putExtra(ASAPServiceMethods.FORMAT_TAG, format);
         this.putExtra(ASAPAndroid.FOLDER, folderName);
         this.putExtra(ASAPServiceMethods.URI_TAG, uri);
-        this.putExtra(ASAPAndroid.USER, user);
+        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);
 
         this.format = format;
         this.folder = folderName;
         this.uri = uri;
         this.era = era;
-        this.user = user;
+        this.senderE2E = senderE2E;
+        this.senderPoint2Point = senderPoint2Point;
+        this.verified = verified;
+        this.encrypted = encrypted;
+        this.connectionType = connectionType;
     }
 
     public ASAPChunkReceivedBroadcastIntent(Intent intent) throws ASAPException {
@@ -42,7 +60,11 @@ public ASAPChunkReceivedBroadcastIntent(Intent intent) throws ASAPException {
         this.folder = intent.getStringExtra(ASAPAndroid.FOLDER);
         this.uri = intent.getStringExtra(ASAPServiceMethods.URI_TAG);
         this.era = intent.getIntExtra(ASAPServiceMethods.ERA_TAG, 0);
-        this.user = intent.getStringExtra(ASAPAndroid.USER);
+        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;
     }
 
     public CharSequence getFoldername() {
@@ -53,13 +75,31 @@ public CharSequence getUri() {
         return this.uri;
     }
 
-    public CharSequence getUser() {
-        return this.user;
+    public CharSequence getSenderE2E() {
+        // TODO E2ESender == owner???
+        return this.senderE2E;
     }
 
     public int getEra() {
         return this.era;
     }
 
     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");
+    }
 }
diff --git a/app/src/main/java/net/sharksystem/asap/android/ASAPServiceCreationIntent.java b/app/src/main/java/net/sharksystem/asap/android/ASAPServiceCreationIntent.java
@@ -42,7 +42,7 @@ public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequ
         this.onlineExchange = onlineExchange;
         this.maxExecutionTime = maxExecutionTime;
 
-        this.putExtra(ASAPAndroid.USER, owner);
+        this.putExtra(ASAPAndroid.SENDER_E2E, owner);
         this.putExtra(ASAPAndroid.FOLDER, rootFolder);
         this.putExtra(ASAPAndroid.ONLINE_EXCHANGE_PARAMETER_NAME, onlineExchange);
         this.putExtra(ASAPAndroid.MAX_EXECUTION_TIME_PARAMETER_NAME, maxExecutionTime);
@@ -62,7 +62,7 @@ public ASAPServiceCreationIntent(Intent intent) {
         super();
 
         // just parse extras
-        this.owner = intent.getStringExtra(ASAPAndroid.USER);
+        this.owner = intent.getStringExtra(ASAPAndroid.SENDER_E2E);
         this.rootFolder = intent.getStringExtra(ASAPAndroid.FOLDER);
         this.onlineExchange = intent.getBooleanExtra(ASAPAndroid.ONLINE_EXCHANGE_PARAMETER_NAME,
                 ASAPPeer.ONLINE_EXCHANGE_DEFAULT);
diff --git a/app/src/main/java/net/sharksystem/asap/android/apps/ASAPAndroidPeer.java b/app/src/main/java/net/sharksystem/asap/android/apps/ASAPAndroidPeer.java
@@ -13,6 +13,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import net.sharksystem.SharkNotSupportedException;
 import net.sharksystem.asap.ASAPEnvironmentChangesListener;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPMessageReceivedListener;
@@ -303,6 +304,16 @@ public ASAPStorage getASAPStorage(CharSequence format) throws IOException, ASAPE
         return this.getASAPPeerApplicationSide().getASAPStorage(format);
     }
 
+    @Override
+    public boolean isASAPRoutingAllowed(CharSequence charSequence) throws IOException, ASAPException {
+        throw new SharkNotSupportedException("no implemented yet");
+    }
+
+    @Override
+    public void setASAPRoutingAllowed(CharSequence charSequence, boolean b) throws IOException, ASAPException {
+        throw new SharkNotSupportedException("no implemented yet");
+    }
+
     private void askForPermissions(Activity activity) {
         if(this.requiredPermissions.size() < 1) {
             Log.d(this.getLogStart(), "no further permissions to ask for");
@@ -556,12 +567,22 @@ public void onReceive(Context context, Intent intent) {
             ASAPChunkReceivedBroadcastIntent asapReceivedIntent
                     = new ASAPChunkReceivedBroadcastIntent(intent);
 
+            /*
+    void chunkReceived(String format, String senderE2E, String uri, int era, // E2E part
+                       String senderPoint2Point, boolean verified, boolean encrypted, // Point2Point part
+                       EncounterConnectionType connectionType) throws IOException;
+             */
             // delegate to local peer proxy
             this.getASAPPeerApplicationSide().chunkReceived(
                     asapReceivedIntent.getFormat().toString(),
-                    asapReceivedIntent.getUser().toString(),
+                    asapReceivedIntent.getSenderE2E().toString(),
                     asapReceivedIntent.getUri().toString(),
-                    asapReceivedIntent.getEra());
+                    asapReceivedIntent.getEra(),
+                    asapReceivedIntent.getSenderPoint2Point(),
+                    asapReceivedIntent.getVerified(),
+                    asapReceivedIntent.getEncrypted(),
+                    asapReceivedIntent.getConnectionType()
+                    );
         } catch (ASAPException | IOException e) {
             Log.w(this.getLogStart(), "could call chunk received in local peer proxy: "
                     + e.getLocalizedMessage());
diff --git a/app/src/main/java/net/sharksystem/asap/android/example/ASAPExampleMessagingActivity.java b/app/src/main/java/net/sharksystem/asap/android/example/ASAPExampleMessagingActivity.java
@@ -7,6 +7,7 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import net.sharksystem.EncounterConnectionType;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPMessageReceivedListener;
 import net.sharksystem.asap.android.R;
@@ -42,7 +43,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         this.receivedListener = new ASAPMessageReceivedListener() {
             @Override
-            public void asapMessagesReceived(ASAPMessages asapMessages) {
+            public void asapMessagesReceived(ASAPMessages asapMessages,
+                                             String senderE2E, // E2E part
+                                             String senderPoint2Point, boolean verified, boolean encrypted, // Point2Point part
+                                             EncounterConnectionType connectionType) {
                 Log.d(getLogStart(), "asapMessageReceived");
                 ASAPExampleMessagingActivity.this.doHandleReceivedMessages(asapMessages);
             }
diff --git a/app/src/main/java/net/sharksystem/asap/android/service/ASAPService.java b/app/src/main/java/net/sharksystem/asap/android/service/ASAPService.java
@@ -11,6 +11,7 @@
 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.ASAPPeer;
@@ -399,14 +400,18 @@ public void run() {
     private List<ASAPChunkReceivedBroadcastIntent> chunkReceivedBroadcasts = new ArrayList<>();
 
     @Override
-    public void chunkReceived(String format, String sender, String uri, int era) {
+    public void chunkReceived(String format, String senderE2E, String uri, int era, // E2E part
+                              String senderPoint2Point, boolean verified, boolean encrypted, // Point2Point part
+                              EncounterConnectionType connectionType) {
+
         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, sender, this.getASAPRootFolderName(), uri, era);
+                    format, senderE2E, this.getASAPRootFolderName(), uri, era,
+                    senderPoint2Point, verified, encrypted, connectionType);
         } catch (ASAPException e) {
             e.printStackTrace();
             return;
