still on simultaneous online / offline asap exchange

Author: thsc42

app/build.gradle

@@ -3,14 +3,14 @@ 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
     defaultConfig {
         // we produce a library by commenting out that line:
-  //      applicationId "net.sharksystem.asap.example"
+        applicationId "net.sharksystem.asap.example"
         minSdkVersion 23
         targetSdkVersion 28
         versionCode 1

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

@@ -26,7 +26,7 @@ static String makeValidFolderName(CharSequence rootFolder, CharSequence ownerNam
         // substitute special chars
         String folderName = Utils.url2FileName(ownerName.toString());
         Log.d("Util", "create asap folder for "
-                + ownerName + " | use folderName" + folderName);
+                + ownerName + " | use folderName: " + folderName);
 
         return rootFolder + "/" + folderName;
     }

app/src/main/java/net/sharksystem/asap/android/bluetooth/BluetoothEngine.java

@@ -46,10 +46,6 @@ public static BluetoothEngine getASAPBluetoothEngine(ASAPService ASAPService,
         return BluetoothEngine.engine;
     }
 
-    public static BluetoothEngine getASAPBluetoothEngine() {
-        return BluetoothEngine.engine;
-    }
-
     private BluetoothEngine(ASAPService ASAPService, Context context) {
         super(ASAPService, context);
 

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

@@ -184,7 +184,9 @@ void startBluetooth() {
     void stopBluetooth() {
         Log.d("ASAPService", "stop bluetooth");
 
-        BluetoothEngine asapBluetoothEngine = BluetoothEngine.getASAPBluetoothEngine();
+        BluetoothEngine asapBluetoothEngine =
+                BluetoothEngine.getASAPBluetoothEngine(this, this);
+
         if(asapBluetoothEngine != null) {
             asapBluetoothEngine.stop();
         }
@@ -195,7 +197,9 @@ void stopBluetooth() {
     void startBluetoothDiscoverable() {
         Log.d("ASAPService", "start bluetooth discoverable");
 
-        BluetoothEngine asapBluetoothEngine = BluetoothEngine.getASAPBluetoothEngine();
+        BluetoothEngine asapBluetoothEngine =
+                BluetoothEngine.getASAPBluetoothEngine(this, this);
+
         asapBluetoothEngine.startDiscoverable();
 
         Log.d("ASAPService", "started bluetooth discoverable");
@@ -205,7 +209,9 @@ void startBluetoothDiscoverable() {
     public void startBluetoothDiscovery() {
         Log.d("ASAPService", "start bluetooth discovery");
 
-        BluetoothEngine asapBluetoothEngine = BluetoothEngine.getASAPBluetoothEngine();
+        BluetoothEngine asapBluetoothEngine =
+                BluetoothEngine.getASAPBluetoothEngine(this, this);
+
         asapBluetoothEngine.startDiscovery();
 
         Log.d("ASAPService", "started bluetooth discovery");