Skip to content

armgit / haven

Public Imported from GitHub
0

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

improvements to time configuration UI

n8fr88834c71bcb78
diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
index c798e1f..e6d09aa 100644
--- a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
@@ -24,6 +24,7 @@ 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;
@@ -67,7 +68,7 @@ public class MonitorActivity extends FragmentActivity {
viewTimer = findViewById(R.id.timer_container);
int timeM = preferences.getTimerDelay()*1000;
- String timerText = String.format(Locale.getDefault(), "%02d:%02d",
+ String timerText = String.format(Locale.getDefault(), "%02dm %02ds",
TimeUnit.MILLISECONDS.toMinutes(timeM) % 60,
TimeUnit.MILLISECONDS.toSeconds(timeM) % 60);
@@ -76,7 +77,7 @@ public class MonitorActivity extends FragmentActivity {
@Override
public void onClick(View v) {
if (cTimer == null)
- showNumberPicker();
+ showTimeDelayDialog();
}
});
@@ -84,7 +85,7 @@ public class MonitorActivity extends FragmentActivity {
@Override
public void onClick(View v) {
if (cTimer == null)
- showNumberPicker();
+ showTimeDelayDialog();
}
});
@@ -141,7 +142,7 @@ public class MonitorActivity extends FragmentActivity {
{
preferences.setTimerDelay(val);
int valM = val * 1000;
- String timerText = String.format(Locale.getDefault(), "%02d:%02d",
+ String timerText = String.format(Locale.getDefault(), "%02dm %02ds",
TimeUnit.MILLISECONDS.toMinutes(valM) % 60,
TimeUnit.MILLISECONDS.toSeconds(valM) % 60);
@@ -272,18 +273,58 @@ public class MonitorActivity extends FragmentActivity {
close();
}
- private void showNumberPicker ()
+ private void showTimeDelayDialog ()
{
- final NumberPicker picker = new NumberPicker(this);
- picker.setMinValue(1);
- picker.setMaxValue(60*30);
- picker.setValue(preferences.getTimerDelay());
+ int totalSecs = preferences.getTimerDelay();
+
+ int hours = totalSecs / 3600;
+ int minutes = (totalSecs % 3600) / 60;
+ int seconds = totalSecs % 60;
+
+
+ final NumberPicker pickerMinutes = new NumberPicker(this);
+ pickerMinutes.setMinValue(0);
+ pickerMinutes.setMaxValue(59);
+ pickerMinutes.setValue(minutes);
+
+ final NumberPicker pickerSeconds = new NumberPicker(this);
+ pickerSeconds.setMinValue(0);
+ pickerSeconds.setMaxValue(59);
+ pickerSeconds.setValue(seconds);
+
+ final TextView textViewMinutes = new TextView(this);
+ textViewMinutes.setText("m");
+ textViewMinutes.setTextSize(30);
+ textViewMinutes.setGravity(Gravity.CENTER_VERTICAL);
+
+ final TextView textViewSeconds = new TextView(this);
+ textViewSeconds.setText("s");
+ textViewSeconds.setTextSize(30);
+ textViewSeconds.setGravity(Gravity.CENTER_VERTICAL);
+
+
+ final LinearLayout layout = new LinearLayout(this);
+ layout.setOrientation(LinearLayout.HORIZONTAL);
+ layout.addView(pickerMinutes, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ Gravity.LEFT));
+
+ layout.addView(textViewMinutes, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ Gravity.LEFT|Gravity.BOTTOM));
+
+ layout.addView(pickerSeconds, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ Gravity.LEFT));
+
+ layout.addView(textViewSeconds, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ Gravity.LEFT|Gravity.BOTTOM));
- final FrameLayout layout = new FrameLayout(this);
- layout.addView(picker, new FrameLayout.LayoutParams(
- FrameLayout.LayoutParams.WRAP_CONTENT,
- FrameLayout.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER));
new AlertDialog.Builder(this)
.setView(layout)
@@ -291,7 +332,8 @@ public class MonitorActivity extends FragmentActivity {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
// do something with picker.getValue()
- updateTimerValue (picker.getValue());
+ int delaySeconds = pickerSeconds.getValue() + (pickerMinutes.getValue() * 60);
+ updateTimerValue (delaySeconds);
}
})
.setNegativeButton(android.R.string.cancel, null)
diff --git a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java
index 7f55de4..607c162 100644
--- a/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/SettingsActivity.java
@@ -23,10 +23,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;
@@ -93,14 +96,12 @@ public class SettingsActivity extends AppCompatActivity {
this.findViewById(R.id.remote_access_credential);
- final ActualNumberPicker timerDelay = (ActualNumberPicker)
- this.findViewById(R.id.timer_delay);
-
smsCheck.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- if (isChecked) {
+ if (isChecked && TextUtils.isEmpty(preferences.getSignalUsername())) {
askForPermission(Manifest.permission.SEND_SMS, 6);
+ askForPermission(Manifest.permission.READ_PHONE_STATE,6);
}
}
});
@@ -146,10 +147,6 @@ public class SettingsActivity extends AppCompatActivity {
((EditText)findViewById(R.id.remote_access_credential)).setText(preferences.getRemoteAccessCredential());
}
- timerDelay.setMaxValue(600);
- timerDelay.setMinValue(0);
- timerDelay.setValue(preferences.getTimerDelay());
-
findViewById(R.id.action_register_signal).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -173,6 +170,13 @@ public class SettingsActivity extends AppCompatActivity {
}
});
+ findViewById(R.id.action_configure_time).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ showTimeDelayDialog();
+ }
+ });
+
askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);
}
@@ -236,9 +240,6 @@ public class SettingsActivity extends AppCompatActivity {
EditText phoneNumber = (EditText)
this.findViewById(R.id.phone_number);
- ActualNumberPicker timerDelay = (ActualNumberPicker)
- this.findViewById(R.id.timer_delay);
-
CheckBox smsCheck = (CheckBox) this.findViewById(R.id.sms_check);
CheckBox remoteAccessCheck = (CheckBox) this.findViewById(R.id.remote_access_check);
@@ -268,9 +269,6 @@ public class SettingsActivity extends AppCompatActivity {
app.startServer();
}
-
- preferences.setTimerDelay(timerDelay.getValue());
-
setResult(RESULT_OK);
finish();
@@ -354,6 +352,7 @@ public class SettingsActivity extends AppCompatActivity {
//number of code
final EditText input = new EditText(this);
+ input.setInputType(InputType.TYPE_CLASS_NUMBER);
// add a button
builder.setPositiveButton(R.string.verify, new DialogInterface.OnClickListener() {
@@ -370,7 +369,6 @@ public class SettingsActivity extends AppCompatActivity {
}
});
-
// create and show the alert dialog
AlertDialog dialog = builder.create();
@@ -379,6 +377,7 @@ public class SettingsActivity extends AppCompatActivity {
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT);
+ lp.setMargins(6,6,6,6);
input.setLayoutParams(lp);
dialog.setView(input); // uncomment this line
@@ -393,12 +392,18 @@ public class SettingsActivity extends AppCompatActivity {
//number of code
final EditText input = new EditText(this);
+ input.setInputType(InputType.TYPE_CLASS_PHONE);
+ input.setLines(1);
+ input.setHint(R.string.phone_hint);
// add a button
builder.setPositiveButton(R.string.register, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- preferences.setSignalUsername(input.getText().toString());
+ String signalNum = input.getText().toString();
+ signalNum = "+" + signalNum.replaceAll("[^0-9]", "");
+
+ preferences.setSignalUsername(signalNum);
resetSignal(preferences.getSignalUsername());
activateSignal(preferences.getSignalUsername(),null);
checkSignalUsername();
@@ -422,6 +427,7 @@ public class SettingsActivity extends AppCompatActivity {
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT);
+ lp.setMargins(6,6,6,6);
input.setLayoutParams(lp);
dialog.setView(input); // uncomment this line
@@ -454,6 +460,12 @@ public class SettingsActivity extends AppCompatActivity {
//number of code
final EditText input = new EditText(this);
+ input.setInputType(InputType.TYPE_CLASS_PHONE);
+
+ if (!TextUtils.isEmpty(preferences.getSmsNumber()))
+ {
+ input.setText(preferences.getSmsNumber());
+ }
// add a button
builder.setPositiveButton("Send Test", new DialogInterface.OnClickListener() {
@@ -483,10 +495,78 @@ public class SettingsActivity extends AppCompatActivity {
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT);
+ lp.setMargins(6,6,6,6);
input.setLayoutParams(lp);
dialog.setView(input); // uncomment this line
dialog.show();
}
+
+ private void showTimeDelayDialog ()
+ {
+ int totalSecs = preferences.getTimerDelay();
+
+ int hours = totalSecs / 3600;
+ int minutes = (totalSecs % 3600) / 60;
+ int seconds = totalSecs % 60;
+
+
+ final NumberPicker pickerMinutes = new NumberPicker(this);
+ pickerMinutes.setMinValue(0);
+ pickerMinutes.setMaxValue(59);
+ pickerMinutes.setValue(minutes);
+
+ final NumberPicker pickerSeconds = new NumberPicker(this);
+ pickerSeconds.setMinValue(0);
+ pickerSeconds.setMaxValue(59);
+ pickerSeconds.setValue(seconds);
+
+ final TextView textViewMinutes = new TextView(this);
+ textViewMinutes.setText("m");
+ textViewMinutes.setTextSize(30);
+ textViewMinutes.setGravity(Gravity.CENTER_VERTICAL);
+
+ final TextView textViewSeconds = new TextView(this);
+ textViewSeconds.setText("s");
+ textViewSeconds.setTextSize(30);
+ textViewSeconds.setGravity(Gravity.CENTER_VERTICAL);
+
+
+ final LinearLayout layout = new LinearLayout(this);
+ layout.setOrientation(LinearLayout.HORIZONTAL);
+ layout.addView(pickerMinutes, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ Gravity.LEFT));
+
+ layout.addView(textViewMinutes, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ Gravity.LEFT|Gravity.BOTTOM));
+
+ layout.addView(pickerSeconds, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ Gravity.LEFT));
+
+ layout.addView(textViewSeconds, new LinearLayout.LayoutParams(
+ LinearLayout.LayoutParams.WRAP_CONTENT,
+ LinearLayout.LayoutParams.MATCH_PARENT,
+ Gravity.LEFT|Gravity.BOTTOM));
+
+
+ new android.app.AlertDialog.Builder(this)
+ .setView(layout)
+ .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ // do something with picker.getValue()
+ int delaySeconds = pickerSeconds.getValue() + (pickerMinutes.getValue() * 60);
+ preferences.setTimerDelay(delaySeconds);
+ }
+ })
+ .setNegativeButton(android.R.string.cancel, null)
+ .show();
+ }
}
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
index c87599b..a428e81 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
@@ -125,9 +125,6 @@ public class MonitorService extends Service {
manager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
mPrefs = new PreferenceManager(this);
- // if (mPrefs.getRemoteAccessActive())
- // startServer();
-
startSensors();
showNotification();
@@ -154,8 +151,6 @@ public class MonitorService extends Service {
stopSensors();
stopForeground(true);
-
-
}
/**
@@ -267,52 +262,49 @@ public class MonitorService extends Service {
eventTrigger.save();
/*
- * If SMS mode is on we send an SMS alert to the specified
+ * If SMS mode is on we send an SMS or Signal alert to the specified
* number
*/
- if (isNewEvent) {
- //get the manager
-
- StringBuffer alertMessage = new StringBuffer();
- alertMessage.append(getString(R.string.intrusion_detected,eventTrigger.getStringType()));
+ StringBuffer alertMessage = new StringBuffer();
+ alertMessage.append(getString(R.string.intrusion_detected,eventTrigger.getStringType()));
- if (mPrefs.getSignalUsername() != null)
+ if (mPrefs.getSignalUsername() != null)
+ {
+ //since this is a secure channel, we can add the Onion address
+ if (mPrefs.getRemoteAccessActive() && (!TextUtils.isEmpty(mPrefs.getRemoteAccessOnion())))
{
- //since this is a secure channel, we can add the Onion address
- if (mPrefs.getRemoteAccessActive() && (!TextUtils.isEmpty(mPrefs.getRemoteAccessOnion())))
- {
- alertMessage.append(" http://").append(mPrefs.getRemoteAccessOnion())
- .append(':').append(WebServer.LOCAL_PORT);
- }
-
- SignalSender sender = SignalSender.getInstance(this,mPrefs.getSignalUsername());
- ArrayList<String> recips = new ArrayList<>();
- StringTokenizer st = new StringTokenizer(mPrefs.getSmsNumber(),",");
- while (st.hasMoreTokens())
- recips.add(st.nextToken());
-
- String attachment = null;
- if (eventTrigger.getType() == EventTrigger.CAMERA)
- {
- attachment = eventTrigger.getPath();
- }
-
- sender.sendMessage(recips,alertMessage.toString(), attachment);
+ alertMessage.append(" http://").append(mPrefs.getRemoteAccessOnion())
+ .append(':').append(WebServer.LOCAL_PORT);
}
- else if (mPrefs.getSmsActivation())
- {
- SmsManager manager = SmsManager.getDefault();
- StringTokenizer st = new StringTokenizer(mPrefs.getSmsNumber(),",");
- while (st.hasMoreTokens())
- manager.sendTextMessage(st.nextToken(), null, alertMessage.toString(), null, null);
+ SignalSender sender = SignalSender.getInstance(this,mPrefs.getSignalUsername());
+ ArrayList<String> recips = new ArrayList<>();
+ StringTokenizer st = new StringTokenizer(mPrefs.getSmsNumber(),",");
+ while (st.hasMoreTokens())
+ recips.add(st.nextToken());
+ String attachment = null;
+ if (eventTrigger.getType() == EventTrigger.CAMERA)
+ {
+ attachment = eventTrigger.getPath();
}
+ sender.sendMessage(recips,alertMessage.toString(), attachment);
+ }
+ else if (mPrefs.getSmsActivation() && isNewEvent)
+ {
+ SmsManager manager = SmsManager.getDefault();
+ StringTokenizer st = new StringTokenizer(mPrefs.getSmsNumber(),",");
+ while (st.hasMoreTokens())
+ manager.sendTextMessage(st.nextToken(), null, alertMessage.toString(), null, null);
}
+
+
+
+
}
diff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xml
index ddab0cd..01aa26f 100644
--- a/src/main/res/layout/activity_settings.xml
+++ b/src/main/res/layout/activity_settings.xml
@@ -128,24 +128,12 @@
android:layout_width="200dp"
android:layout_height="wrap_content"
/>
- <me.angrybyte.numberpicker.view.ActualNumberPicker
- android:id="@+id/timer_delay"
- android:layout_width="match_parent"
- android:layout_height="48dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:background="#FFFFFFFF"
- app:bar_color="@android:color/darker_gray"
- app:bar_width="1dp"
- app:draw_over_controls="true"
- app:max_value="100"
- app:min_value="0"
- app:show_text="true"
- app:show_bars="true"
- app:show_controls="false"
- app:show_fast_controls="false"
- app:text_color="@android:color/darker_gray"
- app:text_size="16sp" />
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/action_configure"
+ android:id="@+id/action_configure_time"
+ />
</LinearLayout>
<CheckBox
android:id="@+id/sms_check"
@@ -179,21 +167,19 @@
android:text="@string/remote_access_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
tools:context=".SettingsActivity" />
<EditText
android:id="@+id/remote_access_onion"
android:hint="@string/remote_access_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
tools:context=".SettingsActivity" />
<EditText
android:id="@+id/remote_access_credential"
android:hint="@string/remote_access_credential_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
+ android:inputType="textPassword"
tools:context=".SettingsActivity" />
<LinearLayout
android:layout_width="match_parent"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ed57043..7be1a72 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -23,7 +23,7 @@
</string>
<string name="timer_delay_label">
- Set the start delay time (seconds)
+ Set Delay Time
</string>
<string name="microphone_label">
@@ -39,11 +39,11 @@
</string>
<string name="sms_label">
- Send an text message alert when detection occurs
+ Send SMS or Signal message alert when detection occurs
</string>
<string name="sms_hint">
- Phone number(s) to send notification to
+ Phone number(s) to send notification to (SMS / Signal)
</string>
<string name="unlock_code_hint">
@@ -96,8 +96,8 @@
<string name="onboarding_action_end">Finish</string>
<string name="remote_access_label">Enable remote access via Tor Onion Service</string>
- <string name="remote_access_hint">(onion service address will be displayed here)</string>
- <string name="remote_access_credential_hint">Set remote access password here</string>
+ <string name="remote_access_hint">Onion service address from Orbot</string>
+ <string name="remote_access_credential_hint">Set remote password</string>
<string name="camera_front">Front</string>
<string name="camera_back">Back</string>
<string name="camera_none">None</string>
@@ -137,4 +137,5 @@
<string name="cancel">Cancel</string>
<string name="register_title">Register with Signal</string>
<string name="register_signal_desc">Register a new phone number (+12125551212) with Signal to send secure notifications. DO NOT USE YOUR EXISTING/PRIMARY SIGNAL NUMBER.</string>
+ <string name="phone_hint">+12125551212</string>
</resources>
\ No newline at end of file