altos{lib,ui,droid}: move OS specific code out of altoslib

This is to allow the usage of AltosLog on Android - no swing, so
we need to push the "home directory" code used to pick a default
telemetry logging path - using the PreferencesBackend interface
for now.

Signed-off-by: Mike Beattie <mike@ethernal.org>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index b8487d073a7fb7a3dcc27294f6b9d93d4e0e9e4f..3b4bdcf85ecac3f1e7c50792a7cd8198403542b6 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -17,9 +17,12 @@
 
 package org.altusmetrum.AltosDroid;
 
+import java.io.File;
 import java.util.Map;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Environment;
+
 import org.altusmetrum.AltosLib.*;
 
 public class AltosDroidPreferences implements AltosPreferencesBackend {
@@ -92,4 +95,7 @@ public class AltosDroidPreferences implements AltosPreferencesBackend {
                editor.apply();
        }
 
+       public File homeDirectory() {
+               return Environment.getExternalStorageDirectory();
+       }
 }

diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index a82ea3f67f0e4ba5229a5dc6d2abb0314c9ab663..47196d6e70b89342ef3f876207bef574bcb941f4 100644 (file)
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -19,7 +19,6 @@ package org.altusmetrum.AltosLib;
 
 import java.io.*;
 import java.util.*;
-import javax.swing.filechooser.FileSystemView;
 
 public class AltosPreferences {
        public static AltosPreferencesBackend backend = null;
@@ -145,8 +144,7 @@ public class AltosPreferences {
                if (logdir_string != null)
                        logdir = new File(logdir_string);
                else {
-                       /* Use the file system view default directory */
-                       logdir = new File(FileSystemView.getFileSystemView().getDefaultDirectory(), logdirName);
+                       logdir = new File(backend.homeDirectory(), logdirName);
                        if (!logdir.exists())
                                logdir.mkdirs();
                }

diff --git a/altoslib/AltosPreferencesBackend.java b/altoslib/AltosPreferencesBackend.java
index 3fc4b0aab93ad3d4dee1662c3c217beb9329e48b..a1184c0bc54c54dde9ca6ffcfeb592b5d72144eb 100644 (file)
--- a/altoslib/AltosPreferencesBackend.java
+++ b/altoslib/AltosPreferencesBackend.java
@@ -17,6 +17,8 @@
 
 package org.altusmetrum.AltosLib;
 
+import java.io.File;
+
 public interface AltosPreferencesBackend {
 
        public String  getString(String key, String def);
@@ -38,4 +40,6 @@ public interface AltosPreferencesBackend {
        public void    remove(String key);
 
        public void    flush();
+
+       public File homeDirectory();
 }

diff --git a/altosui/AltosUIPreferencesBackend.java b/altosui/AltosUIPreferencesBackend.java
index 210dcb8bb14cdebb536ce18fb29637ade64f038c..3131fd3286ce917de9f3cf5c7eee1e23d5cc716f 100644 (file)
--- a/altosui/AltosUIPreferencesBackend.java
+++ b/altosui/AltosUIPreferencesBackend.java
@@ -17,8 +17,10 @@
 
 package altosui;
 
+import java.io.File;
 import java.util.prefs.*;
 import org.altusmetrum.AltosLib.*;
+import javax.swing.filechooser.FileSystemView;
 
 public class AltosUIPreferencesBackend implements AltosPreferencesBackend {
 
@@ -92,4 +94,8 @@ public class AltosUIPreferencesBackend implements AltosPreferencesBackend {
                }
        }
 
+       public File homeDirectory() {
+               /* Use the file system view default directory */
+               return FileSystemView.getFileSystemView().getDefaultDirectory();
+       }
 }