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
improve cancel/deactivate logic
n8fr8dfe024a597a3
diff --git a/src/main/java/info/guardianproject/phoneypot/ListActivity.java b/src/main/java/info/guardianproject/phoneypot/ListActivity.javaindex 69fe07b..51e7e2e 100644--- a/src/main/java/info/guardianproject/phoneypot/ListActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/ListActivity.java@@ -236,6 +236,22 @@ public class ListActivity extends AppCompatActivity {if (newCount > initialCount) {+ events = Event.listAll(Event.class, "id DESC");+ adapter = new EventAdapter(ListActivity.this, events);+ recyclerView.setAdapter(adapter);++ adapter.SetOnItemClickListener(new EventAdapter.OnItemClickListener() {+ @Override+ public void onItemClick(View view, int position) {++ Intent i = new Intent(ListActivity.this, EventActivity.class);+ i.putExtra("eventid", events.get(position).getId());+ modifyPos = position;++ startActivity(i);+ }+ });+ /**// Just load the last added note (new)Event event = Event.last(Event.class);@@ -244,6 +260,10 @@ public class ListActivity extends AppCompatActivity {adapter.notifyDataSetChanged();initialCount = newCount;+ **/++ initialCount = newCount;+recyclerView.setVisibility(View.VISIBLE);findViewById(R.id.empty_view).setVisibility(View.GONE);diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.javaindex fa2fdb9..c798e1f 100644--- a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java@@ -46,7 +46,9 @@ public class MonitorActivity extends FragmentActivity {private CountDownTimer cTimer;- @Override+ private boolean mIsMonitoring = false;++ @Overrideprotected void onCreate(Bundle savedInstanceState) {super.onCreate(savedInstanceState);@@ -152,19 +154,26 @@ public class MonitorActivity extends FragmentActivity {if (cTimer != null) {cTimer.cancel();cTimer = null;- stopService(new Intent(this, MonitorService.class));- findViewById(R.id.btnStartNow).setVisibility(View.VISIBLE);- findViewById(R.id.timer_text_title).setVisibility(View.VISIBLE);+ if (mIsMonitoring) {+ mIsMonitoring = false;+ stopService(new Intent(this, MonitorService.class));+ finish();+ }+ else {- ((Button)findViewById(R.id.btnStartLater)).setText(R.string.start_later);+ findViewById(R.id.btnStartNow).setVisibility(View.VISIBLE);+ findViewById(R.id.timer_text_title).setVisibility(View.VISIBLE);- int timeM = preferences.getTimerDelay()*1000;- String timerText = String.format(Locale.getDefault(), "%02d:%02d",- TimeUnit.MILLISECONDS.toMinutes(timeM) % 60,- TimeUnit.MILLISECONDS.toSeconds(timeM) % 60);+ ((Button) findViewById(R.id.btnStartLater)).setText(R.string.start_later);- txtTimer.setText(timerText);+ int timeM = preferences.getTimerDelay() * 1000;+ String timerText = String.format(Locale.getDefault(), "%02d:%02d",+ TimeUnit.MILLISECONDS.toMinutes(timeM) % 60,+ TimeUnit.MILLISECONDS.toSeconds(timeM) % 60);++ txtTimer.setText(timerText);+ }}else {@@ -223,6 +232,7 @@ public class MonitorActivity extends FragmentActivity {private void initMonitor (){+ mIsMonitoring = true;//ensure folder exists and will not be scanned by the gallery apptry {