service and engine is created with valid owner settings

Author: thsc42

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

@@ -23,4 +23,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";
 }

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

@@ -1,20 +1,31 @@
 package net.sharksystem.asap.android;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 
+import net.sharksystem.asap.ASAPEngine;
 import net.sharksystem.asap.ASAPException;
+import net.sharksystem.asap.MultiASAPEngineFS;
 import net.sharksystem.asap.android.service.ASAPService;
 
 public class ASAPServiceCreationIntent extends Intent {
 
     private final CharSequence owner;
     private final CharSequence rootFolder;
     private final boolean onlineExchange;
+    private final long maxExecutionTime;
 
     public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequence rootFolder,
-                                     boolean onlineExchange) throws ASAPException {
+                                     boolean onlineExchange)
+            throws ASAPException {
+
+        this(activity, owner, rootFolder, onlineExchange,
+                MultiASAPEngineFS.DEFAULT_MAX_PROCESSING_TIME);
+    }
+
+    public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequence rootFolder,
+        boolean onlineExchange, long maxExecutionTime)
+            throws ASAPException {
 
         super(activity, ASAPService.class);
 
@@ -24,10 +35,12 @@ public ASAPServiceCreationIntent(Activity activity, CharSequence owner, CharSequ
         this.putExtra(ASAP.USER, owner);
         this.putExtra(ASAP.FOLDER, rootFolder);
         this.putExtra(ASAP.ONLINE_EXCHANGE, onlineExchange);
+        this.putExtra(ASAP.MAX_EXECUTION_TIME, maxExecutionTime);
 
         this.owner = owner;
         this.rootFolder = rootFolder;
         this.onlineExchange = onlineExchange;
+        this.maxExecutionTime = maxExecutionTime;
     }
 
     public ASAPServiceCreationIntent(Intent intent) {
@@ -38,6 +51,8 @@ public ASAPServiceCreationIntent(Intent intent) {
         this.rootFolder = intent.getStringExtra(ASAP.FOLDER);
         this.onlineExchange = intent.getBooleanExtra(ASAP.ONLINE_EXCHANGE,
                 ASAP.ONLINE_EXCHANGE_DEFAULT);
+        this.maxExecutionTime = intent.getLongExtra(ASAP.MAX_EXECUTION_TIME,
+                MultiASAPEngineFS.DEFAULT_MAX_PROCESSING_TIME);
 
     }
 
@@ -52,4 +67,24 @@ public CharSequence getRootFolder() {
     public boolean isOnlineExchange() {
         return this.onlineExchange;
     }
+
+    public long getMaxExecutionTime() {
+        return this.maxExecutionTime;
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("owner: ");
+        sb.append(this.owner);
+        sb.append(" | folder: ");
+        sb.append(this.rootFolder);
+        sb.append(" | onlineExchange: ");
+        sb.append(this.onlineExchange);
+        sb.append(" | maxExecutionTime: ");
+        sb.append(this.maxExecutionTime);
+
+        return sb.toString();
+    }
+
 }

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

@@ -9,6 +9,7 @@
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
+import android.widget.Toast;
 
 import net.sharksystem.asap.ASAPChunkReceivedListener;
 import net.sharksystem.asap.ASAPException;
@@ -93,6 +94,9 @@ private void initialize() {
                 Intent asapServiceCreationIntent = new ASAPServiceCreationIntent(activity,
                         this.asapOwner, this.rootFolder, this.onlineExchange);
 
+                Log.d(this.getLogStart(), "start service with intent: "
+                        + asapServiceCreationIntent.toString());
+
                 this.activity.startService(asapServiceCreationIntent);
                 this.initialized = true;
             } catch (ASAPException e) {
@@ -317,6 +321,12 @@ public void setOnlinePeersList(List<CharSequence> peerList) {
         }
 
         Log.d(this.getLogStart(), sb.toString());
+        if(onlinePeerList.size() < peerList.size()) {
+            Toast.makeText(this.getActivity(), "new online connections", Toast.LENGTH_SHORT);
+        } else {
+            Toast.makeText(this.getActivity(), "online connections changed", Toast.LENGTH_SHORT);
+        }
+
         this.onlinePeerList = peerList;
     }
 }

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

@@ -19,6 +19,7 @@
 import net.sharksystem.asap.MultiASAPEngineFS_Impl;
 import net.sharksystem.asap.android.ASAP;
 import net.sharksystem.asap.android.ASAPChunkReceivedBroadcastIntent;
+import net.sharksystem.asap.android.ASAPServiceCreationIntent;
 import net.sharksystem.asap.android.Util;
 import net.sharksystem.asap.android.bluetooth.BluetoothEngine;
 import net.sharksystem.asap.android.service2AppMessaging.ASAPServiceRequestNotifyIntent;
@@ -47,6 +48,7 @@ public class ASAPService extends Service implements ASAPChunkReceivedListener,
     private CharSequence owner;
     private CharSequence rootFolder;
     private boolean onlineExchange;
+    private long maxExecutionTime;
 
     String getASAPRootFolderName() {
         return this.asapEngineRootFolderName;
@@ -77,7 +79,7 @@ public MultiASAPEngineFS getASAPEngine() {
                     Log.d(LOGSTART,"createdFolder");
                 }
                 this.asapMultiEngine = MultiASAPEngineFS_Impl.createMultiEngine(
-                        this.asapEngineRootFolderName, this);
+                        this.owner, this.asapEngineRootFolderName, this.maxExecutionTime, this);
                 Log.d(LOGSTART,"engine created");
 
                 this.asapMultiEngine.addOnlinePeersChangedListener(this);
@@ -116,13 +118,20 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             this.owner = ASAP.UNKNOWN_USER;
             this.rootFolder = ASAPEngineFS.DEFAULT_ROOT_FOLDER_NAME;
             this.onlineExchange = ASAP.ONLINE_EXCHANGE_DEFAULT;
+            this.maxExecutionTime = MultiASAPEngineFS.DEFAULT_MAX_PROCESSING_TIME;
         } else {
-            Log.d(LOGSTART, "intent is not null");
-            this.owner = intent.getCharSequenceExtra(ASAP.USER);
-            this.rootFolder = intent.getCharSequenceExtra(ASAP.FOLDER);
-            this.onlineExchange = intent.getBooleanExtra(ASAP.ONLINE_EXCHANGE, ASAP.ONLINE_EXCHANGE_DEFAULT);
-            Log.d(LOGSTART, "owner | folder | online == " + this.owner
-                    + " | " + this.rootFolder + " | " + this.onlineExchange);
+            Log.d(LOGSTART, "service was created with an intent");
+
+            ASAPServiceCreationIntent asapServiceCreationIntent =
+                    new ASAPServiceCreationIntent(intent);
+
+            Log.d(this.getLogStart(), "started with intent: "
+                    + asapServiceCreationIntent.toString());
+
+            this.owner = asapServiceCreationIntent.getOwner();
+            this.rootFolder = asapServiceCreationIntent.getRootFolder();
+            this.onlineExchange = asapServiceCreationIntent.isOnlineExchange();
+            this.maxExecutionTime = asapServiceCreationIntent.getMaxExecutionTime();
         }
 
         // get root directory
@@ -248,7 +257,8 @@ public void propagateProtocolStatus() throws ASAPException {
 
     @Override
     public void chunkReceived(String sender, String uri, int era) {
-        Log.d(LOGSTART, "was notified ba engine that chunk received. Uri: " + uri);
+        Log.d(LOGSTART, "was notified by asap engine that chunk received - broadcast. Uri: "
+                + uri);
         // issue broadcast
         ASAPChunkReceivedBroadcastIntent intent = null;
         try {