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
for #137 #211 ensure MonitorActivity state is in sync with MonitorService - this allows you to leave and re-exit the monitor activity with bg service still running - this should also improve cases where activity crases but monitoservice is still live
n8fr83a438ee3c814
diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.javaindex 5421f3a..de5883e 100644--- a/src/main/java/org/havenapp/main/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@ -32,6 +32,7 @@ import android.widget.Button;import android.widget.TextView;import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;+import org.havenapp.main.service.MonitorService;import org.havenapp.main.ui.AccelConfigureActivity;import org.havenapp.main.ui.CameraFragment;@@ -44,7 +45,7 @@ import java.io.IOException;import static org.havenapp.main.Utils.getTimerText;public class MonitorActivity extends AppCompatActivity implements TimePickerDialog.OnTimeSetListener {-+private PreferenceManager preferences = null;private TextView txtTimer;@@ -61,14 +62,32 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDialboolean permsNeeded = askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);- if (!permsNeeded)- initLayout();+ if (!permsNeeded) {++ initSetupLayout();++ if (MonitorService.getInstance() != null)+ if (MonitorService.getInstance().isRunning())+ initActiveLayout();++ }getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);}- private void initLayout() {+ private void initActiveLayout() {++ ((Button) findViewById(R.id.btnStartLater)).setText(R.string.action_cancel);+ findViewById(R.id.btnStartNow).setVisibility(View.INVISIBLE);+ findViewById(R.id.timer_text_title).setVisibility(View.INVISIBLE);+ txtTimer.setText(R.string.status_on);++ mOnTimerTicking = false;+ mIsMonitoring = true;+ }++ private void initSetupLayout() {preferences = new PreferenceManager(getApplicationContext());setContentView(R.layout.activity_monitor);@@ -166,25 +185,24 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDialif (cTimer != null) {cTimer.cancel();cTimer = null;+ mOnTimerTicking = false;+ }- if (mIsMonitoring) {- mIsMonitoring = false;- stopService(new Intent(this, MonitorService.class));- finish();- } else {+ if (mIsMonitoring) {+ mIsMonitoring = false;+ stopService(new Intent(this, MonitorService.class));+ finish();+ } else {- findViewById(R.id.btnStartNow).setVisibility(View.VISIBLE);- findViewById(R.id.timer_text_title).setVisibility(View.VISIBLE);+ findViewById(R.id.btnStartNow).setVisibility(View.VISIBLE);+ findViewById(R.id.timer_text_title).setVisibility(View.VISIBLE);- ((Button) findViewById(R.id.btnStartLater)).setText(R.string.start_later);+ ((Button) findViewById(R.id.btnStartLater)).setText(R.string.start_later);- int timeM = preferences.getTimerDelay() * 1000;- txtTimer.setText(getTimerText(timeM));- }- } else {-- close();+ int timeM = preferences.getTimerDelay() * 1000;+ txtTimer.setText(getTimerText(timeM));}+}private void showSettings() {@@ -257,12 +275,6 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial*/private void close() {- stopService(new Intent(this, MonitorService.class));- if (preferences != null) {- preferences.unsetAccessToken();- preferences.unsetDelegatedAccessToken();- preferences.unsetPhoneId();- }finish();}@@ -305,7 +317,7 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDialaskForPermission(Manifest.permission.CAMERA, 2);break;case 2:- initLayout();+ initSetupLayout();break;}diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.javaindex 57f98c8..69844a8 100644--- a/src/main/java/org/havenapp/main/PreferenceManager.java+++ b/src/main/java/org/havenapp/main/PreferenceManager.java@@ -227,55 +227,6 @@ public class PreferenceManager {return appSharedPrefs.getString(SMS_NUMBER, "");}-- public void setUnlockCode(String unlockCode) {- prefsEditor.putString(UNLOCK_CODE, unlockCode);- prefsEditor.commit();- }-- public String getUnlockCode() {- return appSharedPrefs.getString(UNLOCK_CODE, "");- }-- public void setAccessToken(String accessToken) {- prefsEditor.putString(ACCESS_TOKEN, accessToken);- prefsEditor.commit();- }-- public String getAccessToken() {- return appSharedPrefs.getString(ACCESS_TOKEN, "");- }-- public void unsetAccessToken() {- prefsEditor.remove(ACCESS_TOKEN);- }-- public void setDelegatedAccessToken(String deferredAccessToken) {- prefsEditor.putString(DELEGATED_ACCESS_TOKEN, deferredAccessToken);- prefsEditor.commit();- }-- public String getDelegatedAccessToken() {- return appSharedPrefs.getString(DELEGATED_ACCESS_TOKEN, "");- }-- public void unsetDelegatedAccessToken() {- prefsEditor.remove(DELEGATED_ACCESS_TOKEN);- }-- public void setPhoneId(String phoneId) {- prefsEditor.putString(PHONE_ID, phoneId);- prefsEditor.commit();- }-- public void unsetPhoneId() {- prefsEditor.remove(PHONE_ID);- }-- public String getPhoneId() {- return appSharedPrefs.getString(PHONE_ID, "");- }-public int getTimerDelay (){return appSharedPrefs.getInt(TIMER_DELAY,30);diff --git a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.javaindex c513bce..e90a36e 100644--- a/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java+++ b/src/main/java/org/havenapp/main/ui/CameraConfigureActivity.java@@ -17,37 +17,22 @@package org.havenapp.main.ui;import android.Manifest;-import android.content.Intent;import android.content.pm.PackageManager;-import android.graphics.Camera;import android.os.Bundle;-import android.os.CountDownTimer;-import android.os.Environment;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 android.util.Log;import android.view.MenuItem;import android.view.View;-import android.widget.Button;import android.widget.SeekBar;-import android.widget.TextView;--import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;-import org.havenapp.main.SettingsActivity;-import org.havenapp.main.service.MonitorService;--import java.io.File;-import java.io.FileOutputStream;-import java.io.IOException;public class CameraConfigureActivity extends AppCompatActivity {-+private PreferenceManager preferences = null;private boolean mIsMonitoring = false;@@ -84,7 +69,7 @@ public class CameraConfigureActivity extends AppCompatActivity {}});- SeekBar sBar = ((SeekBar)findViewById(R.id.seekCameraSensitivity));+ SeekBar sBar = ((SeekBar) findViewById(R.id.seekCameraSensitivity));sBar.setProgress(preferences.getCameraSensitivity());sBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {@Override@@ -120,43 +105,18 @@ public class CameraConfigureActivity extends AppCompatActivity {}-- private void initMonitor() {-- mIsMonitoring = true;- //ensure folder exists and will not be scanned by the gallery app-- try {- File fileImageDir = new File(Environment.getExternalStorageDirectory(), preferences.getImagePath());- fileImageDir.mkdirs();- new FileOutputStream(new File(fileImageDir, ".nomedia")).write(0);- } catch (IOException e) {- Log.e("Monitor", "unable to init media storage directory", e);- }-- //Do something after 100ms- startService(new Intent(CameraConfigureActivity.this, MonitorService.class));-- }-/*** Closes the monitor activity and unset session properties*/private void close() {- stopService(new Intent(this, MonitorService.class));- if (preferences != null) {- preferences.unsetAccessToken();- preferences.unsetDelegatedAccessToken();- preferences.unsetPhoneId();- }finish();}@Override- public boolean onOptionsItemSelected (MenuItem item) {- switch (item.getItemId()){+ public boolean onOptionsItemSelected(MenuItem item) {+ switch (item.getItemId()) {case android.R.id.home:close();break;