ASAPApplication supports now ASAPSimplePeer interface. No more code changes required when moving from

Java to Android.

Author: thsc42

app/build.gradle

@@ -27,11 +27,11 @@ android {
 
 dependencies {
     //implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation files('libs/ASAPJava_0.5.0.jar')
 
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation files('libs\\ASAPJava.jar')
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }

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

@@ -25,11 +25,11 @@
 import net.sharksystem.asap.android.service2AppMessaging.ASAPServiceRequestListener;
 import net.sharksystem.asap.android.service2AppMessaging.ASAPServiceRequestNotifyBroadcastReceiver;
 import net.sharksystem.asap.android.service2AppMessaging.ASAPServiceRequestNotifyIntent;
-import net.sharksystem.asap.sharknet.SNMessage;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 public class ASAPActivity extends AppCompatActivity implements
         ASAPServiceRequestListener, ASAPServiceNotificationListener {
@@ -560,10 +560,11 @@ public void asapNotifyBTEnvironmentStopped() {
      *  <br/><br/>
      *  This method called whenever list of connected peers changed. This happens when
      *  a connection is created or broken. The current list of peers comes as parameter.
+     * @param peerList
      */
     @Override
     @CallSuper
-    public void asapNotifyOnlinePeersChanged(List<CharSequence> peerList) {
+    public void asapNotifyOnlinePeersChanged(Set<CharSequence> peerList) {
         this.asapApplication.setOnlinePeersList(peerList);
     }
 

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

@@ -21,6 +21,10 @@
 import net.sharksystem.asap.android.ASAPChunkReceivedBroadcastIntent;
 import net.sharksystem.asap.android.ASAPServiceCreationIntent;
 import net.sharksystem.asap.android.Util;
+import net.sharksystem.asap.apps.ASAPEnvironmentChangesListener;
+import net.sharksystem.asap.apps.ASAPMessageReceivedListener;
+import net.sharksystem.asap.apps.ASAPSimplePeer;
+import net.sharksystem.asap.listenermanager.ASAPEnvironmentChangesListenerManager;
 import net.sharksystem.asap.util.Helper;
 
 import java.io.IOException;
@@ -30,12 +34,14 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static android.support.v4.content.PermissionChecker.PERMISSION_DENIED;
 import static android.support.v4.content.PermissionChecker.PERMISSION_GRANTED;
 import static net.sharksystem.asap.ASAPEngineFS.DEFAULT_ROOT_FOLDER_NAME;
 
-public class ASAPApplication extends BroadcastReceiver {
+// TODO inherit from ASAPBasicAbstractPeer
+public class ASAPApplication extends BroadcastReceiver implements ASAPSimplePeer {
     private static final int MY_ASK_FOR_PERMISSIONS_REQUEST = 100;
     private static ASAPApplication singleton;
     private Collection<CharSequence> supportedFormats;
@@ -54,7 +60,7 @@ public class ASAPApplication extends BroadcastReceiver {
     private List<String> grantedPermissions = new ArrayList<>();
     private List<String> deniedPermissions = new ArrayList<>();
     private int activityASAPActivities = 0;
-    private List<CharSequence> onlinePeerList = new ArrayList<>();
+    private Set<CharSequence> onlinePeerList = new HashSet<>();
 
     /**
      * Setup application using default setting
@@ -463,7 +469,12 @@ public void chunkReceived(String format, String sender, String uri, String folde
             }
 
             for(ASAPMessageReceivedListener messageListener : messageListeners) {
-                messageListener.asapMessagesReceived(asapMessages);
+                try {
+                    messageListener.asapMessagesReceived(asapMessages);
+                } catch (IOException e) {
+                    Log.e(this.getLogStart(), "calling messageReceivedListener: "
+                            + e.getLocalizedMessage());
+                }
             }
         }
     }
@@ -499,6 +510,7 @@ public final void removeASAPUriContentChangedListener(
      * @param format
      * @param listener
      */
+    @Override
     public final void addASAPMessageReceivedListener(CharSequence format,
                                        ASAPMessageReceivedListener listener) {
         Log.d(this.getLogStart(), "going to add asap message receiver for " + format);
@@ -513,6 +525,7 @@ public final void addASAPMessageReceivedListener(CharSequence format,
         messageListeners.add(listener);
     }
 
+    @Override
     public final void removeASAPMessageReceivedListener(CharSequence format,
                                                ASAPMessageReceivedListener listener) {
         Collection<ASAPMessageReceivedListener> messageListeners =
@@ -525,11 +538,11 @@ public final void removeASAPMessageReceivedListener(CharSequence format,
         }
     }
 
-    public List<CharSequence> getOnlinePeerList() {
+    public Set<CharSequence> getOnlinePeerList() {
         return this.onlinePeerList;
     }
 
-    public void setOnlinePeersList(List<CharSequence> peerList) {
+    public void setOnlinePeersList(Set<CharSequence> peerList) {
         StringBuilder sb = new StringBuilder();
         sb.append(this.getLogStart());
         sb.append("#online peers: ");
@@ -549,6 +562,9 @@ public void setOnlinePeersList(List<CharSequence> peerList) {
         }
 
         this.onlinePeerList = peerList;
+
+        // notify listeners
+        this.environmentChangesListenerManager.notifyListeners(this.onlinePeerList);
     }
 
     public void setupDrawerLayout(Activity activity) {
@@ -560,4 +576,45 @@ private String getLogStart() {
 //        return "ASAPApplication(" + objectID + ")";
         return "ASAPApplication";
     }
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    //                                        ASAPSimplePeer                                     //
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public CharSequence getPeerName() {
+        return this.asapOwner;
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    //                               ASAPEnvironmentChangesListener                              //
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+
+    private ASAPEnvironmentChangesListenerManager environmentChangesListenerManager =
+            new ASAPEnvironmentChangesListenerManager();
+
+    @Override
+    public void addASAPEnvironmentChangesListener(ASAPEnvironmentChangesListener listener) {
+        this.environmentChangesListenerManager.addASAPEnvironmentChangesListener(listener);
+    }
+
+    @Override
+    public void removeASAPEnvironmentChangesListener(ASAPEnvironmentChangesListener listener) {
+        this.environmentChangesListenerManager.removeASAPEnvironmentChangesListener(listener);
+    }
+
+    @Override
+    public void sendASAPMessage(CharSequence format, CharSequence uri, byte[] message)
+            throws ASAPException {
+
+        Activity activity = this.getActivity();
+        if(activity == null) throw new ASAPException("no active activity");
+
+        if(! (activity instanceof ASAPActivity))
+            throw new ASAPException("current activity not derived from ASAPActivity");
+
+        ASAPActivity asapActivity = (ASAPActivity)activity;
+        asapActivity.sendASAPMessage(format, uri, message, true);
+    }
 }

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

@@ -13,7 +13,7 @@
 import net.sharksystem.asap.android.R;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.Set;
 
 import static net.sharksystem.asap.android.example.ASAPExampleApplication.ASAP_EXAMPLE_APPNAME;
 
@@ -68,7 +68,7 @@ else if(view == findViewById(R.id.startDiscoverableAndDiscovery)) {
     //                         changes in active layer 2 connections                         //
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void asapNotifyOnlinePeersChanged(List<CharSequence> onlinePeerList) {
+    public void asapNotifyOnlinePeersChanged(Set<CharSequence> onlinePeerList) {
         super.asapNotifyOnlinePeersChanged(onlinePeerList);
 
         TextView peerListTextView = this.findViewById(R.id.onlinePeersList);

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

@@ -9,8 +9,8 @@
 
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.android.R;
-import net.sharksystem.asap.android.apps.ASAPMessageReceivedListener;
 import net.sharksystem.asap.ASAPMessages;
+import net.sharksystem.asap.apps.ASAPMessageReceivedListener;
 
 import java.io.IOException;
 import java.util.ArrayList;

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

@@ -1,6 +1,6 @@
 package net.sharksystem.asap.android.service2AppMessaging;
 
-import java.util.List;
+import java.util.Set;
 
 public interface ASAPServiceNotificationListener {
     void asapNotifyBTDiscoverableStopped();
@@ -15,5 +15,5 @@ public interface ASAPServiceNotificationListener {
 
     void asapNotifyBTEnvironmentStopped();
 
-    void asapNotifyOnlinePeersChanged(List<CharSequence> peerList);
+    void asapNotifyOnlinePeersChanged(Set<CharSequence> peerList);
 }

app/src/main/java/net/sharksystem/asap/android/service2AppMessaging/ASAPServiceNotificationListener.java

@@ -9,6 +9,7 @@
 import net.sharksystem.asap.util.Helper;
 
 import java.util.List;
+import java.util.Set;
 
 public class ASAPServiceRequestNotifyBroadcastReceiver extends BroadcastReceiver {
     private final ASAPServiceRequestListener requestListener;
@@ -84,8 +85,8 @@ public void onReceive(Context context, Intent intent) {
                 Log.d(this.getLogStart(), "notified online peers changed");
                 String peers = intent.getStringExtra(ASAPServiceRequestNotifyIntent.ASAP_PARAMETER_1);
                 Log.d(this.getLogStart(), "new peers: " + peers);
-                List<CharSequence> peersList = Helper.string2CharSequenceList(peers);
-                this.notificationListener.asapNotifyOnlinePeersChanged(peersList);
+                Set<CharSequence> peersSet = Helper.string2CharSequenceSet(peers);
+                this.notificationListener.asapNotifyOnlinePeersChanged(peersSet);
                 break;
 
             default: