Merge branch 'fat-tire-remove_colons'

guardianproject · Oct 3, 2018 · 0265858 · 0265858
2 parents fc4dc2c + 4504262
commit 0265858
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 27 deletions.
diff --git a/src/main/java/org/havenapp/main/Utils.java b/src/main/java/org/havenapp/main/Utils.java
@@ -11,9 +11,9 @@
  * Class containing util functions which will be used multiple times throughout the app.
  */
 
-class Utils {
+public class Utils {
 
-    private static final String DATE_TIME_PATTERN = "yyyy-MM-dd_HH:mm:ss";
+    public static final String DATE_TIME_PATTERN = "yyyy-MM-dd_HH-mm-ss.SSS";
 
     static String getTimerText(long milliseconds) {
         String timerText;
@@ -41,7 +41,7 @@ static String getTimerText(long milliseconds) {
      * The default {@link Locale} is used.
      *
      * @param date concerned {@link Date} instance
-     * @return a string of the format "yyyy-MM-dd_HH:mm:ss" for the corresponding date
+     * @return a string of the format "yyyy-MM-dd_HH-mm-ss.SSS" for the corresponding date
      */
     public static String getDateTime(Date date) {
         return new SimpleDateFormat(DATE_TIME_PATTERN, Locale.getDefault()).format(date);

diff --git a/src/main/java/org/havenapp/main/sensors/media/AudioRecorderTask.java b/src/main/java/org/havenapp/main/sensors/media/AudioRecorderTask.java
@@ -15,9 +15,13 @@
 import android.os.Environment;
 import android.util.Log;
 
-import java.io.File;
-
 import org.havenapp.main.PreferenceManager;
+import org.havenapp.main.Utils;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
 
 public class AudioRecorderTask extends Thread {
 
@@ -69,7 +73,8 @@ protected AudioRecorderTask(Context context) {
 
         File fileFolder = new File(Environment.getExternalStorageDirectory().getPath(),prefs.getDefaultMediaStoragePath());
         fileFolder.mkdirs();
-        audioPath = new File(fileFolder,new java.util.Date().getTime() + ".m4a");
+        audioPath = new File(fileFolder,new SimpleDateFormat(Utils.DATE_TIME_PATTERN,
+				Locale.getDefault()).format(new Date()) + ".m4a");
 
     }
 

diff --git a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java
@@ -28,16 +28,19 @@
 import com.google.android.cameraview.CameraView;
 
 import org.havenapp.main.PreferenceManager;
+import org.havenapp.main.Utils;
 import org.havenapp.main.model.EventTrigger;
 import org.havenapp.main.service.MonitorService;
 import org.jcodec.api.android.AndroidSequenceEncoder;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -145,9 +148,10 @@ public CameraViewHolder(Activity context, CameraView cameraView) {
                         File fileImageDir = new File(Environment.getExternalStorageDirectory(), prefs.getDefaultMediaStoragePath());
                         fileImageDir.mkdirs();
 
-                        String ts = new Date().getTime() + ".jpg";
+                        String ts = new SimpleDateFormat(Utils.DATE_TIME_PATTERN,
+                                Locale.getDefault()).format(new Date());
 
-                        File fileImage = new File(fileImageDir, "detected.original." + ts);
+                        File fileImage = new File(fileImageDir, ts.concat(".detected.original.jpg"));
                         FileOutputStream stream = new FileOutputStream(fileImage);
                         rawBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);
 
@@ -329,7 +333,8 @@ private synchronized boolean recordVideo() {
 
 	    if (doingVideoProcessing)
 	        return false;
-        String ts1 = String.valueOf(new Date().getTime());
+        String ts1 = new SimpleDateFormat(Utils.DATE_TIME_PATTERN,
+                Locale.getDefault()).format(new Date());
         File fileStoragePath = new File(Environment.getExternalStorageDirectory(),prefs.getDefaultMediaStoragePath());
         fileStoragePath.mkdirs();
 

diff --git a/src/main/java/org/havenapp/main/service/WebServer.java b/src/main/java/org/havenapp/main/service/WebServer.java
@@ -6,6 +6,7 @@
 import android.util.Log;
 
 import org.havenapp.main.R;
+import org.havenapp.main.Utils;
 import org.havenapp.main.model.Event;
 import org.havenapp.main.model.EventTrigger;
 
@@ -14,8 +15,10 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.security.MessageDigest;
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 
@@ -169,7 +172,8 @@ private void showEvent (Event event, StringBuffer page) {
         for (EventTrigger eventTrigger: triggers)
         {
             String title = eventTrigger.getStringType(mContext);
-            String desc = eventTrigger.getTriggerTime().toString();
+            String desc = new SimpleDateFormat(Utils.DATE_TIME_PATTERN,
+                    Locale.getDefault()).format(eventTrigger.getTriggerTime());
 
             page.append("<b>");
             page.append(title).append("</b><br/>");

diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.java
@@ -12,11 +12,14 @@
 import com.google.android.material.snackbar.Snackbar;
 
 import org.havenapp.main.R;
+import org.havenapp.main.Utils;
 import org.havenapp.main.model.Event;
 import org.havenapp.main.model.EventTrigger;
 
 import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Locale;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -179,7 +182,9 @@ private String generateLog () {
 
         for (EventTrigger eventTrigger : mEvent.getEventTriggers()) {
 
-            mEventLog.append("Event Triggered @ ").append(eventTrigger.getTriggerTime().toString()).append("\n");
+            mEventLog.append("Event Triggered @ ").append(
+                     new SimpleDateFormat(Utils.DATE_TIME_PATTERN,
+                            Locale.getDefault()).format(eventTrigger.getTriggerTime())).append("\n");
 
             String sType = eventTrigger.getStringType(this);
 

diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@ -18,18 +18,18 @@
 import com.github.derlio.waveform.soundfile.SoundFile;
 import com.stfalcon.frescoimageviewer.ImageViewer;
 
-import org.havenapp.main.R;
 import org.havenapp.main.model.EventTrigger;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.FileProvider;
 import androidx.recyclerview.widget.RecyclerView;
 import nl.changer.audiowife.AudioWife;
 
+import org.havenapp.main.R;
+
 /**
  * Created by n8fr8 on 4/16/17.
  */
@@ -42,8 +42,6 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
 
     private OnItemClickListener clickListener;
 
-    private final static String AUTHORITY = "org.havenapp.main.fileprovider";
-
     EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers) {
         this.context = context;
         this.eventTriggers = eventTriggers;
@@ -54,12 +52,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
             if (trigger.getType() == EventTrigger.CAMERA
                     && (!TextUtils.isEmpty(trigger.getPath())))
             {
-                Uri fileUri = FileProvider.getUriForFile(
-                        context,
-                        AUTHORITY,
-                        new File(trigger.getPath()));
-
-                eventTriggerImagePaths.add(fileUri);
+                eventTriggerImagePaths.add(Uri.fromFile( new File(trigger.getPath())));
             }
         }
     }
@@ -113,10 +106,7 @@ public boolean onLongClick(View view) {
                 case EventTrigger.CAMERA:
                     holder.image.setVisibility(View.VISIBLE);
 
-                    Uri fileUri = FileProvider.getUriForFile(
-                            context,
-                            AUTHORITY,
-                            new File(eventTrigger.getPath()));
+                    Uri fileUri = Uri.fromFile(new File(eventTrigger.getPath()));
                     holder.image.setImageURI(fileUri);
 
                     holder.image.setOnClickListener(view -> {
@@ -170,7 +160,6 @@ public boolean reportProgress(double fractionComplete) {
                     audioWife.init(context, Uri.fromFile(fileSound))
                             .useDefaultUi(holder.extra, inflater);
 
-
                     break;
                 case EventTrigger.ACCELEROMETER:
                     desc += "\n" + context.getString(R.string.data_speed) + ": " + eventTrigger.getPath();

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -159,4 +159,8 @@
     <string name="config_storage_path">Storage Folder Path</string>
     <string name="config_storage_page_hint">Where captured media is stored</string>
 
+    <!-- accepted digits for directory name - may vary for locale/platform/etc.
+         Skipping periods, spaces, and other special characters to keep it simple -->
+    <string name="path_chars">0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_/</string>
+
 </resources>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
@@ -12,6 +12,7 @@
         android:summary="@string/config_storage_page_hint"
         android:title="@string/config_storage_path"
         android:defaultValue="/haven"
+        android:digits="@string/path_chars"
         />
 
     <Preference
@@ -139,4 +140,4 @@
             android:title="@string/password" />
     </PreferenceCategory>
 
-</PreferenceScreen>
+</PreferenceScreen>