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 https://github.com/btrice/haven into btrice-master
n8fr81eb7c3ba2918
diff --cc src/main/java/org/havenapp/main/MonitorActivity.javaindex c8dc724,7fb0171..db74952--- a/src/main/java/org/havenapp/main/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@@ -39,11 -38,17 +39,13 @@@ import org.havenapp.main.ui.MicrophoneCimport java.io.File;import java.io.FileOutputStream;import java.io.IOException;-import java.util.Locale;-import java.util.concurrent.TimeUnit;+import static org.havenapp.main.Utils.getTimerText;-import org.havenapp.main.service.MonitorService;-import org.havenapp.main.ui.AccelConfigureActivity;-import org.havenapp.main.ui.CameraFragment;-import org.havenapp.main.ui.MicrophoneConfigureActivity;+public class MonitorActivity extends FragmentActivity implements TimePickerDialog.OnTimeSetListener {+ public class MonitorActivity extends FragmentActivity {+private PreferenceManager preferences = null;private TextView txtTimer;diff --cc src/main/java/org/havenapp/main/PreferenceManager.javaindex 724b2e5,c95963a..f468852--- a/src/main/java/org/havenapp/main/PreferenceManager.java+++ b/src/main/java/org/havenapp/main/PreferenceManager.java@@@ -38,37 -38,30 +38,37 @@@ public class PreferenceManagerpublic static final String FRONT = "Front";public static final String BACK = "Back";+ public static final String NONE = "None";- private static final String APP_SHARED_PREFS="org.havenapp.main";- private static final String ACCELEROMETER_ACTIVE="accelerometer_active";- private static final String ACCELEROMETER_SENSITIVITY="accelerometer_sensibility";- private static final String CAMERA_ACTIVE="camera_active";- public static final String CAMERA="camera";- private static final String CAMERA_SENSITIVITY="camera_sensitivity";+ private static final String APP_SHARED_PREFS="org.havenapp.main";+ private static final String ACCELEROMETER_ACTIVE="accelerometer_active";+ private static final String ACCELEROMETER_SENSITIVITY="accelerometer_sensibility";+ private static final String CAMERA_ACTIVE="camera_active";- private static final String CAMERA="camera";++ public static final String CAMERA="camera";+ private static final String CAMERA_SENSITIVITY="camera_sensitivity";+ public static final String CONFIG_MOVEMENT ="config_movement";- private static final String FLASH_ACTIVE="flash_active";- private static final String MICROPHONE_ACTIVE="microphone_active";- private static final String MICROPHONE_SENSITIVITY="microphone_sensitivity";+ private static final String FLASH_ACTIVE="flash_active";+ private static final String MICROPHONE_ACTIVE="microphone_active";+ private static final String MICROPHONE_SENSITIVITY="microphone_sensitivity";- private static final String SMS_ACTIVE="sms_active";- private static final String SMS_NUMBER="sms_number";+ public static final String CONFIG_SOUND = "config_sound";+ public static final String CONFIG_TIME_DELAY = "config_delay_time";- public static final String SMS_ACTIVE = "sms_active";++ public static final String SMS_ACTIVE = "sms_active";+ public static final String SMS_NUMBER = "sms_number";+ public static final String REGISTER_SIGNAL = "register_signal";+ public static final String VERIFY_SIGNAL = "verify_signal";+ public static final String SEND_SMS = "send_sms";- private static final String UNLOCK_CODE="unlock_code";+ private static final String UNLOCK_CODE="unlock_code";- private static final String ACCESS_TOKEN="access_token";- private static final String DELEGATED_ACCESS_TOKEN="deferred_access_token";+ private static final String ACCESS_TOKEN="access_token";+ private static final String DELEGATED_ACCESS_TOKEN="deferred_access_token";- private static final String PHONE_ID="phone_id";+ private static final String PHONE_ID="phone_id";private static final String TIMER_DELAY="timer_delay";- private static final String DIR_PATH = "/secureit";+ private static final String DIR_PATH = "/secureit";- private static final String REMOTE_ACCESS_ACTIVE = "remote_access_active";- private static final String REMOTE_ACCESS_ONION = "remote_access_onion";- private static final String REMOTE_ACCESS_CRED = "remote_access_credential";+ public static final String REMOTE_ACCESS_ACTIVE = "remote_access_active";+ public static final String REMOTE_ACCESS_ONION = "remote_access_onion";+ public static final String REMOTE_ACCESS_CRED = "remote_access_credential";private static final String SIGNAL_USERNAME = "signal_username";diff --cc src/main/java/org/havenapp/main/SettingsActivity.javaindex d7ae4a7,8b623f1..bb3fb0d--- a/src/main/java/org/havenapp/main/SettingsActivity.java+++ b/src/main/java/org/havenapp/main/SettingsActivity.java@@@ -26,7 -53,17 +26,8 @@@ import java.util.ArrayListimport info.guardianproject.netcipher.proxy.OrbotHelper;-import org.havenapp.main.service.SignalSender;-import org.havenapp.main.service.WebServer;-import org.havenapp.main.ui.AccelConfigureActivity;-import org.havenapp.main.ui.MicrophoneConfigureActivity;-public class SettingsActivity extends AppCompatActivity {-- private PreferenceManager preferences = null;- private HavenApp app = null;- private EditText remoteAccessCredential;+@Overridepublic void onCreate(Bundle savedInstanceState) {super.onCreate(savedInstanceState);diff --cc src/main/java/org/havenapp/main/service/MonitorService.javaindex 7ac0b60,c91f495..28ab3fa--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@@ -51,30 -52,29 +51,29 @@@ public class MonitorService extends Ser*/private static MonitorService sInstance;- /**- * To show a notification on service start- */+ /**+ * To show a notification on service start+ */- NotificationManager manager;- NotificationChannel mChannel;- final static String channelId = "monitor_id";- final static CharSequence channelName = "Haven notifications";- final static String channelDescription= "Important messages from Haven";+ private NotificationManager manager;+ private NotificationChannel mChannel;+ private final static String channelId = "monitor_id";+ private final static CharSequence channelName = "Haven notifications";+ private final static String channelDescription= "Important messages from Haven";- /**- * True only if service has been alerted by the accelerometer- */- private boolean already_alerted;+ /**+ * True only if service has been alerted by the accelerometer+ */+ private boolean already_alerted;- /**- * Object used to retrieve shared preferences- */- private PreferenceManager mPrefs = null;--- /**- * Incrementing alert id- */- private int mNotificationAlertId = 7007;+ /**+ * Object used to retrieve shared preferences+ */+ private PreferenceManager mPrefs = null;++ /**+ * Incrementing alert id+ */- int mNotificationAlertId = 7007;++ private int mNotificationAlertId = 7007;/*** Sensor Monitors@@@ -89,12 -89,12 +88,12 @@@/*** Last Event instances*/- Event mLastEvent;+ private Event mLastEvent;- /**+ /*** Handler for incoming messages*/- class MessageHandler extends Handler {+ private class MessageHandler extends Handler {@Overridepublic void handleMessage(Message msg) {alert(msg.what,msg.getData().getString("path"));@@@ -106,16 -106,15 +105,15 @@@*/private final Messenger messenger = new Messenger(new MessageHandler());- /*- ** Helps keep the service awake when screen is off+ /**+ * Helps keep the service awake when screen is off*/- PowerManager.WakeLock wakeLock;+ private PowerManager.WakeLock wakeLock;- /*- **- * Application+ /**+ * Application*/- HavenApp mApp = null;+ private HavenApp mApp = null;/*** Called on service creation, sends a notification