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

changes to permissions and preference management

n8fr837d7d3c772e9
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 561d983..db7a33f 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -4,11 +4,9 @@
android:versionName="1.0" >
<uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.SEND_SMS" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
index dd10926..690ebce 100644
--- a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
@@ -22,7 +22,7 @@ import info.guardianproject.phoneypot.service.MonitorService;
public class MonitorActivity extends FragmentActivity {
- private SecureItPreferences preferences = null;
+ private PreferenceManager preferences = null;
private static final String[] CONTENT = new String[] { "Accel.", "Camera",
"Mic."};
@@ -30,7 +30,7 @@ public class MonitorActivity extends FragmentActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- preferences = new SecureItPreferences(getApplicationContext());
+ preferences = new PreferenceManager(getApplicationContext());
setContentView(R.layout.layout_running);
diff --git a/src/main/java/info/guardianproject/phoneypot/SecureItPreferences.java b/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java
similarity index 97%
rename from src/main/java/info/guardianproject/phoneypot/SecureItPreferences.java
rename to src/main/java/info/guardianproject/phoneypot/PreferenceManager.java
index f1b5755..09486a0 100644
--- a/src/main/java/info/guardianproject/phoneypot/SecureItPreferences.java
+++ b/src/main/java/info/guardianproject/phoneypot/PreferenceManager.java
@@ -12,7 +12,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
-public class SecureItPreferences {
+public class PreferenceManager {
private SharedPreferences appSharedPrefs;
private Editor prefsEditor;
@@ -46,7 +46,7 @@ public class SecureItPreferences {
private Context context;
- public SecureItPreferences(Context context) {
+ public PreferenceManager(Context context) {
this.context = context;
this.appSharedPrefs = context.getSharedPreferences(APP_SHARED_PREFS, Activity.MODE_PRIVATE);
this.prefsEditor = appSharedPrefs.edit();
@@ -130,7 +130,7 @@ public class SecureItPreferences {
}
public boolean getSmsActivation() {
- return appSharedPrefs.getBoolean(SMS_ACTIVE, true);
+ return appSharedPrefs.getBoolean(SMS_ACTIVE, false);
}
public void setSmsNumber(String number) {
diff --git a/src/main/java/info/guardianproject/phoneypot/Preview.java b/src/main/java/info/guardianproject/phoneypot/Preview.java
index c4812fd..bc0a6a4 100644
--- a/src/main/java/info/guardianproject/phoneypot/Preview.java
+++ b/src/main/java/info/guardianproject/phoneypot/Preview.java
@@ -46,7 +46,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
/**
* Object to retrieve and set shared preferences
*/
- private SecureItPreferences prefs;
+ private PreferenceManager prefs;
private int cameraFacing = 0;
private List<MotionAsyncTask.MotionListener> listeners = new ArrayList<MotionAsyncTask.MotionListener>();
@@ -111,7 +111,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
// underlying surface is created and destroyed.
mHolder = getHolder();
mHolder.addCallback(this);
- prefs = new SecureItPreferences(context);
+ prefs = new PreferenceManager(context);
/*
* Set sensitivity value
diff --git a/src/main/java/info/guardianproject/phoneypot/StartActivity.java b/src/main/java/info/guardianproject/phoneypot/StartActivity.java
index 92521f9..a62413d 100644
--- a/src/main/java/info/guardianproject/phoneypot/StartActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/StartActivity.java
@@ -32,14 +32,14 @@ import android.widget.Spinner;
public class StartActivity extends Activity {
- private SecureItPreferences preferences = null;
+ private PreferenceManager preferences = null;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_start);
- preferences = new SecureItPreferences(this.getApplicationContext());
+ preferences = new PreferenceManager(this.getApplicationContext());
/*
* We create an application directory to store images and audio
@@ -150,34 +150,34 @@ public class StartActivity extends Activity {
*/
if (preferences.getAccelerometerActivation()) {
String sensitivity = preferences.getAccelerometerSensitivity();
- if (sensitivity.equals(SecureItPreferences.LOW))
+ if (sensitivity.equals(PreferenceManager.LOW))
accelerometerSensitivity.setSelection(0);
- else if (sensitivity.equals(SecureItPreferences.MEDIUM))
+ else if (sensitivity.equals(PreferenceManager.MEDIUM))
accelerometerSensitivity.setSelection(1);
- else if (sensitivity.equals(SecureItPreferences.HIGH))
+ else if (sensitivity.equals(PreferenceManager.HIGH))
accelerometerSensitivity.setSelection(2);
}
if (preferences.getCameraActivation()) {
String sensitivity = preferences.getCameraSensitivity();
- if (sensitivity.equals(SecureItPreferences.LOW))
+ if (sensitivity.equals(PreferenceManager.LOW))
cameraSensitivity.setSelection(0);
- else if (sensitivity.equals(SecureItPreferences.MEDIUM))
+ else if (sensitivity.equals(PreferenceManager.MEDIUM))
cameraSensitivity.setSelection(1);
- else if (sensitivity.equals(SecureItPreferences.HIGH))
+ else if (sensitivity.equals(PreferenceManager.HIGH))
cameraSensitivity.setSelection(2);
String camera = preferences.getCamera();
- if (camera.equals(SecureItPreferences.FRONT))
+ if (camera.equals(PreferenceManager.FRONT))
selectCameraSpinner.setSelection(0);
else
selectCameraSpinner.setSelection(1);
}
if (preferences.getMicrophoneActivation()) {
String sensitivity = preferences.getMicrophoneSensitivity();
- if (sensitivity.equals(SecureItPreferences.LOW))
+ if (sensitivity.equals(PreferenceManager.LOW))
microphoneSensitivity.setSelection(0);
- else if (sensitivity.equals(SecureItPreferences.MEDIUM))
+ else if (sensitivity.equals(PreferenceManager.MEDIUM))
microphoneSensitivity.setSelection(1);
- else if (sensitivity.equals(SecureItPreferences.HIGH))
+ else if (sensitivity.equals(PreferenceManager.HIGH))
microphoneSensitivity.setSelection(2);
}
if (preferences.getSmsActivation()) {
@@ -185,7 +185,7 @@ public class StartActivity extends Activity {
phoneNumber.setText(preferences.getSmsNumber());
}
- askForPermission(Manifest.permission.ACCESS_FINE_LOCATION, 1);
+ askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, 1);
}
@@ -194,28 +194,13 @@ public class StartActivity extends Activity {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
switch (requestCode) {
- //Location
- case 1:
- askForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE,2);
- break;
- case 2:
- askForPermission(Manifest.permission.CAMERA,3);
-
- break;
- case 3:
- askForPermission(Manifest.permission.BLUETOOTH_ADMIN,4);
-
+ case 1:
+ askForPermission(Manifest.permission.CAMERA,2);
break;
- //Call
- case 4:
- askForPermission(Manifest.permission.ACCESS_NETWORK_STATE,5);
-
+ case 2:
+ askForPermission(Manifest.permission.RECORD_AUDIO,3);
break;
- case 5:
- askForPermission(Manifest.permission.SEND_SMS,6);
-
- break;
}
}
diff --git a/src/main/java/info/guardianproject/phoneypot/async/AudioRecorderTask.java b/src/main/java/info/guardianproject/phoneypot/async/AudioRecorderTask.java
index 6e71dde..d362913 100644
--- a/src/main/java/info/guardianproject/phoneypot/async/AudioRecorderTask.java
+++ b/src/main/java/info/guardianproject/phoneypot/async/AudioRecorderTask.java
@@ -14,7 +14,7 @@ import android.os.Environment;
import android.provider.MediaStore;
import android.util.Log;
-import info.guardianproject.phoneypot.SecureItPreferences;
+import info.guardianproject.phoneypot.PreferenceManager;
public class AudioRecorderTask extends Thread {
@@ -27,7 +27,7 @@ public class AudioRecorderTask extends Thread {
/**
* Shared preferences of the application
*/
- private SecureItPreferences prefs;
+ private PreferenceManager prefs;
/**
* Name of the audio file to store
@@ -63,7 +63,7 @@ public class AudioRecorderTask extends Thread {
protected AudioRecorderTask(Context context) {
super();
this.context = context;
- this.prefs = new SecureItPreferences(context);
+ this.prefs = new PreferenceManager(context);
this.filename = prefs.getAudioPath();
this.phoneId = prefs.getPhoneId();
this.accessToken = prefs.getAccessToken();
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
index 0f75bfc..a4d7100 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
@@ -22,7 +22,7 @@ import android.widget.Toast;
import info.guardianproject.phoneypot.MonitorActivity;
import info.guardianproject.phoneypot.R;
-import info.guardianproject.phoneypot.SecureItPreferences;
+import info.guardianproject.phoneypot.PreferenceManager;
@SuppressLint("HandlerLeak")
public class MonitorService extends Service {
@@ -61,7 +61,7 @@ public class MonitorService extends Service {
/**
* Object used to retrieve shared preferences
*/
- private SecureItPreferences prefs = null;
+ private PreferenceManager prefs = null;
/**
* Handler for incoming messages
@@ -84,7 +84,7 @@ public class MonitorService extends Service {
@Override
public void onCreate() {
manager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
- prefs = new SecureItPreferences(this);
+ prefs = new PreferenceManager(this);