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

change how the service is triggered - also add new notification icon

n8fr81e5bf0206d33
diff --git a/src/main/java/info/guardianproject/phoneypot/StartActivity.java b/src/main/java/info/guardianproject/phoneypot/StartActivity.java
index a62413d..d242013 100644
--- a/src/main/java/info/guardianproject/phoneypot/StartActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/StartActivity.java
@@ -22,6 +22,8 @@ import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.text.InputType;
import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
@@ -82,9 +84,6 @@ public class StartActivity extends Activity {
final EditText phoneNumber = (EditText)
this.findViewById(R.id.phone_number);
- final Button startButton = (Button) this.findViewById(R.id.start_button);
-
-
smsCheck.setOnCheckedChangeListener(new OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -93,58 +92,7 @@ public class StartActivity extends Activity {
}
}
});
-
- startButton.setOnClickListener(new View.OnClickListener() {
-
- public void onClick(View v) {
-
- preferences.activateAccelerometer(true);
- preferences.setAccelerometerSensitivity(
- (String)accelerometerSensitivity.getSelectedItem());
-
- preferences.activateCamera(true);
- preferences.setCamera(
- (String)selectCameraSpinner.getSelectedItem());
- preferences.setCameraSensitivity(
- (String)cameraSensitivity.getSelectedItem());
-
-
- preferences.activateMicrophone(true);
- preferences.setMicrophoneSensitivity(
- (String)microphoneSensitivity.getSelectedItem());
-
- if (smsCheck.isChecked() && !phoneNumber.getText().toString().equals("")) {
- Log.i("StartActivity", "Send message alert is active");
- preferences.activateSms(true);
- preferences.setSmsNumber(
- phoneNumber.getText().toString());
- } else {
- preferences.activateSms(false);
- }
-
- AlertDialog.Builder alert = new AlertDialog.Builder(StartActivity.this);
- final EditText input = new EditText(StartActivity.this);
- input.setInputType(InputType.TYPE_CLASS_NUMBER);
- input.setRawInputType(Configuration.KEYBOARD_12KEY);
- alert.setView(input);
- alert.setTitle(R.string.unlock_title);
- alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {
-
- preferences.setUnlockCode(input.getText().toString());
- startMonitoring();
- }
- });
- alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {
-
-
- }
- });
- alert.show();
- }
- });
-
+
/**
* Loads preferences and sets view
*/
@@ -225,6 +173,67 @@ public class StartActivity extends Activity {
}
private void startMonitoring ()
+ {
+
+ Spinner accelerometerSensitivity = (Spinner)
+ this.findViewById(R.id.accelerometer_sensitivity_spinner);
+ Spinner cameraSensitivity = (Spinner)
+ this.findViewById(R.id.camera_sensitivity_spinner);
+ Spinner microphoneSensitivity = (Spinner)
+ this.findViewById(R.id.microphone_sensitivity_spinner);
+
+ EditText phoneNumber = (EditText)
+ this.findViewById(R.id.phone_number);
+
+ Spinner selectCameraSpinner = (Spinner) this.findViewById(R.id.camera_spinner);
+ CheckBox smsCheck = (CheckBox) this.findViewById(R.id.sms_check);
+
+
+ preferences.activateAccelerometer(true);
+ preferences.setAccelerometerSensitivity(
+ (String)accelerometerSensitivity.getSelectedItem());
+
+ preferences.activateCamera(true);
+ preferences.setCamera(
+ (String)selectCameraSpinner.getSelectedItem());
+ preferences.setCameraSensitivity(
+ (String)cameraSensitivity.getSelectedItem());
+
+
+ preferences.activateMicrophone(true);
+ preferences.setMicrophoneSensitivity(
+ (String)microphoneSensitivity.getSelectedItem());
+
+ if (smsCheck.isChecked() && !phoneNumber.getText().toString().equals("")) {
+ Log.i("StartActivity", "Send message alert is active");
+ preferences.activateSms(true);
+ preferences.setSmsNumber(
+ phoneNumber.getText().toString());
+ } else {
+ preferences.activateSms(false);
+ }
+
+ AlertDialog.Builder alert = new AlertDialog.Builder(StartActivity.this);
+ final EditText input = new EditText(StartActivity.this);
+ input.setInputType(InputType.TYPE_CLASS_NUMBER);
+ input.setRawInputType(Configuration.KEYBOARD_12KEY);
+ alert.setView(input);
+ alert.setTitle(R.string.unlock_title);
+ alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int whichButton) {
+ preferences.setUnlockCode(input.getText().toString());
+ launchMonitoringMode();
+ }
+ });
+ alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int whichButton) {
+
+
+ }
+ });
+ alert.show();
+ }
+ private void launchMonitoringMode ()
{
Intent intent = new Intent(
@@ -234,4 +243,21 @@ public class StartActivity extends Activity {
StartActivity.this.startActivity(intent);
}
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.monitor_start, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected (MenuItem item) {
+ switch (item.getItemId()){
+ case R.id.menu_start:
+ startMonitoring();
+ break;
+ }
+ return true;
+ }
+
}
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
index a4d7100..4449ac0 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
@@ -11,12 +11,14 @@ import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
+import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
import android.os.Messenger;
+import android.support.v4.app.NotificationCompat;
import android.telephony.SmsManager;
import android.widget.Toast;
@@ -26,13 +28,7 @@ import info.guardianproject.phoneypot.PreferenceManager;
@SuppressLint("HandlerLeak")
public class MonitorService extends Service {
-
- /**
- * Task used to upload position, is periodic, when we close the app
- * we need to stop the service and that task
- */
- private AsyncTask<Void, Void, Void> positionTask = null;
-
+
/**
* To show a notification on service start
*/
@@ -62,7 +58,13 @@ public class MonitorService extends Service {
* Object used to retrieve shared preferences
*/
private PreferenceManager prefs = null;
-
+
+
+ /**
+ * Incrementing alert id
+ */
+ int mNotificationAlertId = 7007;
+
/**
* Handler for incoming messages
*/
@@ -87,7 +89,6 @@ public class MonitorService extends Service {
prefs = new PreferenceManager(this);
-
showNotification();
}
@@ -97,14 +98,10 @@ public class MonitorService extends Service {
*/
@Override
public void onDestroy() {
- // Cancel the persistent notification.
- manager.cancel(R.string.secure_service_started);
- if (positionTask!=null && !positionTask.isCancelled()) {
- positionTask.cancel(true);
- }
-
- // Tell the user we stopped.
- Toast.makeText(this, R.string.secure_service_stopped, Toast.LENGTH_SHORT).show();
+
+ stopForeground(true);
+
+
}
/**
@@ -128,24 +125,29 @@ public class MonitorService extends Service {
toLaunch.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT
|Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
- |Intent.FLAG_ACTIVITY_NEW_TASK);
-
+ |Intent.FLAG_ACTIVITY_NEW_TASK);
+ PendingIntent resultPendingIntent =
+ PendingIntent.getActivity(
+ this,
+ 0,
+ toLaunch,
+ PendingIntent.FLAG_UPDATE_CURRENT
+ );
// In this sample, we'll use the same text for the ticker and the expanded notification
CharSequence text = getText(R.string.secure_service_started);
-
- Notification notification = new Notification(R.drawable.ic_launcher, text,
- System.currentTimeMillis());
- // The PendingIntent to launch our activity if the user selects this notification
- PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
- toLaunch, PendingIntent.FLAG_UPDATE_CURRENT);
-
-// notification.setLatestEventInfo(this, "SecureService",
- // text, contentIntent);
+ NotificationCompat.Builder mBuilder =
+ new NotificationCompat.Builder(this)
+ .setSmallIcon(R.drawable.ic_phone_alert)
+ .setContentTitle(getString(R.string.app_name))
+ .setContentText(text);
+
+
+ mBuilder.setContentIntent(resultPendingIntent);
+
+ startForeground(0, mBuilder.build());
+
- // Send the notification.
- // We use a string id because it is a unique number. We use it later to cancel.
- manager.notify(R.string.secure_service_started, notification);
}
/**
@@ -174,5 +176,35 @@ public class MonitorService extends Service {
manager.sendTextMessage(prefs.getSmsNumber(), null, prefs.getSMSText(), null, null);
}
- }
+
+ showNotificationAlert("Got alert type: " + alertType);
+ }
+
+ private void showNotificationAlert (String message)
+ {
+
+ NotificationCompat.Builder mBuilder =
+ new NotificationCompat.Builder(this)
+ .setSmallIcon(R.drawable.ic_phone_alert)
+ .setContentTitle(getString(R.string.app_name))
+ .setContentText(message);
+
+ Intent resultIntent = new Intent(this, MonitorActivity.class);
+
+// Because clicking the notification opens a new ("special") activity, there's
+// no need to create an artificial back stack.
+ PendingIntent resultPendingIntent =
+ PendingIntent.getActivity(
+ this,
+ 0,
+ resultIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT
+ );
+
+ mBuilder.setContentIntent(resultPendingIntent);
+
+ manager.notify(mNotificationAlertId, mBuilder.build());
+
+
+ }
}
diff --git a/src/main/res/drawable-hdpi-v11/ic_phone_alert.png b/src/main/res/drawable-hdpi-v11/ic_phone_alert.png
new file mode 100644
index 0000000..395a6f6
Binary files /dev/null and b/src/main/res/drawable-hdpi-v11/ic_phone_alert.png differ
diff --git a/src/main/res/drawable-hdpi/ic_phone_alert.png b/src/main/res/drawable-hdpi/ic_phone_alert.png
new file mode 100644
index 0000000..4763bed
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_phone_alert.png differ
diff --git a/src/main/res/drawable-mdpi-v11/ic_phone_alert.png b/src/main/res/drawable-mdpi-v11/ic_phone_alert.png
new file mode 100644
index 0000000..a1a1e8a
Binary files /dev/null and b/src/main/res/drawable-mdpi-v11/ic_phone_alert.png differ
diff --git a/src/main/res/drawable-mdpi/ic_phone_alert.png b/src/main/res/drawable-mdpi/ic_phone_alert.png
new file mode 100644
index 0000000..40e4a8f
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_phone_alert.png differ
diff --git a/src/main/res/drawable-xhdpi-v11/ic_phone_alert.png b/src/main/res/drawable-xhdpi-v11/ic_phone_alert.png
new file mode 100644
index 0000000..2de3920
Binary files /dev/null and b/src/main/res/drawable-xhdpi-v11/ic_phone_alert.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_phone_alert.png b/src/main/res/drawable-xhdpi/ic_phone_alert.png
new file mode 100644
index 0000000..d0f11d2
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_phone_alert.png differ
diff --git a/src/main/res/drawable-xxhdpi-v11/ic_phone_alert.png b/src/main/res/drawable-xxhdpi-v11/ic_phone_alert.png
new file mode 100644
index 0000000..2939595
Binary files /dev/null and b/src/main/res/drawable-xxhdpi-v11/ic_phone_alert.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_phone_alert.png b/src/main/res/drawable-xxhdpi/ic_phone_alert.png
new file mode 100644
index 0000000..a10e156
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_phone_alert.png differ
diff --git a/src/main/res/drawable-xxxhdpi-v11/ic_phone_alert.png b/src/main/res/drawable-xxxhdpi-v11/ic_phone_alert.png
new file mode 100644
index 0000000..6b81e44
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi-v11/ic_phone_alert.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_phone_alert.png b/src/main/res/drawable-xxxhdpi/ic_phone_alert.png
new file mode 100644
index 0000000..a2cb27c
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_phone_alert.png differ
diff --git a/src/main/res/layout/activity_start.xml b/src/main/res/layout/activity_start.xml
index 3f21d45..41c223c 100644
--- a/src/main/res/layout/activity_start.xml
+++ b/src/main/res/layout/activity_start.xml
@@ -105,12 +105,5 @@
- <Button
- android:id="@+id/start_button"
- android:text="@string/start_button"
- android:layout_width="200dp"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"/>
-
</LinearLayout>
</ScrollView>
\ No newline at end of file
diff --git a/src/main/res/menu/monitor_start.xml b/src/main/res/menu/monitor_start.xml
new file mode 100644
index 0000000..d1bfef5
--- /dev/null
+++ b/src/main/res/menu/monitor_start.xml
@@ -0,0 +1,6 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/menu_start"
+ android:title="@string/menu_start"
+ android:orderInCategory="100"
+ android:showAsAction="always|withText" />
+</menu>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 790466d..4659b8d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -2,7 +2,10 @@
<string name="app_name">PhoneyPot</string>
- <string name="menu_stop">Stop</string>
+ <string name="menu_stop">STOP</string>
+
+ <string name="menu_start">START</string>
+
<string name="title_activity_start">PhoneyPot</string>