Skip to content

armgit / haven

Public Imported from GitHub
0

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

Merge branch 'master' of github.com:guardianproject/haven into room_experiments

Arka Prava Basufafdba07219c
diff --cc build.gradle
index e0adff7,72f8394..701daf3
--- a/build.gradle
+++ b/build.gradle
@@@ -5,9 -4,7 +5,9 @@@ buildscript
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.3.0-alpha12'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.android.tools.build:gradle:3.4.0-alpha01'
++ classpath 'com.android.tools.build:gradle:3.4.0-alpha02'
+
}
}
@@@ -128,30 -110,32 +132,31 @@@ android
}
dependencies {
- implementation 'com.android.support:support-v4:27.1.1'
- implementation 'com.android.support:appcompat-v7:27.1.1'
- implementation 'com.android.support:design:27.1.1'
- implementation 'com.android.support:cardview-v7:27.1.1'
- implementation 'com.android.support.constraint:constraint-layout:1.1.2'
- implementation 'androidx.appcompat:appcompat:1.0.0'
++ implementation 'androidx.appcompat:appcompat:1.0.1'
+ implementation 'androidx.cardview:cardview:1.0.0'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.preference:preference:1.0.0'
+ implementation 'androidx.multidex:multidex:2.0.0'
+ implementation 'androidx.annotation:annotation:1.0.0'
+ implementation 'com.google.android.material:material:1.0.0'
+ implementation 'com.wdullaer:materialdatetimepicker:3.6.4'
implementation 'com.github.guardianproject:signal-cli-android:v0.6.0-android-beta-1'
-- implementation 'com.github.satyan:sugar:1.5'
implementation 'net.the4thdimension:audio-wife:1.0.3'
- implementation 'com.github.apl-devs:appintro:v4.2.3'
- implementation 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
- implementation 'com.nanohttpd:nanohttpd-webserver:2.2.0'
+ implementation 'com.github.apl-devs:appintro:master' /* use master until androidx ver is released */
+ implementation 'info.guardianproject.netcipher:netcipher:2.0.0-beta1'
+ implementation 'org.nanohttpd:nanohttpd-webserver:2.3.1'
implementation 'me.angrybyte.picker:picker:1.3.1'
implementation 'com.github.stfalcon:frescoimageviewer:0.5.0'
- implementation 'com.facebook.fresco:fresco:1.9.0'
- implementation 'com.github.derlio.waveform:library:1.0.3@aar'
+ implementation 'com.facebook.fresco:fresco:1.10.0'
+ // implementation 'com.github.derlio.waveform:library:1.0.3@aar'
+ implementation 'com.github.derlio:audio-waveform:v1.0.1'
implementation 'org.firezenk:audiowaves:1.1@aar'
implementation 'com.maxproj.simplewaveform:app:1.0.0'
- implementation 'com.takisoft.fix:preference-v7:27.1.0.0'
- implementation 'com.wdullaer:materialdatetimepicker:3.5.2'
- implementation 'com.googlecode.libphonenumber:libphonenumber:8.8.10'
- implementation('com.mikepenz:aboutlibraries:6.0.2@aar') {
+ implementation 'com.googlecode.libphonenumber:libphonenumber:8.9.14'
+ implementation('com.mikepenz:aboutlibraries:6.1.1@aar') {
transitive = true
}
- implementation 'com.asksira.android:cameraviewplus:0.9.4'
+ implementation 'com.asksira.android:cameraviewplus:0.9.5'
implementation 'com.github.halilozercan:BetterVideoPlayer:1.1.0'
implementation 'io.github.silvaren:easyrs:0.5.3'
implementation 'org.jcodec:jcodec:0.2.3'
diff --cc src/main/AndroidManifest.xml
index 294225e,6717e86..9784e4d
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@@ -41,8 -42,9 +42,10 @@@
android:label="@string/app_name"
android:largeHeap="true"
android:theme="@style/AppTheme"
+ android:fullBackupContent="@xml/backup_config"
- tools:replace="android:allowBackup">
+ android:supportsRtl="false"
+ tools:replace="android:allowBackup,android:supportsRtl"
+ tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".ListActivity"
android:configChanges="orientation|screenSize"
diff --cc src/main/java/org/havenapp/main/HavenApp.java
index 4783b3a,ccaf214..ab61507
--- a/src/main/java/org/havenapp/main/HavenApp.java
+++ b/src/main/java/org/havenapp/main/HavenApp.java
@@@ -17,12 -17,8 +17,9 @@@
package org.havenapp.main;
- import android.support.annotation.NonNull;
- import android.support.multidex.MultiDexApplication;
- import android.support.v7.app.AppCompatDelegate;
import android.util.Log;
+import com.evernote.android.job.JobManager;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.imagepipeline.core.ImagePipelineConfig;
import com.facebook.imagepipeline.decoder.SimpleProgressiveJpegConfig;
@@@ -33,6 -30,9 +30,10 @@@ import org.havenapp.main.service.WebSer
import java.io.IOException;
++import androidx.annotation.NonNull;
+ import androidx.appcompat.app.AppCompatDelegate;
+ import androidx.multidex.MultiDexApplication;
+
public class HavenApp extends MultiDexApplication {
diff --cc src/main/java/org/havenapp/main/ListActivity.java
index 45f80b8,64ac80d..1f8b8cb
--- a/src/main/java/org/havenapp/main/ListActivity.java
+++ b/src/main/java/org/havenapp/main/ListActivity.java
@@@ -17,30 -17,15 +17,17 @@@
package org.havenapp.main;
-import android.annotation.SuppressLint;
+import android.app.ProgressDialog;
- import android.arch.lifecycle.LiveData;
- import android.arch.lifecycle.Observer;
+import android.content.BroadcastReceiver;
+import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.database.sqlite.SQLiteException;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
- import android.support.annotation.NonNull;
- import android.support.design.widget.FloatingActionButton;
- import android.support.design.widget.Snackbar;
- import android.support.v4.content.ContextCompat;
- import android.support.v4.content.LocalBroadcastManager;
- import android.support.v4.graphics.drawable.DrawableCompat;
- import android.support.v7.app.AppCompatActivity;
- import android.support.v7.widget.LinearLayoutManager;
- import android.support.v7.widget.RecyclerView;
- import android.support.v7.widget.Toolbar;
- import android.support.v7.widget.helper.ItemTouchHelper;
-import android.os.Handler;
import android.telephony.SmsManager;
import android.text.TextUtils;
import android.util.Log;
@@@ -51,15 -38,7 +40,16 @@@ import com.google.android.material.snac
import com.mikepenz.aboutlibraries.Libs;
import com.mikepenz.aboutlibraries.LibsBuilder;
++import org.havenapp.main.R;
+import org.havenapp.main.database.HavenEventDB;
+import org.havenapp.main.database.async.EventDeleteAllAsync;
+import org.havenapp.main.database.async.EventDeleteAsync;
+import org.havenapp.main.database.async.EventInsertAllAsync;
+import org.havenapp.main.database.async.EventInsertAsync;
import org.havenapp.main.model.Event;
+import org.havenapp.main.resources.IResourceManager;
+import org.havenapp.main.resources.ResourceManager;
+import org.havenapp.main.service.RemoveDeletedFilesJob;
import org.havenapp.main.service.SignalSender;
import org.havenapp.main.ui.EventActivity;
import org.havenapp.main.ui.EventAdapter;
@@@ -69,11 -49,15 +59,22 @@@ import java.util.ArrayList
import java.util.List;
import java.util.StringTokenizer;
+ import androidx.annotation.NonNull;
+ import androidx.appcompat.app.AppCompatActivity;
+ import androidx.appcompat.widget.Toolbar;
+ import androidx.core.content.ContextCompat;
+ import androidx.core.graphics.drawable.DrawableCompat;
++import androidx.lifecycle.LiveData;
++import androidx.lifecycle.Observer;
++import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+ import androidx.recyclerview.widget.ItemTouchHelper;
+ import androidx.recyclerview.widget.LinearLayoutManager;
+ import androidx.recyclerview.widget.RecyclerView;
+import kotlin.Pair;
+
+import static org.havenapp.main.database.DbConstantsKt.DB_INIT_END;
+import static org.havenapp.main.database.DbConstantsKt.DB_INIT_START;
+import static org.havenapp.main.database.DbConstantsKt.DB_INIT_STATUS;
public class ListActivity extends AppCompatActivity {
@@@ -81,62 -65,13 +82,60 @@@
private EventAdapter adapter;
private List<Event> events = new ArrayList<>();
private PreferenceManager preferences;
-
- private int modifyPos = -1;
+ private IResourceManager resourceManager;
- private int REQUEST_CODE_INTRO = 1001;
+ private final static int REQUEST_CODE_INTRO = 1001;
+ private LiveData<List<Event>> eventListLD;
+
+ private Observer<List<Event>> eventListObserver = events -> {
+ if (events != null) {
+ setEventListToRecyclerView(events);
+ observeEvents(events);
+ }
+ };
- final private Handler handler = new Handler();
+ private Observer<Integer> eventCountObserver = count -> {
+ if (count != null && count > events.size()) {
+ showNonEmptyState();
+ } else if (count != null && count == 0) {
+ showEmptyState();
+ }
+ };
+
+ private Observer<Pair<Long, Integer>> eventTriggerCountObserver = pair -> {
+ if (pair != null && adapter != null && events != null) {
+ int pos = -1;
+ for (int i = 0; i < events.size(); i++) {
+ if (events.get(i).getId().equals(pair.getFirst())) {
+ pos = i;
+ break;
+ }
+ }
+ if (pos != -1) {
+ adapter.notifyItemChanged(pos);
+ }
+ }
+ };
+
+ private BroadcastReceiver dbBroadcastReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent.getIntExtra(DB_INIT_STATUS, 0) == DB_INIT_START) {
+ progressDialog = new ProgressDialog(ListActivity.this);
+ progressDialog.setTitle(resourceManager.getString(R.string.please_wait));
+ progressDialog.setMessage(resourceManager.getString(R.string.migrating_data));
+ progressDialog.setCancelable(false);
+ progressDialog.setCanceledOnTouchOutside(false);
+ progressDialog.show();
+ } else if (intent.getIntExtra(DB_INIT_STATUS, 0) == DB_INIT_END) {
+ if (progressDialog != null)
+ progressDialog.dismiss();
+ }
+ }
+ };
+
+ private ProgressDialog progressDialog;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@@ -144,14 -79,11 +143,14 @@@
setContentView(R.layout.activity_list);
Log.d("Main", "onCreate");
+ resourceManager = new ResourceManager(this);
preferences = new PreferenceManager(this.getApplicationContext());
recyclerView = findViewById(R.id.main_list);
- fab = findViewById(R.id.fab);
- toolbar = findViewById(R.id.toolbar);
+ FloatingActionButton fab = findViewById(R.id.fab);
+ Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
+ LocalBroadcastManager.getInstance(this).registerReceiver(dbBroadcastReceiver,
+ new IntentFilter(DB_INIT_STATUS));
LinearLayoutManager llm = new LinearLayoutManager(this);
recyclerView.setLayoutManager(llm);
diff --cc src/main/java/org/havenapp/main/dao/EventDAO.kt
index 2ef4e5b,0000000..e0a783a
mode 100644,000000..100644
--- a/src/main/java/org/havenapp/main/dao/EventDAO.kt
+++ b/src/main/java/org/havenapp/main/dao/EventDAO.kt
@@@ -1,42 -1,0 +1,42 @@@
+package org.havenapp.main.dao
+
- import android.arch.lifecycle.LiveData
- import android.arch.persistence.room.*
++import androidx.lifecycle.LiveData
++import androidx.room.*
+import org.havenapp.main.model.Event
+
+/**
+ * Created by Arka Prava Basu <[email protected]> on 23/5/18.
+ */
+@Dao
+interface EventDAO {
+
+ @Insert
+ fun insert(event: Event): Long
+
+ @Insert
+ fun insertAll(eventList: List<Event>): List<Long>
+
+ @Delete
+ fun delete(event: Event)
+
+ @Delete
+ fun deleteAll(eventList: List<Event>)
+
+ @Update
+ fun update(event: Event)
+
+ @Query("SELECT * FROM EVENT WHERE ID = :id")
+ fun findById(id: Long?) : Event
+
+ @Query("SELECT * FROM EVENT WHERE ID = :id")
+ fun findByIdAsync(id: Long?) : LiveData<Event>
+
+ @Query("SELECT * FROM EVENT ORDER BY ID")
+ fun getAllEvent() : List<Event>
+
+ @Query("SELECT * FROM EVENT ORDER BY ID DESC")
+ fun getAllEventDesc() : LiveData<List<Event>>
+
+ @Query("SELECT COUNT(*) FROM EVENT")
+ fun count() : LiveData<Int>
+}
diff --cc src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
index a838321,0000000..182848d
mode 100644,000000..100644
--- a/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
+++ b/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
@@@ -1,39 -1,0 +1,39 @@@
+package org.havenapp.main.dao
+
- import android.arch.lifecycle.LiveData
- import android.arch.persistence.room.*
++import androidx.lifecycle.LiveData
++import androidx.room.*
+import org.havenapp.main.model.EventTrigger
+
+/**
+ * Created by Arka Prava Basu <[email protected]> on 23/5/18.
+ */
+@Dao
+interface EventTriggerDAO {
+
+ @Insert
+ fun insert(eventTrigger: EventTrigger) : Long
+
+ @Delete
+ fun delete(eventTrigger: EventTrigger)
+
+ @Delete
+ fun deleteAll(eventTriggerList: List<EventTrigger>)
+
+ @Update
+ fun update(eventTrigger: EventTrigger)
+
+ @Query("SELECT * FROM EVENT_TRIGGER WHERE ID = :id")
+ fun findById(id : Long?) : EventTrigger
+
+ @Query("SELECT * FROM EVENT_TRIGGER WHERE M_EVENT_ID = :eventId")
+ fun getEventTriggerList(eventId: Long?) : MutableList<EventTrigger>
+
+ @Query("SELECT * FROM EVENT_TRIGGER WHERE M_EVENT_ID = :eventId")
+ fun getEventTriggerListAsync(eventId: Long?) : LiveData<MutableList<EventTrigger>>
+
+ @Query("SELECT * FROM EVENT_TRIGGER")
+ fun getAllEventTriggers() : MutableList<EventTrigger>
+
+ @Query("SELECT COUNT(*) FROM EVENT_TRIGGER WHERE M_EVENT_ID = :eventId")
+ fun getEventTriggerListCountAsync(eventId: Long?) : LiveData<Int>
+}
diff --cc src/main/java/org/havenapp/main/database/HavenEventDB.kt
index d45e767,0000000..94aedd4
mode 100644,000000..100644
--- a/src/main/java/org/havenapp/main/database/HavenEventDB.kt
+++ b/src/main/java/org/havenapp/main/database/HavenEventDB.kt
@@@ -1,63 -1,0 +1,63 @@@
+package org.havenapp.main.database
+
- import android.arch.persistence.room.Database
- import android.arch.persistence.room.Room
- import android.arch.persistence.room.RoomDatabase
- import android.arch.persistence.room.TypeConverters
+import android.content.Context
+import android.content.Intent
- import android.support.v4.content.LocalBroadcastManager
++import androidx.localbroadcastmanager.content.LocalBroadcastManager
++import androidx.room.Database
++import androidx.room.Room
++import androidx.room.RoomDatabase
++import androidx.room.TypeConverters
+import org.havenapp.main.dao.EventDAO
+import org.havenapp.main.dao.EventTriggerDAO
+import org.havenapp.main.database.converter.HavenEventDBConverters
+import org.havenapp.main.database.migration.RoomMigration
+import org.havenapp.main.model.Event
+import org.havenapp.main.model.EventTrigger
+
+/**
+ * Created by Arka Prava Basu <[email protected]> on 23/5/18.
+ */
+@Database(entities = [(Event::class), (EventTrigger::class)], version = 4)
+@TypeConverters(HavenEventDBConverters::class)
+abstract class HavenEventDB : RoomDatabase() {
+
+ abstract fun getEventDAO(): EventDAO
+
+ abstract fun getEventTriggerDAO(): EventTriggerDAO
+
+ companion object {
+ private var INSTANCE: HavenEventDB? = null
+
+ @JvmStatic
+ fun getDatabase(context: Context): HavenEventDB {
+
+ if (INSTANCE == null) {
+ synchronized(HavenEventDB::class) {
+ if (INSTANCE == null) {
+
+ // notify interested components that db initialization is starting
+ var dbIntent = Intent()
+ dbIntent.putExtra(DB_INIT_STATUS, DB_INIT_START)
+ dbIntent.action = DB_INIT_STATUS
+ LocalBroadcastManager.getInstance(context).sendBroadcast(dbIntent)
+
+ INSTANCE = Room.databaseBuilder(context.applicationContext,
+ HavenEventDB::class.java, "haven.db")
+ .allowMainThreadQueries() // todo remove this
+ .addMigrations(RoomMigration())
+ .build()
+
+ // notify interested components that db initialization has succeeded
+ dbIntent = Intent()
+ dbIntent.putExtra(DB_INIT_STATUS, DB_INIT_END)
+ dbIntent.action = DB_INIT_STATUS
+ LocalBroadcastManager.getInstance(context).sendBroadcast(dbIntent)
+
+ }
+ }
+ }
+
+ return INSTANCE!!
+ }
+ }
+}
diff --cc src/main/java/org/havenapp/main/database/converter/HavenEventDBConverters.kt
index ad06492,0000000..3c1bdd6
mode 100644,000000..100644
--- a/src/main/java/org/havenapp/main/database/converter/HavenEventDBConverters.kt
+++ b/src/main/java/org/havenapp/main/database/converter/HavenEventDBConverters.kt
@@@ -1,24 -1,0 +1,24 @@@
+package org.havenapp.main.database.converter
+
- import android.arch.persistence.room.TypeConverter
++import androidx.room.TypeConverter
+import java.util.*
+
+/**
+ * Created by Arka Prava Basu <[email protected]> on 25/5/18.
+ */
+class HavenEventDBConverters {
+ companion object {
+
+ @JvmStatic
+ @TypeConverter
+ fun fromTimestamp(value: Long?): Date? {
+ return if (value == null) null else Date(value)
+ }
+
+ @JvmStatic
+ @TypeConverter
+ fun dateToTimestamp(date: Date?): Long? {
+ return date?.time
+ }
+ }
+}
diff --cc src/main/java/org/havenapp/main/database/migration/RoomMigration.kt
index dd9edde,0000000..2982ff3
mode 100644,000000..100644
--- a/src/main/java/org/havenapp/main/database/migration/RoomMigration.kt
+++ b/src/main/java/org/havenapp/main/database/migration/RoomMigration.kt
@@@ -1,16 -1,0 +1,16 @@@
+package org.havenapp.main.database.migration
+
- import android.arch.persistence.db.SupportSQLiteDatabase
- import android.arch.persistence.room.migration.Migration
++import androidx.room.migration.Migration
++import androidx.sqlite.db.SupportSQLiteDatabase
+
+/**
+ * [Migration] for the transition from Sugar ORM (database version = 3)
+ * to Room database (database version = 4).
+ * <p>
+ * Created by Arka Prava Basu <[email protected]> on 28/8/18.
+ */
+class RoomMigration: Migration(3, 4) {
+ override fun migrate(database: SupportSQLiteDatabase) {
+ // Since we did not alter table, nothing to do here.
+ }
+}
diff --cc src/main/java/org/havenapp/main/model/Event.kt
index 3fd1050,0000000..fc7607a
mode 100644,000000..100644
--- a/src/main/java/org/havenapp/main/model/Event.kt
+++ b/src/main/java/org/havenapp/main/model/Event.kt
@@@ -1,66 -1,0 +1,66 @@@
+package org.havenapp.main.model
+
- import android.arch.lifecycle.LiveData
- import android.arch.lifecycle.Transformations
- import android.arch.persistence.room.ColumnInfo
- import android.arch.persistence.room.Entity
- import android.arch.persistence.room.Ignore
- import android.arch.persistence.room.PrimaryKey
++import androidx.lifecycle.LiveData
++import androidx.lifecycle.Transformations
++import androidx.room.ColumnInfo
++import androidx.room.Entity
++import androidx.room.Ignore
++import androidx.room.PrimaryKey
+import org.havenapp.main.HavenApp
+import java.util.*
+
+/**
+ * Created by Arka Prava Basu <[email protected]> on 20/5/18.
+ */
+@Entity(tableName = "EVENT")
+class Event {
+
+ @PrimaryKey(autoGenerate = true)
+ @ColumnInfo(name = "ID")
+ var id : Long? = null
+ set(value) {
+ if (value == null) return
+ field = value
+ eventTriggerCountLD = Transformations.map(HavenApp.getDataBaseInstance().getEventTriggerDAO()
+ .getEventTriggerListCountAsync(field)) {
+ Pair(field!!, it)
+ }
+ }
+
+ @ColumnInfo(name = "M_START_TIME")
+ var startTime : Date? = Date()
+
+ @Ignore
+ private var eventTriggers : MutableList<EventTrigger> = mutableListOf()
+
+ @Ignore
+ private var eventTriggerCountLD: LiveData<Pair<Long, Int>>? = null
+
+ fun addEventTrigger(eventTrigger: EventTrigger) {
+ eventTriggers.add(eventTrigger)
+ eventTrigger.eventId = id
+ }
+
+ /**
+ * Get the list of event triggers associated with this event.
+ * <p>
+ * When [eventTriggers] is empty this method performs a blocking db lookup.
+ */
+ fun getEventTriggers() : MutableList<EventTrigger> {
+
+ if (eventTriggers.size == 0) {
+ val eventTriggers = HavenApp.getDataBaseInstance().getEventTriggerDAO().getEventTriggerList(id)
+ this.eventTriggers.addAll(eventTriggers)
+ }
+
+ return eventTriggers
+ }
+
+ fun getEventTriggersCountLD(): LiveData<Pair<Long, Int>>? {
+ return eventTriggerCountLD
+ }
+
+ fun getEventTriggerCount(): Int {
+ return eventTriggerCountLD?.value?.second ?: 0
+ }
+}
diff --cc src/main/java/org/havenapp/main/model/EventTrigger.kt
index b3db0f1,0000000..4b540fb
mode 100644,000000..100644
--- a/src/main/java/org/havenapp/main/model/EventTrigger.kt
+++ b/src/main/java/org/havenapp/main/model/EventTrigger.kt
@@@ -1,109 -1,0 +1,109 @@@
+package org.havenapp.main.model
+
- import android.arch.persistence.room.ColumnInfo
- import android.arch.persistence.room.Entity
- import android.arch.persistence.room.PrimaryKey
- import org.havenapp.main.R
++import androidx.room.ColumnInfo
++import androidx.room.Entity
++import androidx.room.PrimaryKey
+import org.havenapp.main.resources.IResourceManager
+import java.util.*
++import org.havenapp.main.R
+
+/**
+ * Created by Arka Prava Basu <[email protected]> on 22/5/18.
+ */
+@Entity(tableName = "EVENT_TRIGGER")
+class EventTrigger {
+ companion object {
+ /**
+ * Acceleration detected message
+ */
+ const val ACCELEROMETER = 0
+
+ /**
+ * Camera motion detected message
+ */
+ const val CAMERA = 1
+
+ /**
+ * Mic noise detected message
+ */
+ const val MICROPHONE = 2
+
+ /**
+ * Pressure change detected message
+ */
+ const val PRESSURE = 3
+
+ /**
+ * Light change detected message
+ */
+ const val LIGHT = 4
+
+ /**
+ * Power change detected message
+ */
+ const val POWER = 5
+
+ /**
+ * Significant motion detected message
+ */
+ const val BUMP = 6
+
+ /**
+ * Significant motion detected message
+ */
+ const val CAMERA_VIDEO = 7
+
+ /**
+ * Heartbeat notification message
+ */
+ const val HEART = 8
+ }
+
+ @PrimaryKey(autoGenerate = true)
+ @ColumnInfo(name = "ID")
+ var id : Long? = null
+
+ @ColumnInfo(name = "M_TYPE")
+ var type: Int? = 0
+
+ // Trigger time
+ @ColumnInfo(name = "M_TIME")
+ var time: Date? = Date()
+
+ @ColumnInfo(name = "M_EVENT_ID")
+ var eventId: Long? = 0
+
+ @ColumnInfo(name = "M_PATH")
+ var path: String? = null
+
+ fun getStringType(resourceManager: IResourceManager): String {
+ var sType = ""
+
+ sType = when (type) {
+ ACCELEROMETER -> resourceManager.getString(R.string.sensor_accel)
+ LIGHT -> resourceManager.getString(R.string.sensor_light)
+ CAMERA -> resourceManager.getString(R.string.sensor_camera)
+ MICROPHONE -> resourceManager.getString(R.string.sensor_sound)
+ POWER -> resourceManager.getString(R.string.sensor_power)
+ BUMP -> resourceManager.getString(R.string.sensor_bump)
+ CAMERA_VIDEO -> resourceManager.getString(R.string.sensor_camera_video)
+ HEART -> resourceManager.getString(R.string.sensor_heartbeat)
+ else -> resourceManager.getString(R.string.sensor_unknown)
+ }
+
+ return sType
+ }
+
+ fun getMimeType(): String? {
+ var mimeType: String? = ""
+
+ mimeType = when (type) {
+ CAMERA -> "image/*"
+ MICROPHONE -> "audio/*"
+ CAMERA_VIDEO -> "video/*"
+ else -> null
+ }
+
+ return mimeType
+ }
+}
diff --cc src/main/java/org/havenapp/main/service/WebServer.java
index dbcc8fb,0493f14..a56255e
--- a/src/main/java/org/havenapp/main/service/WebServer.java
+++ b/src/main/java/org/havenapp/main/service/WebServer.java
@@@ -6,20 -6,20 +6,23 @@@ import android.text.TextUtils
import android.util.Log;
import org.havenapp.main.R;
+import org.havenapp.main.database.HavenEventDB;
+ import org.havenapp.main.Utils;
import org.havenapp.main.model.Event;
import org.havenapp.main.model.EventTrigger;
+import org.havenapp.main.resources.ResourceManager;
import java.io.File;
import java.io.FileInputStream;
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.Objects;
import java.util.UUID;
import fi.iki.elonen.NanoHTTPD;
@@@ -175,8 -171,9 +178,9 @@@ public class WebServer extends NanoHTTP
for (EventTrigger eventTrigger: triggers)
{
- String title = eventTrigger.getStringType(mContext);
+ String title = eventTrigger.getStringType(new ResourceManager(mContext));
- String desc = eventTrigger.getTime().toString();
+ String desc = new SimpleDateFormat(Utils.DATE_TIME_PATTERN,
- Locale.getDefault()).format(eventTrigger.getTriggerTime());
++ Locale.getDefault()).format(eventTrigger.getTime().toString());
page.append("<b>");
page.append(title).append("</b><br/>");
diff --cc src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
index 15cacfb,9e40c51..09cc50f
--- a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
+++ b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java
@@@ -19,17 -19,17 +19,16 @@@ package org.havenapp.main.ui
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
- import android.support.v4.app.ActivityCompat;
- import android.support.v4.content.ContextCompat;
- import android.support.v7.app.AppCompatActivity;
- import android.support.v7.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
--import android.widget.SeekBar;
import org.havenapp.main.PreferenceManager;
import org.havenapp.main.R;
++import androidx.appcompat.app.AppCompatActivity;
++import androidx.appcompat.widget.Toolbar;
++import androidx.core.app.ActivityCompat;
++import androidx.core.content.ContextCompat;
import me.angrybyte.numberpicker.listener.OnValueChangeListener;
import me.angrybyte.numberpicker.view.ActualNumberPicker;
diff --cc src/main/java/org/havenapp/main/ui/EventActivity.java
index 45b82be,0fd282c..4240e88
--- a/src/main/java/org/havenapp/main/ui/EventActivity.java
+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java
@@@ -3,58 -3,38 +3,62 @@@ package org.havenapp.main.ui
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.os.Handler;
import android.os.StrictMode;
- import android.support.annotation.NonNull;
- import android.support.design.widget.FloatingActionButton;
- import android.support.design.widget.Snackbar;
- import android.support.v4.content.FileProvider;
- import android.support.v7.app.AppCompatActivity;
- import android.support.v7.widget.LinearLayoutManager;
- import android.support.v7.widget.RecyclerView;
- import android.support.v7.widget.Toolbar;
- import android.support.v7.widget.helper.ItemTouchHelper;
+import android.text.TextUtils;
import android.view.MenuItem;
-import android.view.View;
+ import com.google.android.material.floatingactionbutton.FloatingActionButton;
+ import com.google.android.material.snackbar.Snackbar;
+import com.stfalcon.frescoimageviewer.ImageViewer;
import org.havenapp.main.R;
+ import org.havenapp.main.Utils;
+import org.havenapp.main.database.HavenEventDB;
+import org.havenapp.main.database.async.EventTriggerDeleteAsync;
+import org.havenapp.main.database.async.EventTriggerInsertAsync;
import org.havenapp.main.model.Event;
import org.havenapp.main.model.EventTrigger;
+import org.havenapp.main.resources.IResourceManager;
+import org.havenapp.main.resources.ResourceManager;
import java.io.File;
+ import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.List;
+ import java.util.Locale;
+
++import androidx.annotation.NonNull;
+ import androidx.appcompat.app.AppCompatActivity;
+ import androidx.appcompat.widget.Toolbar;
++import androidx.core.content.FileProvider;
++import androidx.lifecycle.Observer;
+ import androidx.recyclerview.widget.ItemTouchHelper;
+ import androidx.recyclerview.widget.LinearLayoutManager;
+ import androidx.recyclerview.widget.RecyclerView;
-public class EventActivity extends AppCompatActivity {
-
+public class EventActivity extends AppCompatActivity implements EventTriggerAdapter.EventTriggerClickListener {
+ private IResourceManager resourceManager;
private RecyclerView mRecyclerView;
private Event mEvent;
- private Handler mHandler = new Handler();
+ private List<EventTrigger> eventTriggerList = new ArrayList<>();
private EventTriggerAdapter mAdapter;
+ private ArrayList<Uri> eventTriggerImagePaths;
+ private final static String AUTHORITY = "org.havenapp.main.fileprovider";
+
+ private Observer<Event> eventObserver = event -> {
+ if (event != null) {
+ onEventFetched(event);
+ }
+ };
+
+ private Observer<List<EventTrigger>> eventTriggerListObserver = eventTriggerList -> {
+ if (eventTriggerList != null) {
+ onEventTriggerListFetched(eventTriggerList);
+ }
+ };
+
@Override
protected void onCreate(Bundle savedInstanceState) {
@@@ -199,11 -180,13 +203,13 @@@
setTitle("Event @ " + mEvent.getStartTime().toLocaleString());
- for (EventTrigger eventTrigger : mEvent.getEventTriggers()) {
+ for (EventTrigger eventTrigger : eventTriggerList) {
- mEventLog.append("Event Triggered @ ").append(eventTrigger.getTime().toString()).append("\n");
+ mEventLog.append("Event Triggered @ ").append(
+ new SimpleDateFormat(Utils.DATE_TIME_PATTERN,
- Locale.getDefault()).format(eventTrigger.getTriggerTime())).append("\n");
++ Locale.getDefault()).format(eventTrigger.getTime().toString())).append("\n");
- String sType = eventTrigger.getStringType(this);
+ String sType = eventTrigger.getStringType(resourceManager);
mEventLog.append("Event Type: ").append(sType);
mEventLog.append("\n==========================\n");
diff --cc src/main/java/org/havenapp/main/ui/EventAdapter.java
index e8b2713,df5c986..827ab67
--- a/src/main/java/org/havenapp/main/ui/EventAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventAdapter.java
@@@ -1,7 -1,7 +1,5 @@@
package org.havenapp.main.ui;
- import android.support.annotation.NonNull;
- import android.support.v7.widget.RecyclerView;
-import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@@ -13,6 -12,6 +11,9 @@@ import org.havenapp.main.resources.IRes
import java.util.List;
++import androidx.annotation.NonNull;
++import androidx.recyclerview.widget.RecyclerView;
++
/**
* Created by n8fr8 on 4/16/17.
*/
diff --cc src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
index 9a6de6f,e8fa4e4..3ac6a11
--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@@ -5,9 -6,7 +5,6 @@@ import android.graphics.drawable.Bitmap
import android.media.ThumbnailUtils;
import android.net.Uri;
import android.provider.MediaStore;
- import android.support.annotation.NonNull;
- import android.support.v4.content.FileProvider;
- import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@@ -17,16 -16,20 +14,19 @@@ import android.widget.VideoView
import com.github.derlio.waveform.SimpleWaveformView;
import com.github.derlio.waveform.soundfile.SoundFile;
-import com.stfalcon.frescoimageviewer.ImageViewer;
+import org.havenapp.main.R;
import org.havenapp.main.model.EventTrigger;
+import org.havenapp.main.resources.IResourceManager;
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.
*/
@@@ -150,10 -160,9 +150,9 @@@ public class EventTriggerAdapter extend
audioWife.init(context, Uri.fromFile(fileSound))
.useDefaultUi(holder.extra, inflater);
-
break;
case EventTrigger.ACCELEROMETER:
- desc += "\n" + context.getString(R.string.data_speed) + ": " + eventTrigger.getPath();
+ desc += "\n" + resourceManager.getString(R.string.data_speed) + ": " + eventTrigger.getPath();
break;
case EventTrigger.LIGHT:
diff --cc src/main/res/values/strings.xml
index 17ba1ab,3d50635..c66f1ba
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@@ -158,8 -158,9 +158,12 @@@
<string name="title_activity_video_player">VideoPlayerActivity</string>
<string name="config_storage_path">Storage Folder Path</string>
<string name="config_storage_page_hint">Where captured media is stored</string>
+ <string name="event_trigger_deleted">Event Trigger deleted</string>
+ <string name="please_wait">Please wait</string>
+ <string name="migrating_data">Looking for your old data</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>