This is not backward compatible and start of 0.4. line. Did some major refactoring. Code duplicates (compared to ASAPJava) are removed. ASAPPeer interface from ASAPJava can now be used in activities. Initialization became easier. This code isn't yet tested enough. A later commit will be basis for a new release.

Author: thsc42

app/build.gradle

@@ -3,16 +3,16 @@ https://developer.android.com/studio/projects/android-library
  */
 
 // choose one line either for an app or a lib
-//apply plugin: 'com.android.application'
-apply plugin: 'com.android.library'
+apply plugin: 'com.android.application'
+//apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         // we produce a library by commenting out that line:
-        //applicationId "net.sharksystem.asap.example"
+        applicationId "net.sharksystem.asap.example"
         minSdkVersion 23
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

app/src/main/AndroidManifest.xml

@@ -14,7 +14,6 @@
         <activity android:name="net.sharksystem.asap.android.example.ASAPInitialExampleActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

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

@@ -1,13 +1,9 @@
 package net.sharksystem.asap.android;
 
-import java.util.UUID;
-
 /**
  * Be sure to have the ASAPEngine in one of your library directories!
  */
 public class ASAPAndroid {
-    public static final String UNKNOWN_USER = "anon";
-
     public static final String USER = "user";
     public static final String FOLDER = "folder";
     public static final String RECIPIENT = "recipient";
@@ -16,8 +12,7 @@ public class ASAPAndroid {
 
     public static final int PORT_NUMBER = 7777;
 
-    public static final String ONLINE_EXCHANGE = "ASAP_ONLINE_EXCHANGE";
-    public static final boolean ONLINE_EXCHANGE_DEFAULT = true;
-    public static final String MAX_EXECUTION_TIME = "ASAP_MAX_EXECUTION_TIME";
-    public static final String SUPPORTED_FORMATS = "ASAP_SUPPORTED_FORMATS";
+    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";
 }

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

@@ -6,6 +6,7 @@
 
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPPeer;
+import net.sharksystem.asap.ASAPPeerService;
 import net.sharksystem.asap.android.service.ASAPService;
 
 import java.util.ArrayList;
@@ -24,7 +25,7 @@ public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequ
             throws ASAPException {
 
         this(activity, owner, rootFolder, onlineExchange, supportedFormats,
-                ASAPPeer.DEFAULT_MAX_PROCESSING_TIME);
+                ASAPPeerService.DEFAULT_MAX_PROCESSING_TIME);
     }
 
     public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequence rootFolder,
@@ -43,15 +44,15 @@ public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequ
 
         this.putExtra(ASAPAndroid.USER, owner);
         this.putExtra(ASAPAndroid.FOLDER, rootFolder);
-        this.putExtra(ASAPAndroid.ONLINE_EXCHANGE, onlineExchange);
-        this.putExtra(ASAPAndroid.MAX_EXECUTION_TIME, maxExecutionTime);
+        this.putExtra(ASAPAndroid.ONLINE_EXCHANGE_PARAMETER_NAME, onlineExchange);
+        this.putExtra(ASAPAndroid.MAX_EXECUTION_TIME_PARAMETER_NAME, maxExecutionTime);
 
         if(supportedFormats != null) {
             this.supportFormatsList = new ArrayList<>();
             for (CharSequence supportedFormat : supportedFormats) {
                 supportFormatsList.add(supportedFormat);
             }
-            this.putCharSequenceArrayListExtra(ASAPAndroid.SUPPORTED_FORMATS, supportFormatsList);
+            this.putCharSequenceArrayListExtra(ASAPAndroid.SUPPORTED_FORMATS_PARAMETER_NAME, supportFormatsList);
         } else {
             Log.d(this.getLogStart(), "no format set - FAILURE?");
         }
@@ -63,11 +64,11 @@ public ASAPServiceCreationIntent(Intent intent) {
         // just parse extras
         this.owner = intent.getStringExtra(ASAPAndroid.USER);
         this.rootFolder = intent.getStringExtra(ASAPAndroid.FOLDER);
-        this.onlineExchange = intent.getBooleanExtra(ASAPAndroid.ONLINE_EXCHANGE,
-                ASAPAndroid.ONLINE_EXCHANGE_DEFAULT);
-        this.maxExecutionTime = intent.getLongExtra(ASAPAndroid.MAX_EXECUTION_TIME,
-                ASAPPeer.DEFAULT_MAX_PROCESSING_TIME);
-        this.supportFormatsList = intent.getCharSequenceArrayListExtra(ASAPAndroid.SUPPORTED_FORMATS);
+        this.onlineExchange = intent.getBooleanExtra(ASAPAndroid.ONLINE_EXCHANGE_PARAMETER_NAME,
+                ASAPPeer.ONLINE_EXCHANGE_DEFAULT);
+        this.maxExecutionTime = intent.getLongExtra(ASAPAndroid.MAX_EXECUTION_TIME_PARAMETER_NAME,
+                ASAPPeerService.DEFAULT_MAX_PROCESSING_TIME);
+        this.supportFormatsList = intent.getCharSequenceArrayListExtra(ASAPAndroid.SUPPORTED_FORMATS_PARAMETER_NAME);
     }
 
     public CharSequence getOwner() {

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

@@ -17,6 +17,7 @@
 import android.widget.Toast;
 
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.ASAPPeer;
 import net.sharksystem.asap.android.ASAPAndroid;
 import net.sharksystem.asap.android.ASAPServiceMessage;
 import net.sharksystem.asap.android.ASAPServiceMethods;
@@ -40,19 +41,30 @@ public class ASAPActivity extends AppCompatActivity implements
     private Messenger mService;
     private boolean mBound;
 
-    private ASAPApplication asapApplication;
+    private ASAPAndroidPeer asapAndroidPeer;
 
     /**
      * Create a new activity object. Make sure your application object is fully
      * instantiated
-     * @param asapApplication
+     * @param asapAndroidPeer
      */
-    public ASAPActivity(ASAPApplication asapApplication) {
-        this.asapApplication = asapApplication;
+    ASAPActivity(ASAPAndroidPeer asapAndroidPeer) {
+        this.asapAndroidPeer = asapAndroidPeer;
     }
 
-    protected ASAPApplication getASAPApplication() {
-        return this.asapApplication;
+    /**
+     * @throws ASAPComponentNotYetInitializedException if ASAPAndroidPeer was not initialized
+     */
+    public ASAPActivity() {
+        this(ASAPAndroidPeer.getASAPAndroidPeer());
+    }
+
+    protected ASAPAndroidPeer getASAPAndroidPeer() {
+        return this.asapAndroidPeer;
+    }
+
+    protected ASAPPeer getASAPPeer() {
+        return this.asapAndroidPeer;
     }
 
     /**
@@ -87,7 +99,6 @@ public final void createClosedASAPChannel(CharSequence appName, CharSequence uri
      */
     public final void sendASAPMessage(CharSequence appName, CharSequence uri,
                     byte[] message, boolean persistent) throws ASAPException {
-
         Log.d(this.getLogStart(), "ask service to send: "
                 + "format: " + appName
                 + "| uri: " + uri
@@ -311,7 +322,7 @@ private void startASAPEngineBroadcasts() {
     }
 
     private void stopASAPEngineBroadcasts() {
-        if(this.getASAPApplication().getNumberASAPActivities() == 1) {
+        if(this.getASAPAndroidPeer().getNumberASAPActivities() == 1) {
             Log.d(this.getLogStart(), "send message to service: stop ASAP Engine Broadcasts");
             this.sendMessage2Service(ASAPServiceMethods.STOP_BROADCASTS);
         } else {
@@ -370,13 +381,13 @@ private void setupASAPChunkReceivedBroadcastReceiver() {
         filter.addAction(ASAPAndroid.ASAP_CHUNK_RECEIVED_ACTION);
 
         // register
-        this.registerReceiver(this.asapApplication, filter);
+        this.registerReceiver(this.asapAndroidPeer, filter);
     }
 
     private void shutdownASAPChunkReceivedBroadcastReceiver() {
         Log.d(this.getLogStart(), "shutdown asap received bc receiver");
         try {
-            this.unregisterReceiver(this.asapApplication);
+            this.unregisterReceiver(this.asapAndroidPeer);
         }
         catch(RuntimeException re) {
             Log.d(this.getLogStart(), "problems when unregister asap received bcr - ignore"
@@ -402,14 +413,14 @@ private void shutdownASAPChunkReceivedBroadcastReceiver() {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.d(this.getLogStart(), "onCreate");
-        this.asapApplication.activityCreated(this);
+        this.asapAndroidPeer.activityCreated(this);
     }
 
     protected void onStart() {
         // Bind to the service
         super.onStart();
         Log.d(this.getLogStart(), "onStart");
-        this.asapApplication.setActivity(this);
+        this.asapAndroidPeer.setActivity(this);
         this.setupASAPServiceNotificationBroadcastReceiver();
         this.setupASAPChunkReceivedBroadcastReceiver();
         this.bindServices();
@@ -420,7 +431,7 @@ protected void onStart() {
     protected void onResume() {
         super.onResume();
         Log.d(this.getLogStart(), "onResume");
-        this.asapApplication.setActivity(this);
+        this.asapAndroidPeer.setActivity(this);
         this.startASAPEngineBroadcasts();
     }
 
@@ -448,7 +459,7 @@ protected void onDestroy() {
         Log.d(this.getLogStart(), "onDestroy");
         this.shutdownASAPServiceNotificationBroadcastReceiver();
         this.unbindServices();
-        this.asapApplication.activityDestroyed(this);
+        this.asapAndroidPeer.activityDestroyed(this);
 
         // forget stored messages
         this.messageStorage = null;
@@ -523,7 +534,7 @@ public void onServiceDisconnected(ComponentName className) {
     @Override
     @CallSuper
     public void asapNotifyBTDiscoverableStarted() {
-        this.asapApplication.setBTDiscoverable(true);
+        this.asapAndroidPeer.notifyBTDiscoverable(true);
     }
 
     /**
@@ -537,7 +548,7 @@ public void asapNotifyBTDiscoverableStarted() {
     @Override
     @CallSuper
     public void asapNotifyBTDiscoverableStopped() {
-        this.asapApplication.setBTDiscoverable(false);
+        this.asapAndroidPeer.notifyBTDiscoverable(false);
     }
 
     /**
@@ -551,7 +562,7 @@ public void asapNotifyBTDiscoverableStopped() {
     @Override
     @CallSuper
     public void asapNotifyBTEnvironmentStarted() {
-        this.asapApplication.setBTEnvironmentRunning(true);
+        this.asapAndroidPeer.notifyBTEnvironmentRunning(true);
     }
 
     /**
@@ -565,7 +576,7 @@ public void asapNotifyBTEnvironmentStarted() {
     @Override
     @CallSuper
     public void asapNotifyBTEnvironmentStopped() {
-        this.asapApplication.setBTEnvironmentRunning(false);
+        this.asapAndroidPeer.notifyBTEnvironmentRunning(false);
     }
 
     /**
@@ -581,7 +592,7 @@ public void asapNotifyBTEnvironmentStopped() {
     @Override
     @CallSuper
     public void asapNotifyOnlinePeersChanged(Set<CharSequence> peerList) {
-        this.asapApplication.setOnlinePeersList(peerList);
+        this.asapAndroidPeer.notifyOnlinePeersChanged(peerList);
     }
 
     /**
@@ -595,7 +606,7 @@ public void asapNotifyOnlinePeersChanged(Set<CharSequence> peerList) {
     @Override
     @CallSuper
     public void asapNotifyBTDiscoveryStarted() {
-        this.asapApplication.setBTDiscovery(true);
+        this.asapAndroidPeer.notifyBTDiscovery(true);
     }
 
     /**
@@ -609,7 +620,7 @@ public void asapNotifyBTDiscoveryStarted() {
     @Override
     @CallSuper
     public void asapNotifyBTDiscoveryStopped() {
-        this.asapApplication.setBTDiscovery(false);
+        this.asapAndroidPeer.notifyBTDiscovery(false);
     }
 
     ////////////////////////////////////////////////////////////////////////////////
@@ -620,20 +631,20 @@ public void asapNotifyBTDiscoveryStopped() {
      * @return true if bluetooth environment is one.
      */
     public boolean isBluetoothEnvironmentOn() {
-        return this.asapApplication.getBTEnvironmentRunning();
+        return this.asapAndroidPeer.getBTEnvironmentRunning();
     }
 
     /**
      * @return true if this device is discoverable now.
      */
     public boolean isBluetoothDiscoverable() {
-        return this.asapApplication.getBTDiscoverable();
+        return this.asapAndroidPeer.getBTDiscoverable();
     }
 
     /**
      * @return true if this device looking for other Bluetooth devices.
      */
     public boolean isBluetoothDiscovery() {
-        return this.asapApplication.getBTDiscovery();
+        return this.asapAndroidPeer.getBTDiscovery();
     }
 }