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 Basua1454c7edd21
diff --cc build.gradleindex 952a3d9,9ce378c..553172c--- a/build.gradle+++ b/build.gradle@@@ -1,12 -1,10 +1,12 @@@buildscript {- ext.kotlin_version = '1.2.41'++ ext.kotlin_version = '1.2.60'repositories {- jcenter()google()+ jcenter()}dependencies {- classpath 'com.android.tools.build:gradle:3.2.0-alpha13'- classpath 'com.android.tools.build:gradle:3.3.0-alpha03'+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"++ classpath 'com.android.tools.build:gradle:3.3.0-alpha07'}@@@ -26,15 -24,9 +26,15 @@@ def getVersionName = { -apply plugin: 'com.android.application'+apply plugin: 'kotlin-android'++apply plugin: 'kotlin-android-extensions'++apply plugin: 'kotlin-kapt'+repositories {- jcenter()google()+ jcenter()maven { url 'https://github.com/FireZenk/maven-repo/raw/master/' }maven { url 'https://jitpack.io' }}@@@ -131,9 -130,9 +138,14 @@@ dependenciesimplementation('com.mikepenz:aboutlibraries:6.0.2@aar') {transitive = true}+ implementation 'com.asksira.android:cameraviewplus:0.9.4'+ implementation 'com.github.halilozercan:BetterVideoPlayer:1.1.0'+ implementation 'io.github.silvaren:easyrs:0.5.3'+ implementation 'org.jcodec:jcodec:0.2.3'+ implementation 'org.jcodec:jcodec-android:0.2.3'+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"++ // Room- implementation "android.arch.persistence.room:runtime:1.1.0"- kapt "android.arch.persistence.room:compiler:1.1.0"++ implementation "android.arch.persistence.room:runtime:1.1.1"++ kapt "android.arch.persistence.room:compiler:1.1.1"}diff --cc gradle/wrapper/gradle-wrapper.propertiesindex 2560e23,9944446..7d1d3a2--- a/gradle/wrapper/gradle-wrapper.properties+++ b/gradle/wrapper/gradle-wrapper.properties@@@ -1,7 -1,7 +1,7 @@@- #Fri Oct 27 16:43:50 EDT 2017-#Mon Jul 30 01:41:48 IST 2018++#Tue Aug 28 12:14:00 IST 2018distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/distszipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/dists- distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip- android.enableD8=true-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-rc-1-all.zip++distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip+ android.enableD8=truediff --cc src/main/java/org/havenapp/main/HavenApp.javaindex 6b9212b,69ae819..b8b8b29--- a/src/main/java/org/havenapp/main/HavenApp.java+++ b/src/main/java/org/havenapp/main/HavenApp.java@@@ -22,12 -22,16 +22,14 @@@ import android.support.v7.app.AppCompatimport android.util.Log;import com.facebook.drawee.backends.pipeline.Fresco;+ import com.facebook.imagepipeline.core.ImagePipelineConfig;+ import com.facebook.imagepipeline.decoder.SimpleProgressiveJpegConfig;-import com.orm.SugarContext;-import java.io.IOException;--import org.havenapp.main.service.SignalSender;+import org.havenapp.main.database.HavenEventDB;import org.havenapp.main.service.WebServer;+import java.io.IOException;+public class HavenApp extends MultiDexApplication {@@@ -44,9 -46,18 +46,19 @@@public void onCreate() {super.onCreate();- SugarContext.init(this);-mPrefs = new PreferenceManager(this);+ ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)+ .setProgressiveJpegConfig(new SimpleProgressiveJpegConfig())+ .setResizeAndRotateEnabledForNetwork(true)+ .setDownsampleEnabled(true)+ .build();++ Fresco.initialize(this,config);+++ mPrefs = new PreferenceManager(this);+++ Fresco.initialize(this);AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);if (mPrefs.getRemoteAccessActive())diff --cc src/main/java/org/havenapp/main/ListActivity.javaindex 85871bc,bc9bb87..1066302--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@@ -179,16 -178,9 +179,15 @@@ public class ListActivity extends AppCoprivate void deleteEvent (final Event event, final int position){- final Runnable runnableDelete = () -> event.delete();+ final Runnable runnableDelete = new Runnable ()+ {+ public void run ()+ {+ HavenEventDB.getDatabase(ListActivity.this).getEventDAO().delete(event);+ }+ };- handler.postDelayed(runnableDelete,3000);-+ handler.postDelayed(runnableDelete,5000);events.remove(position);adapter.notifyItemRemoved(position);@@@ -346,20 -332,15 +345,18 @@@handler.postDelayed(runnableDelete, 3000);Snackbar.make(recyclerView, getString(R.string.events_deleted), Snackbar.LENGTH_SHORT)- .setAction(getString(R.string.undo), new View.OnClickListener() {- @Override- public void onClick(View v) {- handler.removeCallbacks(runnableDelete);+ .setAction(getString(R.string.undo), v -> {+ handler.removeCallbacks(runnableDelete);- for (Event event : removedEvents) {- event.save();- events.add(event);- adapter.notifyItemInserted(events.size() - 1);+ for (Event event : removedEvents) {+ long eventId = HavenEventDB.getDatabase(ListActivity.this)+ .getEventDAO().insert(event);+ event.setId(eventId);+ events.add(event);+ adapter.notifyItemInserted(events.size() - 1);+ }}-- })++ ).show();}diff --cc src/main/java/org/havenapp/main/service/MonitorService.javaindex acc3386,e8dd975..2a22e83--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@@ -287,10 -293,10 +294,12 @@@ public class MonitorService extends Serif (mLastEvent == null) {mLastEvent = new Event();- mLastEvent.save();+ long eventId = HavenEventDB.getDatabase(getApplicationContext())+ .getEventDAO().insert(mLastEvent);+ mLastEvent.setId(eventId);doNotification = true;+ // set current event start date in prefs+ mPrefs.setCurrentSession(mLastEvent.getStartTime());}else if (mPrefs.getNotificationTimeMs() == 0){diff --cc src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex a60e98c,32ac3b6..6aec1d5--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@@ -47,9 -51,15 +50,15 @@@ public class EventTriggerAdapter extendthis.eventTriggerImagePaths = new ArrayList<>();for (EventTrigger trigger : eventTriggers){- if (trigger.getMType() == EventTrigger.CAMERA)- if (trigger.getType() == EventTrigger.CAMERA- && (!TextUtils.isEmpty(trigger.getPath())))++ if (trigger.getMType() == EventTrigger.CAMERA++ && (!TextUtils.isEmpty(trigger.getMPath()))){- eventTriggerImagePaths.add("file:///" + trigger.getMPath());+ Uri fileUri = FileProvider.getUriForFile(+ context,+ AUTHORITY,- new File(trigger.getPath()));++ new File(trigger.getMPath()));++ eventTriggerImagePaths.add(fileUri);}}}@@@ -88,9 -96,8 +97,8 @@@holder.video.setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View view) {- Intent intent = new Intent(Intent.ACTION_VIEW,- Uri.parse(eventTrigger.getMPath()));- intent.setDataAndType(Uri.parse(eventTrigger.getMPath()), "video/*");+ Intent intent = new Intent(context, VideoPlayerActivity.class);- intent.setData(Uri.parse("file://" + eventTrigger.getPath()));++ intent.setData(Uri.parse("file://" + eventTrigger.getMPath()));context.startActivity(intent);}});@@@ -105,37 -112,39 +113,39 @@@break;case EventTrigger.CAMERA:holder.image.setVisibility(View.VISIBLE);- Picasso.with(context).load(new File(eventTrigger.getMPath())).into(holder.image);- holder.image.setOnClickListener(new View.OnClickListener() {- @Override- public void onClick(View view) {- int startPosition = 0;- for (int i = 0; i < eventTriggerImagePaths.size(); i++) {- if (eventTriggerImagePaths.get(i).contains(eventTrigger.getMPath())) {- startPosition = i;- break;- }- }+ Uri fileUri = FileProvider.getUriForFile(+ context,+ AUTHORITY,- new File(eventTrigger.getPath()));++ new File(eventTrigger.getMPath()));+ //Picasso.get().load(fileUri).into(holder.image);+ holder.image.setImageURI(fileUri);+ holder.image.setOnClickListener(view -> {- ShareOverlayView overlayView = new ShareOverlayView(context);- ImageViewer viewer = new ImageViewer.Builder(context, eventTriggerImagePaths)- .setStartPosition(startPosition)- .setOverlayView(overlayView)- .show();- overlayView.setImageViewer(viewer);+ int startPosition = 0;++ /**+ for (int i = 0; i < eventTriggerImagePaths.size(); i++) {+ if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath())) {+ startPosition = i;+ break;+ }+ }**/++ ShareOverlayView overlayView = new ShareOverlayView(context);+ ImageViewer viewer = new ImageViewer.Builder(context, eventTriggerImagePaths)+ .setStartPosition(startPosition)+ .setOverlayView(overlayView)+ .show();+ overlayView.setImageViewer(viewer);- }});- holder.image.setOnLongClickListener(new View.OnLongClickListener() {- @Override- public boolean onLongClick(View view) {- shareMedia(eventTrigger);- return false;- }+ holder.image.setOnLongClickListener(view -> {+ shareMedia(eventTrigger);+ return false;});break;case EventTrigger.MICROPHONE: