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
refactored to org.havenapp.main package and project name
n8fr8f2dc9535e03c
diff --git a/build.gradle b/build.gradleindex 1e2ee87..d6e730a 100644--- a/build.gradle+++ b/build.gradle@@ -70,7 +70,7 @@ android {defaultConfig {- applicationId "info.guardianproject.phoneypot"+ applicationId "org.havenapp.main"versionCode 101versionName getVersionName()archivesBaseName = "Haven-$versionName"diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xmlindex b07a3cc..cc197f1 100644--- a/src/main/AndroidManifest.xml+++ b/src/main/AndroidManifest.xml@@ -1,6 +1,6 @@<?xml version="1.0" encoding="utf-8"?><manifest xmlns:android="http://schemas.android.com/apk/res/android"- package="info.guardianproject.phoneypot">+ package="org.havenapp.main"><uses-permission android:name="android.permission.INTERNET" /><uses-permission android:name="android.permission.CAMERA" />@@ -16,12 +16,12 @@<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><application- android:name=".PhoneyPotApp"+ android:name="org.havenapp.main.PhoneyPotApp"android:icon="@mipmap/ic_launcher"android:label="@string/app_name"android:theme="@style/AppTheme"><activity- android:name=".ListActivity"+ android:name="org.havenapp.main.ListActivity"android:label="@string/title_activity_start"android:windowSoftInputMode="stateHidden"><intent-filter>@@ -31,19 +31,19 @@</intent-filter></activity><activity- android:name=".SettingsActivity"+ android:name="org.havenapp.main.SettingsActivity"android:label="@string/title_activity_start"android:windowSoftInputMode="stateHidden" />- <activity android:name=".ui.PPAppIntro"+ <activity android:name="org.havenapp.main.ui.PPAppIntro"android:screenOrientation="portrait"/><activity- android:name=".MonitorActivity"+ android:name="org.havenapp.main.MonitorActivity"android:label="@string/app_name"android:launchMode="singleTop"android:screenOrientation="portrait" />- <service android:name=".service.MonitorService" />+ <service android:name="org.havenapp.main.service.MonitorService" /><meta-dataandroid:name="DATABASE"@@ -59,11 +59,11 @@android:value="info.guardianproject.phoneypot.model" /><activity- android:name=".ui.EventActivity"+ android:name="org.havenapp.main.ui.EventActivity"android:label="@string/title_activity_event"android:theme="@style/AppTheme" />- <activity android:name=".ui.MicrophoneConfigureActivity"></activity>- <receiver android:name=".sensors.PowerConnectionReceiver">+ <activity android:name="org.havenapp.main.ui.MicrophoneConfigureActivity"></activity>+ <receiver android:name="org.havenapp.main.sensors.PowerConnectionReceiver"><intent-filter><action android:name="android.intent.action.ACTION_POWER_CONNECTED"/><action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>diff --git a/src/main/java/info/guardianproject/phoneypot/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javasimilarity index 95%rename from src/main/java/info/guardianproject/phoneypot/ListActivity.javarename to src/main/java/org/havenapp/main/ListActivity.javaindex 40d268c..8cebc45 100644--- a/src/main/java/info/guardianproject/phoneypot/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -15,7 +15,7 @@* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package info.guardianproject.phoneypot;+package org.havenapp.main;import android.database.sqlite.SQLiteException;import android.os.Handler;@@ -23,13 +23,13 @@ import android.support.design.widget.FloatingActionButton;import android.support.v7.app.AppCompatActivity;import android.support.v7.widget.RecyclerView;-import info.guardianproject.phoneypot.model.Event;-import info.guardianproject.phoneypot.model.EventTrigger;-import info.guardianproject.phoneypot.service.WebServer;-import info.guardianproject.phoneypot.ui.EventActivity;-import info.guardianproject.phoneypot.ui.EventAdapter;-import info.guardianproject.phoneypot.ui.MicrophoneConfigureActivity;-import info.guardianproject.phoneypot.ui.PPAppIntro;+import info.guardianproject.phoneypot.R;++import org.havenapp.main.model.Event;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.ui.EventActivity;+import org.havenapp.main.ui.EventAdapter;+import org.havenapp.main.ui.PPAppIntro;import android.annotation.SuppressLint;diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.javasimilarity index 92%rename from src/main/java/info/guardianproject/phoneypot/MonitorActivity.javarename to src/main/java/org/havenapp/main/MonitorActivity.javaindex c4853c2..71b9c2e 100644--- a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@ -1,11 +1,20 @@/*- * Copyright (c) 2017 Nathanial Freitas / Guardian Project- * * Licensed under the GPLv3 license.+ * Copyright (c) 2017 Nathanial Freitas*- * Copyright (c) 2013-2015 Marco Ziccardi, Luca Bonato- * Licensed under the MIT license.+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU General Public License for more details.+ *+ * You should have received a copy of the GNU General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package info.guardianproject.phoneypot;+package org.havenapp.main;import android.Manifest;import android.app.AlertDialog;@@ -22,7 +31,6 @@ import android.util.Log;import android.view.Gravity;import android.view.View;import android.widget.Button;-import android.widget.FrameLayout;import android.widget.LinearLayout;import android.widget.NumberPicker;import android.widget.TextView;@@ -33,9 +41,11 @@ import java.io.IOException;import java.util.Locale;import java.util.concurrent.TimeUnit;-import info.guardianproject.phoneypot.service.MonitorService;-import info.guardianproject.phoneypot.ui.CameraFragment;-import info.guardianproject.phoneypot.ui.MicrophoneConfigureActivity;+import info.guardianproject.phoneypot.R;++import org.havenapp.main.service.MonitorService;+import org.havenapp.main.ui.CameraFragment;+import org.havenapp.main.ui.MicrophoneConfigureActivity;public class MonitorActivity extends FragmentActivity {diff --git a/src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.java b/src/main/java/org/havenapp/main/PhoneyPotApp.javasimilarity index 95%rename from src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.javarename to src/main/java/org/havenapp/main/PhoneyPotApp.javaindex 48d9021..d17972e 100644--- a/src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.java+++ b/src/main/java/org/havenapp/main/PhoneyPotApp.java@@ -15,7 +15,7 @@* along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package info.guardianproject.phoneypot;+package org.havenapp.main;import android.support.multidex.MultiDexApplication;import android.text.TextUtils;@@ -26,7 +26,7 @@ import com.orm.SugarContext;import java.io.IOException;-import info.guardianproject.phoneypot.service.WebServer;+import org.havenapp.main.service.WebServer;public class PhoneyPotApp extends MultiDexApplication {diff --git a/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.javasimilarity index 90%rename from src/main/java/info/guardianproject/phoneypot/PreferenceManager.javarename to src/main/java/org/havenapp/main/PreferenceManager.javaindex 0788fe9..5252cb1 100644--- a/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java+++ b/src/main/java/org/havenapp/main/PreferenceManager.java@@ -1,13 +1,22 @@/*- * Copyright (c) 2017 Nathanial Freitas / Guardian Project- * * Licensed under the GPLv3 license.+ * Copyright (c) 2017 Nathanial Freitas*- * Copyright (c) 2013-2015 Marco Ziccardi, Luca Bonato- * Licensed under the MIT license.+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU General Public License for more details.+ *+ * You should have received a copy of the GNU General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package info.guardianproject.phoneypot;+package org.havenapp.main;import android.app.Activity;@@ -15,6 +24,8 @@ import android.content.Context;import android.content.SharedPreferences;import android.content.SharedPreferences.Editor;+import info.guardianproject.phoneypot.R;+public class PreferenceManager {private SharedPreferences appSharedPrefs;diff --git a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java b/src/main/java/org/havenapp/main/SettingsActivity.javasimilarity index 95%rename from src/main/java/info/guardianproject/phoneypot/SettingsActivity.javarename to src/main/java/org/havenapp/main/SettingsActivity.javaindex 607c162..77d2ae8 100644--- a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java+++ b/src/main/java/org/havenapp/main/SettingsActivity.java@@ -1,12 +1,21 @@/*- * Copyright (c) 2017 Nathanial Freitas / Guardian Project- * * Licensed under the GPLv3 license.+ * Copyright (c) 2017 Nathanial Freitas*- * Copyright (c) 2013-2015 Marco Ziccardi, Luca Bonato- * Licensed under the MIT license.+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU General Public License for more details.+ *+ * You should have received a copy of the GNU General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.*/-package info.guardianproject.phoneypot;+package org.havenapp.main;import java.io.File;@@ -23,18 +32,13 @@ import android.support.v4.content.ContextCompat;import android.support.v7.app.AlertDialog;import android.support.v7.app.AppCompatActivity;import android.support.v7.widget.Toolbar;-import android.telephony.PhoneNumberFormattingTextWatcher;-import android.text.Editable;import android.text.InputType;import android.text.TextUtils;-import android.text.TextWatcher;import android.util.Log;import android.view.Gravity;-import android.view.KeyEvent;import android.view.Menu;import android.view.MenuItem;import android.view.View;-import android.widget.AlphabetIndexer;import android.widget.Button;import android.widget.CheckBox;import android.widget.CompoundButton;@@ -43,16 +47,16 @@ import android.widget.CompoundButton.OnCheckedChangeListener;import android.widget.LinearLayout;import android.widget.NumberPicker;import android.widget.RadioButton;-import android.widget.Spinner;import android.widget.TextView;import android.widget.Toast;import info.guardianproject.netcipher.proxy.OrbotHelper;-import info.guardianproject.phoneypot.service.SignalSender;-import info.guardianproject.phoneypot.service.WebServer;-import info.guardianproject.phoneypot.ui.MicrophoneConfigureActivity;-import me.angrybyte.numberpicker.view.ActualNumberPicker;+import info.guardianproject.phoneypot.R;++import org.havenapp.main.service.SignalSender;+import org.havenapp.main.service.WebServer;+import org.havenapp.main.ui.MicrophoneConfigureActivity;public class SettingsActivity extends AppCompatActivity {diff --git a/src/main/java/info/guardianproject/phoneypot/model/Event.java b/src/main/java/org/havenapp/main/model/Event.javasimilarity index 96%rename from src/main/java/info/guardianproject/phoneypot/model/Event.javarename to src/main/java/org/havenapp/main/model/Event.javaindex a34b206..d21032d 100644--- a/src/main/java/info/guardianproject/phoneypot/model/Event.java+++ b/src/main/java/org/havenapp/main/model/Event.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.model;+package org.havenapp.main.model;import com.orm.SugarRecord;import com.orm.dsl.Ignore;diff --git a/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java b/src/main/java/org/havenapp/main/model/EventTrigger.javasimilarity index 98%rename from src/main/java/info/guardianproject/phoneypot/model/EventTrigger.javarename to src/main/java/org/havenapp/main/model/EventTrigger.javaindex be8d6a1..039d3ec 100644--- a/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java+++ b/src/main/java/org/havenapp/main/model/EventTrigger.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.model;+package org.havenapp.main.model;import com.orm.SugarRecord;diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/AccelerometerMonitor.java b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.javasimilarity index 95%rename from src/main/java/info/guardianproject/phoneypot/sensors/AccelerometerMonitor.javarename to src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.javaindex 141ebf6..80ecde0 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/AccelerometerMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.sensors;+package org.havenapp.main.sensors;import android.app.Activity;import android.content.ComponentName;@@ -15,9 +15,9 @@ import android.os.Messenger;import android.os.RemoteException;import android.util.Log;-import info.guardianproject.phoneypot.PreferenceManager;-import info.guardianproject.phoneypot.model.EventTrigger;-import info.guardianproject.phoneypot.service.MonitorService;+import org.havenapp.main.PreferenceManager;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.service.MonitorService;/*** Created by n8fr8 on 3/10/17.diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/AmbientLightMonitor.java b/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.javasimilarity index 95%rename from src/main/java/info/guardianproject/phoneypot/sensors/AmbientLightMonitor.javarename to src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.javaindex d8ba920..0e99e7e 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/AmbientLightMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.sensors;+package org.havenapp.main.sensors;import android.app.Activity;import android.content.ComponentName;@@ -15,9 +15,9 @@ import android.os.Messenger;import android.os.RemoteException;import android.util.Log;-import info.guardianproject.phoneypot.PreferenceManager;-import info.guardianproject.phoneypot.model.EventTrigger;-import info.guardianproject.phoneypot.service.MonitorService;+import org.havenapp.main.PreferenceManager;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.service.MonitorService;/*** Created by n8fr8 on 3/10/17.diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/BarometerMonitor.java b/src/main/java/org/havenapp/main/sensors/BarometerMonitor.javasimilarity index 95%rename from src/main/java/info/guardianproject/phoneypot/sensors/BarometerMonitor.javarename to src/main/java/org/havenapp/main/sensors/BarometerMonitor.javaindex bd407c2..0b2ac02 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/BarometerMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/BarometerMonitor.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.sensors;+package org.havenapp.main.sensors;import android.app.Activity;import android.content.ComponentName;@@ -15,9 +15,9 @@ import android.os.Messenger;import android.os.RemoteException;import android.util.Log;-import info.guardianproject.phoneypot.PreferenceManager;-import info.guardianproject.phoneypot.model.EventTrigger;-import info.guardianproject.phoneypot.service.MonitorService;+import org.havenapp.main.PreferenceManager;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.service.MonitorService;/*** Created by n8fr8 on 3/10/17.diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java b/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.javasimilarity index 91%rename from src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.javarename to src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.javaindex 3d54626..3321920 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.sensors;+package org.havenapp.main.sensors;/*** Created by n8fr8 on 3/10/17.@@ -14,12 +14,12 @@ import android.os.Messenger;import android.os.RemoteException;import android.util.Log;-import info.guardianproject.phoneypot.PreferenceManager;-import info.guardianproject.phoneypot.model.EventTrigger;-import info.guardianproject.phoneypot.sensors.media.AudioRecorderTask;-import info.guardianproject.phoneypot.sensors.media.MicSamplerTask;-import info.guardianproject.phoneypot.sensors.media.MicrophoneTaskFactory;-import info.guardianproject.phoneypot.service.MonitorService;+import org.havenapp.main.PreferenceManager;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.sensors.media.AudioRecorderTask;+import org.havenapp.main.sensors.media.MicSamplerTask;+import org.havenapp.main.sensors.media.MicrophoneTaskFactory;+import org.havenapp.main.service.MonitorService;public final class MicrophoneMonitor implements MicSamplerTask.MicListener {diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/PowerConnectionReceiver.java b/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.javasimilarity index 86%rename from src/main/java/info/guardianproject/phoneypot/sensors/PowerConnectionReceiver.javarename to src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.javaindex 865664c..cb6f290 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/PowerConnectionReceiver.java+++ b/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.sensors;+package org.havenapp.main.sensors;import android.content.BroadcastReceiver;import android.content.Context;@@ -6,8 +6,8 @@ import android.content.Intent;import android.os.BatteryManager;import info.guardianproject.phoneypot.R;-import info.guardianproject.phoneypot.model.EventTrigger;-import info.guardianproject.phoneypot.service.MonitorService;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.service.MonitorService;/*** Created by n8fr8 on 10/31/17.diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioCodec.java b/src/main/java/org/havenapp/main/sensors/media/AudioCodec.javasimilarity index 95%rename from src/main/java/info/guardianproject/phoneypot/sensors/media/AudioCodec.javarename to src/main/java/org/havenapp/main/sensors/media/AudioCodec.javaindex cc0f955..8f11e12 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioCodec.java+++ b/src/main/java/org/havenapp/main/sensors/media/AudioCodec.java@@ -3,9 +3,8 @@* Licensed under the MIT license.*/-package info.guardianproject.phoneypot.sensors.media;+package org.havenapp.main.sensors.media;-import java.io.ByteArrayOutputStream;import java.io.IOException;import java.util.Arrays;import android.media.AudioFormat;diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java b/src/main/java/org/havenapp/main/sensors/media/AudioRecorderTask.javasimilarity index 94%rename from src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.javarename to src/main/java/org/havenapp/main/sensors/media/AudioRecorderTask.javaindex 431fb91..5012a22 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java+++ b/src/main/java/org/havenapp/main/sensors/media/AudioRecorderTask.java@@ -7,19 +7,17 @@* Licensed under the MIT license.*/-package info.guardianproject.phoneypot.sensors.media;+package org.havenapp.main.sensors.media;-import android.content.ContentValues;import android.content.Context;import android.media.MediaRecorder;import android.os.Environment;-import android.provider.MediaStore;import android.util.Log;import java.io.File;-import info.guardianproject.phoneypot.PreferenceManager;+import org.havenapp.main.PreferenceManager;public class AudioRecorderTask extends Thread {diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/ImageCodec.java b/src/main/java/org/havenapp/main/sensors/media/ImageCodec.javasimilarity index 97%rename from src/main/java/info/guardianproject/phoneypot/sensors/media/ImageCodec.javarename to src/main/java/org/havenapp/main/sensors/media/ImageCodec.javaindex fed18ca..a9cfa28 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/ImageCodec.java+++ b/src/main/java/org/havenapp/main/sensors/media/ImageCodec.java@@ -4,7 +4,7 @@*/-package info.guardianproject.phoneypot.sensors.media;+package org.havenapp.main.sensors.media;import java.io.ByteArrayOutputStream;diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/MicSamplerTask.java b/src/main/java/org/havenapp/main/sensors/media/MicSamplerTask.javasimilarity index 97%rename from src/main/java/info/guardianproject/phoneypot/sensors/media/MicSamplerTask.javarename to src/main/java/org/havenapp/main/sensors/media/MicSamplerTask.javaindex c98a88a..85e9e6e 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/MicSamplerTask.java+++ b/src/main/java/org/havenapp/main/sensors/media/MicSamplerTask.java@@ -7,7 +7,7 @@* Licensed under the MIT license.*/-package info.guardianproject.phoneypot.sensors.media;+package org.havenapp.main.sensors.media;import java.io.IOException;diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/MicrophoneTaskFactory.java b/src/main/java/org/havenapp/main/sensors/media/MicrophoneTaskFactory.javasimilarity index 96%rename from src/main/java/info/guardianproject/phoneypot/sensors/media/MicrophoneTaskFactory.javarename to src/main/java/org/havenapp/main/sensors/media/MicrophoneTaskFactory.javaindex fbdba33..6f66165 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/MicrophoneTaskFactory.java+++ b/src/main/java/org/havenapp/main/sensors/media/MicrophoneTaskFactory.java@@ -8,7 +8,7 @@*/-package info.guardianproject.phoneypot.sensors.media;+package org.havenapp.main.sensors.media;import android.content.Context;diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.java b/src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.javasimilarity index 90%rename from src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.javarename to src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.javaindex dc9bd23..11c018e 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.java+++ b/src/main/java/org/havenapp/main/sensors/media/MotionAsyncTask.java@@ -4,14 +4,10 @@*/-package info.guardianproject.phoneypot.sensors.media;+package org.havenapp.main.sensors.media;import java.io.ByteArrayOutputStream;-import java.io.File;-import java.io.FileNotFoundException;-import java.io.FileOutputStream;-import java.nio.ByteBuffer;import java.util.ArrayList;import java.util.List;@@ -22,13 +18,11 @@ import android.graphics.ImageFormat;import android.graphics.Matrix;import android.graphics.Rect;import android.graphics.YuvImage;-import android.os.Environment;import android.os.Handler;import android.util.Log;-import android.widget.Toast;-import info.guardianproject.phoneypot.sensors.motion.IMotionDetector;-import info.guardianproject.phoneypot.sensors.motion.LuminanceMotionDetector;+import org.havenapp.main.sensors.motion.IMotionDetector;+import org.havenapp.main.sensors.motion.LuminanceMotionDetector;/*** Task doing all image processing in backgrounds,diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/motion/IMotionDetector.java b/src/main/java/org/havenapp/main/sensors/motion/IMotionDetector.javasimilarity index 91%rename from src/main/java/info/guardianproject/phoneypot/sensors/motion/IMotionDetector.javarename to src/main/java/org/havenapp/main/sensors/motion/IMotionDetector.javaindex 8331ecc..c6c0c82 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/motion/IMotionDetector.java+++ b/src/main/java/org/havenapp/main/sensors/motion/IMotionDetector.java@@ -4,7 +4,7 @@*/-package info.guardianproject.phoneypot.sensors.motion;+package org.havenapp.main.sensors.motion;import java.util.List;diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/motion/LuminanceMotionDetector.java b/src/main/java/org/havenapp/main/sensors/motion/LuminanceMotionDetector.javasimilarity index 97%rename from src/main/java/info/guardianproject/phoneypot/sensors/motion/LuminanceMotionDetector.javarename to src/main/java/org/havenapp/main/sensors/motion/LuminanceMotionDetector.javaindex 38e263e..36e982e 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/motion/LuminanceMotionDetector.java+++ b/src/main/java/org/havenapp/main/sensors/motion/LuminanceMotionDetector.java@@ -4,7 +4,7 @@*/-package info.guardianproject.phoneypot.sensors.motion;+package org.havenapp.main.sensors.motion;import java.util.ArrayList;diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/Preview.javasimilarity index 94%rename from src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.javarename to src/main/java/org/havenapp/main/sensors/motion/Preview.javaindex 483d218..ddcd9a6 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java@@ -7,11 +7,9 @@* Licensed under the MIT license.*/-package info.guardianproject.phoneypot.sensors.motion;+package org.havenapp.main.sensors.motion;-import java.io.ByteArrayOutputStream;import java.io.File;-import java.io.FileNotFoundException;import java.io.FileOutputStream;import java.io.IOException;import java.util.ArrayList;@@ -22,10 +20,7 @@ import android.content.ComponentName;import android.content.Context;import android.content.Intent;import android.content.ServiceConnection;-import android.content.res.Configuration;import android.graphics.Bitmap;-import android.graphics.Rect;-import android.graphics.YuvImage;import android.hardware.Camera;import android.hardware.Camera.Parameters;import android.hardware.Camera.PreviewCallback;@@ -35,18 +30,16 @@ import android.os.Handler;import android.os.IBinder;import android.os.Message;import android.os.Messenger;-import android.os.RemoteException;import android.util.Log;import android.view.SurfaceHolder;import android.view.SurfaceView;import android.view.Surface;import android.view.WindowManager;-import android.widget.Toast;-import info.guardianproject.phoneypot.PreferenceManager;-import info.guardianproject.phoneypot.model.EventTrigger;-import info.guardianproject.phoneypot.sensors.media.MotionAsyncTask;-import info.guardianproject.phoneypot.service.MonitorService;+import org.havenapp.main.PreferenceManager;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.sensors.media.MotionAsyncTask;+import org.havenapp.main.service.MonitorService;public class Preview extends SurfaceView implements SurfaceHolder.Callback {diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.javasimilarity index 92%rename from src/main/java/info/guardianproject/phoneypot/service/MonitorService.javarename to src/main/java/org/havenapp/main/service/MonitorService.javaindex af641e8..75b30f2 100644--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@ -7,7 +7,7 @@* Licensed under the MIT license.*/-package info.guardianproject.phoneypot.service;+package org.havenapp.main.service;import android.annotation.SuppressLint;@@ -23,25 +23,21 @@ import android.os.PowerManager;import android.support.v4.app.NotificationCompat;import android.telephony.SmsManager;import android.text.TextUtils;-import android.util.Log;-import org.asamk.Signal;--import java.io.IOException;import java.util.ArrayList;import java.util.Date;import java.util.StringTokenizer;-import info.guardianproject.phoneypot.MonitorActivity;-import info.guardianproject.phoneypot.PhoneyPotApp;+import org.havenapp.main.MonitorActivity;+import org.havenapp.main.PhoneyPotApp;import info.guardianproject.phoneypot.R;-import info.guardianproject.phoneypot.PreferenceManager;-import info.guardianproject.phoneypot.model.Event;-import info.guardianproject.phoneypot.model.EventTrigger;-import info.guardianproject.phoneypot.sensors.AccelerometerMonitor;-import info.guardianproject.phoneypot.sensors.AmbientLightMonitor;-import info.guardianproject.phoneypot.sensors.BarometerMonitor;-import info.guardianproject.phoneypot.sensors.MicrophoneMonitor;+import org.havenapp.main.PreferenceManager;+import org.havenapp.main.model.Event;+import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.sensors.AccelerometerMonitor;+import org.havenapp.main.sensors.AmbientLightMonitor;+import org.havenapp.main.sensors.BarometerMonitor;+import org.havenapp.main.sensors.MicrophoneMonitor;@SuppressLint("HandlerLeak")public class MonitorService extends Service {diff --git a/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java b/src/main/java/org/havenapp/main/service/SignalSender.javasimilarity index 97%rename from src/main/java/info/guardianproject/phoneypot/service/SignalSender.javarename to src/main/java/org/havenapp/main/service/SignalSender.javaindex b4a9c1a..e5c6ac7 100644--- a/src/main/java/info/guardianproject/phoneypot/service/SignalSender.java+++ b/src/main/java/org/havenapp/main/service/SignalSender.java@@ -1,10 +1,9 @@-package info.guardianproject.phoneypot.service;+package org.havenapp.main.service;import android.content.Context;import net.sourceforge.argparse4j.inf.Namespace;-import org.asamk.Signal;import org.asamk.signal.Main;import java.util.ArrayList;diff --git a/src/main/java/info/guardianproject/phoneypot/service/WebServer.java b/src/main/java/org/havenapp/main/service/WebServer.javasimilarity index 97%rename from src/main/java/info/guardianproject/phoneypot/service/WebServer.javarename to src/main/java/org/havenapp/main/service/WebServer.javaindex 56d765f..e3b34cb 100644--- a/src/main/java/info/guardianproject/phoneypot/service/WebServer.java+++ b/src/main/java/org/havenapp/main/service/WebServer.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.service;+package org.havenapp.main.service;import android.net.Uri;import android.text.TextUtils;@@ -11,8 +11,8 @@ import java.util.List;import java.util.UUID;import fi.iki.elonen.NanoHTTPD;-import info.guardianproject.phoneypot.model.Event;-import info.guardianproject.phoneypot.model.EventTrigger;+import org.havenapp.main.model.Event;+import org.havenapp.main.model.EventTrigger;/*** Created by n8fr8 on 6/25/17.diff --git a/src/main/java/info/guardianproject/phoneypot/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.javasimilarity index 90%rename from src/main/java/info/guardianproject/phoneypot/ui/CameraFragment.javarename to src/main/java/org/havenapp/main/ui/CameraFragment.javaindex a58fbb9..3b42093 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/CameraFragment.java+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java@@ -6,7 +6,7 @@* Copyright (c) 2013-2015 Marco Ziccardi, Luca Bonato* Licensed under the MIT license.*/-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;import android.os.Bundle;import android.graphics.Bitmap;@@ -19,11 +19,11 @@ import android.view.ViewGroup;import android.widget.ImageView;import android.widget.FrameLayout;-import info.guardianproject.phoneypot.PreferenceManager;+import org.havenapp.main.PreferenceManager;import info.guardianproject.phoneypot.R;-import info.guardianproject.phoneypot.sensors.media.MotionAsyncTask;-import info.guardianproject.phoneypot.sensors.media.ImageCodec;-import info.guardianproject.phoneypot.sensors.motion.Preview;+import org.havenapp.main.sensors.media.MotionAsyncTask;+import org.havenapp.main.sensors.media.ImageCodec;+import org.havenapp.main.sensors.motion.Preview;public final class CameraFragment extends Fragment {diff --git a/src/main/java/info/guardianproject/phoneypot/ui/CustomSlideBigText.java b/src/main/java/org/havenapp/main/ui/CustomSlideBigText.javasimilarity index 97%rename from src/main/java/info/guardianproject/phoneypot/ui/CustomSlideBigText.javarename to src/main/java/org/havenapp/main/ui/CustomSlideBigText.javaindex 328ef28..b189e0b 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/CustomSlideBigText.java+++ b/src/main/java/org/havenapp/main/ui/CustomSlideBigText.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;/*** Created by n8fr8 on 10/30/17.diff --git a/src/main/java/info/guardianproject/phoneypot/ui/CustomSlideNotify.java b/src/main/java/org/havenapp/main/ui/CustomSlideNotify.javasimilarity index 93%rename from src/main/java/info/guardianproject/phoneypot/ui/CustomSlideNotify.javarename to src/main/java/org/havenapp/main/ui/CustomSlideNotify.javaindex 8165f75..624ad78 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/CustomSlideNotify.java+++ b/src/main/java/org/havenapp/main/ui/CustomSlideNotify.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;/*** Created by n8fr8 on 10/30/17.@@ -18,12 +18,9 @@ import android.view.View;import android.view.ViewGroup;import android.widget.Button;import android.widget.EditText;-import android.widget.TextView;-import android.widget.Toast;-import info.guardianproject.phoneypot.PreferenceManager;+import org.havenapp.main.PreferenceManager;import info.guardianproject.phoneypot.R;-import info.guardianproject.phoneypot.SettingsActivity;public class CustomSlideNotify extends Fragment {diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.javasimilarity index 96%rename from src/main/java/info/guardianproject/phoneypot/ui/EventActivity.javarename to src/main/java/org/havenapp/main/ui/EventActivity.javaindex 965dc5b..4169657 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;import android.content.Intent;import android.net.Uri;@@ -13,15 +13,13 @@ import android.support.v7.widget.RecyclerView;import android.support.v7.widget.Toolbar;import android.support.v7.widget.helper.ItemTouchHelper;import android.view.View;-import android.widget.TextView;import java.io.File;import java.util.ArrayList;-import info.guardianproject.phoneypot.ListActivity;import info.guardianproject.phoneypot.R;-import info.guardianproject.phoneypot.model.Event;-import info.guardianproject.phoneypot.model.EventTrigger;+import org.havenapp.main.model.Event;+import org.havenapp.main.model.EventTrigger;public class EventActivity extends AppCompatActivity {diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventAdapter.java b/src/main/java/org/havenapp/main/ui/EventAdapter.javasimilarity index 93%rename from src/main/java/info/guardianproject/phoneypot/ui/EventAdapter.javarename to src/main/java/org/havenapp/main/ui/EventAdapter.javaindex ff4d7af..1367392 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/EventAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventAdapter.java@@ -1,7 +1,6 @@-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;import android.content.Context;-import android.provider.ContactsContract;import android.support.v7.widget.RecyclerView;import android.view.LayoutInflater;import android.view.View;@@ -11,7 +10,7 @@ import android.widget.TextView;import java.util.List;import info.guardianproject.phoneypot.R;-import info.guardianproject.phoneypot.model.Event;+import org.havenapp.main.model.Event;/*** Created by n8fr8 on 4/16/17.diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javasimilarity index 97%rename from src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.javarename to src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex 045210e..869c973 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -1,9 +1,7 @@-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;import android.content.Context;import android.content.Intent;-import android.media.MediaPlayer;-import android.media.RemoteControlClient;import android.net.Uri;import android.support.v7.widget.RecyclerView;import android.view.LayoutInflater;@@ -22,7 +20,7 @@ import java.util.ArrayList;import java.util.List;import info.guardianproject.phoneypot.R;-import info.guardianproject.phoneypot.model.EventTrigger;+import org.havenapp.main.model.EventTrigger;import nl.changer.audiowife.AudioWife;/**diff --git a/src/main/java/info/guardianproject/phoneypot/ui/MicrophoneConfigureActivity.java b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.javasimilarity index 91%rename from src/main/java/info/guardianproject/phoneypot/ui/MicrophoneConfigureActivity.javarename to src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.javaindex e4e2f0a..44745f4 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/MicrophoneConfigureActivity.java+++ b/src/main/java/org/havenapp/main/ui/MicrophoneConfigureActivity.java@@ -1,44 +1,32 @@-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;import android.Manifest;-import android.content.Intent;import android.content.pm.PackageManager;import android.graphics.Canvas;import android.graphics.Color;import android.graphics.Paint;import android.graphics.PorterDuff;-import android.os.Message;-import android.os.RemoteException;import android.support.v4.app.ActivityCompat;import android.support.v4.content.ContextCompat;import android.support.v7.app.AppCompatActivity;import android.os.Bundle;import android.support.v7.widget.Toolbar;-import android.util.Log;import android.view.Menu;import android.view.MenuItem;-import android.view.MotionEvent;-import android.widget.NumberPicker;import android.widget.TextView;-import android.widget.Toast;import com.maxproj.simplewaveform.SimpleWaveform;import java.util.LinkedList;-import info.guardianproject.phoneypot.ListActivity;-import info.guardianproject.phoneypot.MonitorActivity;-import info.guardianproject.phoneypot.PreferenceManager;+import org.havenapp.main.PreferenceManager;import info.guardianproject.phoneypot.R;-import info.guardianproject.phoneypot.model.EventTrigger;-import info.guardianproject.phoneypot.sensors.media.AudioRecorderTask;-import info.guardianproject.phoneypot.sensors.media.MicSamplerTask;-import info.guardianproject.phoneypot.sensors.media.MicrophoneTaskFactory;++import org.havenapp.main.sensors.media.MicSamplerTask;+import org.havenapp.main.sensors.media.MicrophoneTaskFactory;import me.angrybyte.numberpicker.listener.OnValueChangeListener;import me.angrybyte.numberpicker.view.ActualNumberPicker;-import static info.guardianproject.phoneypot.R.id.microphone;-public class MicrophoneConfigureActivity extends AppCompatActivity implements MicSamplerTask.MicListener {private MicSamplerTask microphone;diff --git a/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java b/src/main/java/org/havenapp/main/ui/PPAppIntro.javasimilarity index 97%rename from src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.javarename to src/main/java/org/havenapp/main/ui/PPAppIntro.javaindex 7cd4fe8..4a7db1b 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/PPAppIntro.java+++ b/src/main/java/org/havenapp/main/ui/PPAppIntro.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;import com.github.paolorotolo.appintro.AppIntro;import com.github.paolorotolo.appintro.AppIntroFragment;@@ -11,7 +11,7 @@ import android.view.View;import android.widget.Toast;-import info.guardianproject.phoneypot.PreferenceManager;+import org.havenapp.main.PreferenceManager;import info.guardianproject.phoneypot.R;/**diff --git a/src/main/java/info/guardianproject/phoneypot/ui/ShareOverlayView.java b/src/main/java/org/havenapp/main/ui/ShareOverlayView.javasimilarity index 93%rename from src/main/java/info/guardianproject/phoneypot/ui/ShareOverlayView.javarename to src/main/java/org/havenapp/main/ui/ShareOverlayView.javaindex 65c18fc..187657a 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/ShareOverlayView.java+++ b/src/main/java/org/havenapp/main/ui/ShareOverlayView.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;import android.content.Context;import android.content.Intent;@@ -6,12 +6,9 @@ import android.net.Uri;import android.util.AttributeSet;import android.view.View;import android.widget.RelativeLayout;-import android.widget.TextView;import com.stfalcon.frescoimageviewer.ImageViewer;-import java.io.File;-import info.guardianproject.phoneypot.R;/*diff --git a/src/main/java/info/guardianproject/phoneypot/ui/SimpleWaveformExtended.java b/src/main/java/org/havenapp/main/ui/SimpleWaveformExtended.javasimilarity index 95%rename from src/main/java/info/guardianproject/phoneypot/ui/SimpleWaveformExtended.javarename to src/main/java/org/havenapp/main/ui/SimpleWaveformExtended.javaindex e28f6df..f1d23d7 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/SimpleWaveformExtended.java+++ b/src/main/java/org/havenapp/main/ui/SimpleWaveformExtended.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.ui;+package org.havenapp.main.ui;import android.content.Context;import android.graphics.Canvas;diff --git a/src/main/res/layout/activity_event.xml b/src/main/res/layout/activity_event.xmlindex 41754f5..87e338e 100644--- a/src/main/res/layout/activity_event.xml+++ b/src/main/res/layout/activity_event.xml@@ -5,7 +5,7 @@android:layout_width="match_parent"android:layout_height="match_parent"android:fitsSystemWindows="true"- tools:context="info.guardianproject.phoneypot.ui.EventActivity">+ tools:context="org.havenapp.main.ui.EventActivity"><android.support.design.widget.AppBarLayoutandroid:id="@+id/app_bar"diff --git a/src/main/res/layout/activity_list.xml b/src/main/res/layout/activity_list.xmlindex 94e4e4a..f8bf967 100644--- a/src/main/res/layout/activity_list.xml+++ b/src/main/res/layout/activity_list.xml@@ -5,7 +5,7 @@android:layout_width="match_parent"android:layout_height="match_parent"android:fitsSystemWindows="true"- tools:context="info.guardianproject.phoneypot.ListActivity">+ tools:context="info.guardianproject.phoneypot.org.havenapp.main.ListActivity"><android.support.design.widget.AppBarLayoutandroid:layout_width="match_parent"diff --git a/src/main/res/layout/activity_microphone_configure.xml b/src/main/res/layout/activity_microphone_configure.xmlindex f4577fb..92b01dc 100644--- a/src/main/res/layout/activity_microphone_configure.xml+++ b/src/main/res/layout/activity_microphone_configure.xml@@ -49,7 +49,7 @@/>- <info.guardianproject.phoneypot.ui.SimpleWaveformExtended+ <org.havenapp.main.ui.SimpleWaveformExtendedandroid:id="@+id/simplewaveform"android:layout_width="match_parent"android:layout_height="240dp"diff --git a/src/main/res/layout/activity_monitor.xml b/src/main/res/layout/activity_monitor.xmlindex f075c19..5e59517 100644--- a/src/main/res/layout/activity_monitor.xml+++ b/src/main/res/layout/activity_monitor.xml@@ -12,7 +12,7 @@android:layout_width="match_parent"android:layout_height="match_parent">- <fragment class="info.guardianproject.phoneypot.ui.CameraFragment"+ <fragment class="org.havenapp.main.ui.CameraFragment"android:id="@+id/fragment_camera"android:layout_width="match_parent"android:layout_height="match_parent"diff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xmlindex 01aa26f..3a4fc0b 100644--- a/src/main/res/layout/activity_settings.xml+++ b/src/main/res/layout/activity_settings.xml@@ -141,7 +141,7 @@android:layout_width="wrap_content"android:layout_height="wrap_content"android:layout_centerHorizontal="true"- tools:context=".SettingsActivity" />+ tools:context="org.havenapp.main.SettingsActivity" /><EditTextandroid:id="@+id/phone_number"@@ -167,20 +167,20 @@android:text="@string/remote_access_label"android:layout_width="wrap_content"android:layout_height="wrap_content"- tools:context=".SettingsActivity" />+ tools:context="org.havenapp.main.SettingsActivity" /><EditTextandroid:id="@+id/remote_access_onion"android:hint="@string/remote_access_hint"android:layout_width="wrap_content"android:layout_height="wrap_content"- tools:context=".SettingsActivity" />+ tools:context="org.havenapp.main.SettingsActivity" /><EditTextandroid:id="@+id/remote_access_credential"android:hint="@string/remote_access_credential_hint"android:layout_width="wrap_content"android:layout_height="wrap_content"android:inputType="textPassword"- tools:context=".SettingsActivity" />+ tools:context="org.havenapp.main.SettingsActivity" /><LinearLayoutandroid:layout_width="match_parent"android:layout_height="wrap_content"diff --git a/src/main/res/layout/content_event.xml b/src/main/res/layout/content_event.xmlindex 5490ec9..9901e7e 100644--- a/src/main/res/layout/content_event.xml+++ b/src/main/res/layout/content_event.xml@@ -5,7 +5,7 @@android:layout_width="match_parent"android:layout_height="match_parent"app:layout_behavior="@string/appbar_scrolling_view_behavior"- tools:context="info.guardianproject.phoneypot.ui.EventActivity"+ tools:context="org.havenapp.main.ui.EventActivity"tools:showIn="@layout/activity_event"><TextViewdiff --git a/src/main/res/menu/menu_event.xml b/src/main/res/menu/menu_event.xmlindex 043e646..77741b1 100644--- a/src/main/res/menu/menu_event.xml+++ b/src/main/res/menu/menu_event.xml@@ -1,7 +1,7 @@<menu xmlns:android="http://schemas.android.com/apk/res/android"xmlns:app="http://schemas.android.com/apk/res-auto"xmlns:tools="http://schemas.android.com/tools"- tools:context="info.guardianproject.phoneypot.ui.EventActivity">+ tools:context="org.havenapp.main.ui.EventActivity"><itemandroid:id="@+id/action_settings"android:orderInCategory="100"