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
optimize imports
Luke S5ba758e15e56
diff --git a/src/androidTest/java/org/havenapp/main/database/migration/RoomMigrationTest.kt b/src/androidTest/java/org/havenapp/main/database/migration/RoomMigrationTest.ktindex 1d94b57..eaa8945 100644--- a/src/androidTest/java/org/havenapp/main/database/migration/RoomMigrationTest.kt+++ b/src/androidTest/java/org/havenapp/main/database/migration/RoomMigrationTest.kt@@ -1,9 +1,9 @@package org.havenapp.main.database.migration-import androidx.test.core.app.ApplicationProviderimport androidx.room.Roomimport androidx.room.testing.MigrationTestHelperimport androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory+import androidx.test.core.app.ApplicationProviderimport androidx.test.platform.app.InstrumentationRegistryimport junit.framework.Assert.assertEqualsimport org.havenapp.main.database.HavenEventDBdiff --git a/src/androidTest/java/org/havenapp/main/database/migration/SugarDbOpenHelper.kt b/src/androidTest/java/org/havenapp/main/database/migration/SugarDbOpenHelper.ktindex cac1803..e71a9be 100644--- a/src/androidTest/java/org/havenapp/main/database/migration/SugarDbOpenHelper.kt+++ b/src/androidTest/java/org/havenapp/main/database/migration/SugarDbOpenHelper.kt@@ -1,7 +1,6 @@package org.havenapp.main.database.migrationimport android.content.Context-import android.content.Context.MODE_PRIVATEimport android.database.sqlite.SQLiteDatabaseimport android.database.sqlite.SQLiteOpenHelperdiff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javaindex 1f8b8cb..5bef658 100644--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -40,7 +40,6 @@ import com.google.android.material.snackbar.Snackbar;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;diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.javaindex 22e30f6..529feaa 100644--- a/src/main/java/org/havenapp/main/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@ -31,10 +31,6 @@ import android.view.WindowManager;import android.widget.Button;import android.widget.TextView;-import androidx.appcompat.app.AppCompatActivity;-import androidx.core.app.ActivityCompat;-import androidx.core.content.ContextCompat;-import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;import org.havenapp.main.service.MonitorService;@@ -47,6 +43,10 @@ import java.io.File;import java.io.FileOutputStream;import java.io.IOException;+import androidx.appcompat.app.AppCompatActivity;+import androidx.core.app.ActivityCompat;+import androidx.core.content.ContextCompat;+import static org.havenapp.main.Utils.getTimerText;public class MonitorActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener {diff --git a/src/main/java/org/havenapp/main/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.javaindex 554bb55..264eb8b 100644--- a/src/main/java/org/havenapp/main/SettingsActivity.java+++ b/src/main/java/org/havenapp/main/SettingsActivity.java@@ -21,6 +21,7 @@ package org.havenapp.main;import android.content.Intent;import android.os.Bundle;import android.view.View;+import androidx.annotation.NonNull;import androidx.appcompat.app.AppCompatActivity;diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.javaindex deaf7a4..ab69ca6 100644--- a/src/main/java/org/havenapp/main/SettingsFragment.java+++ b/src/main/java/org/havenapp/main/SettingsFragment.java@@ -22,16 +22,6 @@ import android.view.View;import android.widget.Switch;import android.widget.Toast;-import androidx.annotation.NonNull;-import androidx.appcompat.app.AppCompatActivity;-import androidx.core.app.ActivityCompat;-import androidx.core.content.ContextCompat;-import androidx.preference.EditTextPreference;-import androidx.preference.ListPreference;-import androidx.preference.Preference;-import androidx.preference.PreferenceFragmentCompat;-import androidx.preference.SwitchPreference;-import com.google.i18n.phonenumbers.PhoneNumberUtil;import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;@@ -44,6 +34,15 @@ import org.havenapp.main.ui.MicrophoneConfigureActivity;import java.io.File;import java.util.Locale;+import androidx.annotation.NonNull;+import androidx.appcompat.app.AppCompatActivity;+import androidx.core.app.ActivityCompat;+import androidx.core.content.ContextCompat;+import androidx.preference.EditTextPreference;+import androidx.preference.ListPreference;+import androidx.preference.Preference;+import androidx.preference.PreferenceFragmentCompat;+import androidx.preference.SwitchPreference;import info.guardianproject.netcipher.proxy.OrbotHelper;diff --git a/src/main/java/org/havenapp/main/model/EventTrigger.kt b/src/main/java/org/havenapp/main/model/EventTrigger.ktindex 4b540fb..a2f468c 100644--- a/src/main/java/org/havenapp/main/model/EventTrigger.kt+++ b/src/main/java/org/havenapp/main/model/EventTrigger.kt@@ -3,9 +3,9 @@ package org.havenapp.main.modelimport androidx.room.ColumnInfoimport androidx.room.Entityimport androidx.room.PrimaryKey+import org.havenapp.main.Rimport org.havenapp.main.resources.IResourceManagerimport java.util.*-import org.havenapp.main.R/*** Created by Arka Prava Basu <[email protected]> on 22/5/18.diff --git a/src/main/java/org/havenapp/main/sensors/media/AudioCodec.java b/src/main/java/org/havenapp/main/sensors/media/AudioCodec.javaindex 8f11e12..3ee6f51 100644--- a/src/main/java/org/havenapp/main/sensors/media/AudioCodec.java+++ b/src/main/java/org/havenapp/main/sensors/media/AudioCodec.java@@ -5,13 +5,14 @@package org.havenapp.main.sensors.media;-import java.io.IOException;-import java.util.Arrays;import android.media.AudioFormat;import android.media.AudioRecord;import android.media.MediaRecorder;import android.util.Log;+import java.io.IOException;+import java.util.Arrays;+public class AudioCodec {private AudioRecord recorder = null;diff --git a/src/main/java/org/havenapp/main/sensors/media/ImageCodec.java b/src/main/java/org/havenapp/main/sensors/media/ImageCodec.javaindex a9cfa28..fcba217 100644--- a/src/main/java/org/havenapp/main/sensors/media/ImageCodec.java+++ b/src/main/java/org/havenapp/main/sensors/media/ImageCodec.java@@ -6,11 +6,11 @@package org.havenapp.main.sensors.media;-import java.io.ByteArrayOutputStream;-import android.graphics.Bitmap;import android.graphics.Matrix;+import java.io.ByteArrayOutputStream;+public class ImageCodec {/**diff --git a/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java b/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.javaindex 0632a48..c7903c3 100644--- a/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java+++ b/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java@@ -3,7 +3,6 @@ package org.havenapp.main.sensors.media;import android.hardware.Camera;import android.media.MediaRecorder;import android.util.Log;-import android.view.Surface;import android.view.SurfaceHolder;import java.io.IOException;diff --git a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.javaindex fb87d1c..9feb9c5 100644--- a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java+++ b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java@@ -52,8 +52,6 @@ import java.util.concurrent.TimeUnit;import androidx.annotation.NonNull;-import io.github.silvaren.easyrs.tools.Nv21Image;-public class CameraViewHolder {/**diff --git a/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.java b/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.javaindex e3daa13..3ae6ece 100644--- a/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.java+++ b/src/main/java/org/havenapp/main/sensors/motion/MotionDetector.java@@ -16,7 +16,6 @@ import android.graphics.Rect;import android.graphics.YuvImage;import android.os.Handler;-import org.havenapp.main.sensors.media.ImageCodec;import java.io.ByteArrayOutputStream;diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.javaindex abe3176..0d9d285 100644--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@ -24,9 +24,6 @@ import android.os.PowerManager;import android.telephony.SmsManager;import android.text.TextUtils;-import androidx.annotation.RequiresApi;-import androidx.core.app.NotificationCompat;-import org.havenapp.main.HavenApp;import org.havenapp.main.MonitorActivity;import org.havenapp.main.PreferenceManager;@@ -45,6 +42,9 @@ import java.util.ArrayList;import java.util.Date;import java.util.StringTokenizer;+import androidx.annotation.RequiresApi;+import androidx.core.app.NotificationCompat;+@SuppressLint("HandlerLeak")public class MonitorService extends Service {diff --git a/src/main/java/org/havenapp/main/service/WebServer.java b/src/main/java/org/havenapp/main/service/WebServer.javaindex a56255e..fd749a7 100644--- a/src/main/java/org/havenapp/main/service/WebServer.java+++ b/src/main/java/org/havenapp/main/service/WebServer.java@@ -6,8 +6,8 @@ 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.database.HavenEventDB;import org.havenapp.main.model.Event;import org.havenapp.main.model.EventTrigger;import org.havenapp.main.resources.ResourceManager;diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.javaindex 49ee4ec..6d58ab4 100644--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java@@ -18,7 +18,6 @@ import android.widget.TextView;import com.otaliastudios.cameraview.Audio;import com.otaliastudios.cameraview.CameraView;-import com.otaliastudios.cameraview.SizeSelector;import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex babdeb3..40b113c 100644--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -23,7 +23,6 @@ import java.io.File;import java.util.List;import androidx.annotation.NonNull;-import androidx.core.content.FileProvider;import androidx.recyclerview.widget.RecyclerView;import nl.changer.audiowife.AudioWife;diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xmlindex cd062f8..07abc7a 100644--- a/src/main/res/values/styles.xml+++ b/src/main/res/values/styles.xml@@ -1,6 +1,5 @@<?xml version="1.0" encoding="utf-8"?>-<resources xmlns:android="http://schemas.android.com/apk/res/android"- xmlns:app="http://schemas.android.com/apk/res-auto">+<resources xmlns:android="http://schemas.android.com/apk/res/android"><!-- Base application theme. --><style name="AppTheme" parent="Theme.MaterialComponents.Light"><!-- Customize your theme here. -->