dealing better with user name - service got aware of it.

Author: thsc42

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

@@ -4,6 +4,10 @@
 import android.content.Context;
 import android.util.Log;
 
+import net.sharksystem.asap.ASAPException;
+
+import java.io.File;
+
 public class Util {
     public static void unregisterBCR(String logstart, Context context, BroadcastReceiver bcr) {
         try {
@@ -16,4 +20,36 @@ public static void unregisterBCR(String logstart, Context context, BroadcastRece
                     + e.getLocalizedMessage());
         }
     }
+
+    static String makeValidFolderName(CharSequence rootFolder, CharSequence owner) {
+        Log.d("Util", "create asap folder name is just a dummy.");
+        return rootFolder + "/userName";
+    }
+
+    public static File getASAPRootDirectory(Context ctx,
+                                    CharSequence rootFolder, CharSequence owner) {
+
+        File dir = ctx.getExternalFilesDir(Util.makeValidFolderName(rootFolder, owner));
+
+        Log.d("Util", "try: " + dir.getAbsolutePath());
+        try {
+            dir.mkdirs();
+            return dir;
+        }
+        catch(RuntimeException e) {
+            Log.d("Util", "cannot create directory: " + dir.getAbsolutePath()
+                    + " | " + e.getLocalizedMessage() + "try rootFolder only");
+        }
+
+        Log.d("Util", "try: getExternalFilesDir(null)" + dir.getAbsolutePath());
+        return ctx.getExternalFilesDir(null);
+    }
+
+    public static String getLogStart(Object o) {
+        return o.getClass().getSimpleName();
+    }
+
+    private String getLogStart() {
+        return Util.getLogStart(this);
+    }
 }

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

@@ -116,7 +116,7 @@ public void sendMessage2Service(Message msg) {
         }
     }
 
-    private String getLogStart() {
+    protected String getLogStart() {
         return this.getClass().getSimpleName();
     }
 

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

@@ -11,7 +11,7 @@
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.android.ASAP;
 import net.sharksystem.asap.android.ASAPServiceCreationIntent;
-import net.sharksystem.asap.android.service.ASAPService;
+import net.sharksystem.asap.android.Util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,9 +22,10 @@
 
 public class ASAPApplication {
     private static final int MY_ASK_FOR_PERMISSIONS_REQUEST = 100;
-    private final CharSequence asapOwner;
-    private final CharSequence rootFolder;
-    private final boolean onlineExchange;
+    private static ASAPApplication singleton;
+    private CharSequence asapOwner;
+    private CharSequence rootFolder;
+    private boolean onlineExchange;
     private boolean initialized = false;
 
     private boolean btDisoverableOn = false;
@@ -38,8 +39,12 @@ public class ASAPApplication {
     private List<String> deniedPermissions = new ArrayList<>();
     private int activityCount = 0;
 
-    protected ASAPApplication(CharSequence asapOwner) {
-        this(asapOwner, DEFAULT_ROOT_FOLDER_NAME, ASAP.ONLINE_EXCHANGE_DEFAULT);
+    /**
+     * setup application by calling getASAPOwner(), getFolderName(), getASAPOnlineExchange().
+     * Those messagen can and should be overwritten from actual implementations.
+     */
+    protected ASAPApplication() {
+        this(ASAP.UNKNOWN_USER, DEFAULT_ROOT_FOLDER_NAME, ASAP.ONLINE_EXCHANGE_DEFAULT);
     }
 
     protected ASAPApplication(CharSequence asapOwner,
@@ -72,6 +77,11 @@ private void initialize() {
 //            Intent asapServiceCreationIntent = new Intent(activity, ASAPService.class);
 //            asapServiceCreationIntent.putExtra(ASAP.USER, this.asapOwner);
 
+            // get owner when initializing
+            this.asapOwner = this.getASAPOwner(this.getActivity());
+            this.rootFolder = this.getASAPRootFolder(this.getActivity());
+            this.onlineExchange = this.getASAPOnlineExchange(this.getActivity());
+
             try {
                 Intent asapServiceCreationIntent = new ASAPServiceCreationIntent(activity,
                         this.asapOwner, this.rootFolder, this.onlineExchange);
@@ -84,10 +94,51 @@ private void initialize() {
         }
     }
 
+    /**
+     * could be overwritten
+     * @param activity
+     * @return
+     */
+    protected boolean getASAPOnlineExchange(Activity activity) {
+        return this.onlineExchange;
+    }
+
+    public boolean getASAPOnlineExchange() {
+        return this.onlineExchange;
+    }
+
+    /**
+     * could be overwritten
+     */
+    protected CharSequence getASAPRootFolder(Activity activity) {
+        return this.rootFolder;
+    }
+
+    public CharSequence getASAPRootFolder() {
+        return Util.getASAPRootDirectory(
+                this.getActivity(), this.rootFolder, this.asapOwner).getAbsolutePath();
+    }
+
+    /**
+     * could be overwritten
+     */
+    protected CharSequence getASAPOwner(Activity activity) {
+        return this.asapOwner;
+    }
+
+    public CharSequence getASAPOwner() {
+        return this.asapOwner;
+    }
+
     public static ASAPApplication getASAPApplication() {
-        return new ASAPApplication("DummyUser");
+        if(ASAPApplication.singleton == null) {
+            ASAPApplication.singleton = new ASAPApplication();
+        }
+
+        return ASAPApplication.singleton;
     }
 
+
     public void activityCreated(ASAPActivity asapActivity) {
         this.setActivity(asapActivity);
         this.initialize();

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

@@ -76,10 +76,6 @@ else if(view == findViewById(R.id.startDiscovery)) {
         }
     }
 
-    private String getLogStart() {
-        return "ASAPExampleActivity";
-    }
-
     @Override
     public void asapNotifyBTDiscoverableStopped() {
         super.asapNotifyBTDiscoverableStopped();

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

@@ -4,7 +4,6 @@
 import android.app.Service;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.Environment;
 import android.os.IBinder;
 import android.os.Messenger;
 import android.support.v4.content.ContextCompat;
@@ -19,6 +18,7 @@
 import net.sharksystem.asap.MultiASAPEngineFS_Impl;
 import net.sharksystem.asap.android.ASAP;
 import net.sharksystem.asap.android.ASAPBroadcastIntent;
+import net.sharksystem.asap.android.Util;
 import net.sharksystem.asap.android.bluetooth.BluetoothEngine;
 import net.sharksystem.asap.android.wifidirect.WifiP2PEngine;
 
@@ -98,7 +98,7 @@ public void onCreate() {
         Log.d(LOGSTART,"onCreate");
     }
 
-    // comes second - could remove that overwriting method
+    // comes second - do initializing stuff here
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.d(LOGSTART, "onStartCommand");
@@ -118,7 +118,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         // get root directory
         File asapRoot = null;
-        asapRoot = Environment.getExternalStoragePublicDirectory(this.rootFolder.toString());
+        //asapRoot = Environment.getExternalStoragePublicDirectory(this.rootFolder.toString());
+        Log.d(LOGSTART, "use Util.getASAPRootDirectory()");
+        asapRoot = Util.getASAPRootDirectory(this, this.rootFolder, this.owner);
 
         this.asapEngineRootFolderName = asapRoot.getAbsolutePath();
         Log.d(LOGSTART,"work with folder: " + this.asapEngineRootFolderName);