Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
Keep Event start time as session time
Arka Prava Basuadb6b32da7aa
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.javaindex fa56453..b5b1200 100644--- a/src/main/java/org/havenapp/main/PreferenceManager.java+++ b/src/main/java/org/havenapp/main/PreferenceManager.java@@ -27,6 +27,7 @@ import android.content.SharedPreferences.Editor;import org.havenapp.main.sensors.motion.LuminanceMotionDetector;import java.io.File;+import java.util.Date;public class PreferenceManager {@@ -88,7 +89,7 @@ public class PreferenceManager {public static final String DISABLE_BATTERY_OPT = "config_battery_optimizations";- private static final String CURRENT_SESSION = "current_session";+ private static final String CURRENT_EVENT_START_TIME = "current_event_start_time";private Context context;@@ -347,15 +348,25 @@ public class PreferenceManager {}/**+ * Set the {@link org.havenapp.main.model.Event#mStartTime} for the ongoing event.* Sets a string with the format {@link Utils#DATE_TIME_PATTERN}- * representing current date and time for the key {@link #CURRENT_SESSION}+ * representing current date and time for the key {@link #CURRENT_EVENT_START_TIME}.+ *+ * @param startTime the {@link org.havenapp.main.model.Event#mStartTime} for an+ * {@link org.havenapp.main.model.Event}*/- public void setCurrentSession() {- prefsEditor.putString(CURRENT_SESSION, Utils.getDateTime(System.currentTimeMillis()));+ public void setCurrentSession(Date startTime) {+ prefsEditor.putString(CURRENT_EVENT_START_TIME, Utils.getDateTime(startTime));prefsEditor.commit();}+ /**+ * Get the {@link org.havenapp.main.model.Event#mStartTime} for the ongoing event.+ *+ * @return the string corresponding to pref key {@link #CURRENT_EVENT_START_TIME}.+ * Default value is unknown_session.+ */private String getCurrentSession() {- return appSharedPrefs.getString(CURRENT_SESSION, "unknown_session");+ return appSharedPrefs.getString(CURRENT_EVENT_START_TIME, "unknown_session");}}diff --git a/src/main/java/org/havenapp/main/Utils.java b/src/main/java/org/havenapp/main/Utils.javaindex d258a98..e16637d 100644--- a/src/main/java/org/havenapp/main/Utils.java+++ b/src/main/java/org/havenapp/main/Utils.java@@ -37,14 +37,13 @@ class Utils {}/**- * Get a user friendly date and time representation from UNIX epoch.+ * Get a user friendly date and time representation from a given {@link Date}.* The default {@link Locale} is used.*- * @param timeMillis value representing UNIX epoch- * @return a string of the format "yyyy-MM-dd_HH:mm:ss" for the corresponding epoch+ * @param date concerned {@link Date} instance+ * @return a string of the format "yyyy-MM-dd_HH:mm:ss" for the corresponding date*/- public static String getDateTime(long timeMillis) {- Date date = new Date(timeMillis);+ 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/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.javaindex 1f843ae..1684eda 100644--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@ -219,8 +219,6 @@ public class MonitorService extends Service {{mIsRunning = true;- mPrefs.setCurrentSession();-if (!mPrefs.getAccelerometerSensitivity().equals(PreferenceManager.OFF)) {mAccelManager = new AccelerometerMonitor(this);if(Build.VERSION.SDK_INT>=18) {@@ -290,6 +288,8 @@ public class MonitorService extends Service {mLastEvent = new Event();mLastEvent.save();doNotification = true;+ // set current event start date in prefs+ mPrefs.setCurrentSession(mLastEvent.getStartTime());}else if (mPrefs.getNotificationTimeMs() == 0){