ASAP Service creates engines based on creation intent - allows app developer to set up new asap apps by using a constructor instead of creating a folder under root asap folder

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/libs/ASAP_Engine_0.5.0.jar

@@ -25,4 +25,5 @@ public class ASAP {
     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";
 }

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

@@ -8,23 +8,27 @@
 import net.sharksystem.asap.MultiASAPEngineFS;
 import net.sharksystem.asap.android.service.ASAPService;
 
-public class ASAPServiceCreationIntent extends Intent {
+import java.util.ArrayList;
+import java.util.Collection;
 
+public class ASAPServiceCreationIntent extends Intent {
     private final CharSequence owner;
     private final CharSequence rootFolder;
     private final boolean onlineExchange;
     private final long maxExecutionTime;
+    private ArrayList<CharSequence> supportFormatsList;
 
     public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequence rootFolder,
-                                     boolean onlineExchange)
+                                     boolean onlineExchange,
+                                     Collection<CharSequence> supportedFormats)
             throws ASAPException {
 
-        this(activity, owner, rootFolder, onlineExchange,
+        this(activity, owner, rootFolder, onlineExchange, supportedFormats,
                 MultiASAPEngineFS.DEFAULT_MAX_PROCESSING_TIME);
     }
 
     public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequence rootFolder,
-        boolean onlineExchange, long maxExecutionTime)
+        boolean onlineExchange, Collection<CharSequence> supportedFormats, long maxExecutionTime)
             throws ASAPException {
 
         super(activity, ASAPService.class);
@@ -37,10 +41,18 @@ public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequ
         this.putExtra(ASAP.ONLINE_EXCHANGE, onlineExchange);
         this.putExtra(ASAP.MAX_EXECUTION_TIME, maxExecutionTime);
 
+        ArrayList<CharSequence> supportFormatsList = new ArrayList<>();
+        for(CharSequence supportedFormat : supportedFormats) {
+            supportFormatsList.add(supportedFormat);
+        }
+        this.putCharSequenceArrayListExtra(ASAP.SUPPORTED_FORMATS, supportFormatsList);
+
+
         this.owner = owner;
         this.rootFolder = rootFolder;
         this.onlineExchange = onlineExchange;
         this.maxExecutionTime = maxExecutionTime;
+        this.supportFormatsList = supportFormatsList;
     }
 
     public ASAPServiceCreationIntent(Intent intent) {
@@ -53,7 +65,7 @@ public ASAPServiceCreationIntent(Intent intent) {
                 ASAP.ONLINE_EXCHANGE_DEFAULT);
         this.maxExecutionTime = intent.getLongExtra(ASAP.MAX_EXECUTION_TIME,
                 MultiASAPEngineFS.DEFAULT_MAX_PROCESSING_TIME);
-
+        this.supportFormatsList = intent.getCharSequenceArrayListExtra(ASAP.SUPPORTED_FORMATS);
     }
 
     public CharSequence getOwner() {
@@ -72,6 +84,10 @@ public long getMaxExecutionTime() {
         return this.maxExecutionTime;
     }
 
+    public ArrayList getSupportedFormats() {
+        return this.supportFormatsList;
+    }
+
     public String toString() {
         StringBuilder sb = new StringBuilder();
 
@@ -83,8 +99,9 @@ public String toString() {
         sb.append(this.onlineExchange);
         sb.append(" | maxExecutionTime: ");
         sb.append(this.maxExecutionTime);
+        sb.append(" | supportedFormats: ");
+        sb.append(this.supportFormatsList);
 
         return sb.toString();
     }
-
 }

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

@@ -76,10 +76,11 @@ protected ASAPApplication() {
                 ASAP.ONLINE_EXCHANGE_DEFAULT);
     }
 
-    protected ASAPApplication(Collection<CharSequence> supportedFormats,
+    private ASAPApplication(Collection<CharSequence> supportedFormats,
                               CharSequence asapOwner,
                               CharSequence rootFolder,
                               boolean onlineExchange) {
+
         this.supportedFormats = supportedFormats;
         this.asapOwner = asapOwner;
         this.rootFolder = rootFolder;
@@ -115,7 +116,7 @@ private void initialize() {
 
             try {
                 Intent asapServiceCreationIntent = new ASAPServiceCreationIntent(activity,
-                        this.asapOwner, this.rootFolder, this.onlineExchange);
+                        this.asapOwner, this.rootFolder, this.onlineExchange, this.supportedFormats);
 
                 Log.d(this.getLogStart(), "start service with intent: "
                         + asapServiceCreationIntent.toString());

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

@@ -18,6 +18,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Class handles messages on service side.
+ */
 class ASAPMessageHandler extends Handler {
     private static final String LOGSTART = "ASAPMessageHandler";
     private ASAPService asapService;

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

@@ -29,6 +29,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -49,6 +50,7 @@ public class ASAPService extends Service implements ASAPChunkReceivedListener,
     private CharSequence rootFolder;
     private boolean onlineExchange;
     private long maxExecutionTime;
+    private ArrayList<CharSequence> supportedFormats;
 
     String getASAPRootFolderName() {
         return this.asapEngineRootFolderName;
@@ -77,12 +79,15 @@ public MultiASAPEngineFS getMultiASAPEngine() {
             File rootFolder = new File(this.asapEngineRootFolderName);
             try {
                 if (!rootFolder.exists()) {
-                    Log.d(LOGSTART,"createFolder");
+                    Log.d(LOGSTART,"root folder does not exist - create");
                     rootFolder.mkdirs();
-                    Log.d(LOGSTART,"createdFolder");
+                    Log.d(LOGSTART,"done creating root folder");
                 }
+
                 this.asapMultiEngine = MultiASAPEngineFS_Impl.createMultiEngine(
-                        this.owner, this.asapEngineRootFolderName, this.maxExecutionTime, this);
+                        this.owner, this.asapEngineRootFolderName,
+                        this.maxExecutionTime, this.supportedFormats, this);
+
                 Log.d(LOGSTART,"engine created");
 
                 this.asapMultiEngine.addOnlinePeersChangedListener(this);
@@ -135,6 +140,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             this.rootFolder = asapServiceCreationIntent.getRootFolder();
             this.onlineExchange = asapServiceCreationIntent.isOnlineExchange();
             this.maxExecutionTime = asapServiceCreationIntent.getMaxExecutionTime();
+            this.supportedFormats = asapServiceCreationIntent.getSupportedFormats();
         }
 
         // get root directory

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

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
 
 
         // NOTE: Do not place your application dependencies here; they belong