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

fixes for repackaging

n8fr8e1208b488161
diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
index 1072768..dd10926 100644
--- a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java
@@ -6,7 +6,6 @@
package info.guardianproject.phoneypot;
-import me.ziccard.phoneypot.service.MonitorService;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
@@ -19,6 +18,8 @@ import android.view.MenuItem;
import android.widget.EditText;
import android.widget.Toast;
+import info.guardianproject.phoneypot.service.MonitorService;
+
public class MonitorActivity extends FragmentActivity {
private SecureItPreferences preferences = null;
diff --git a/src/main/java/info/guardianproject/phoneypot/Preview.java b/src/main/java/info/guardianproject/phoneypot/Preview.java
index f899c4d..c4812fd 100644
--- a/src/main/java/info/guardianproject/phoneypot/Preview.java
+++ b/src/main/java/info/guardianproject/phoneypot/Preview.java
@@ -13,10 +13,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import me.ziccard.phoneypot.async.MotionAsyncTask;
-import me.ziccard.phoneypot.async.MotionAsyncTask.MotionListener;
-import me.ziccard.phoneypot.motiondetection.LuminanceMotionDetector;
-import me.ziccard.phoneypot.service.MonitorService;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -41,6 +37,10 @@ import android.view.Surface;
import android.view.WindowManager;
import android.widget.Toast;
+import info.guardianproject.phoneypot.async.MotionAsyncTask;
+import info.guardianproject.phoneypot.motiondetection.LuminanceMotionDetector;
+import info.guardianproject.phoneypot.service.MonitorService;
+
public class Preview extends SurfaceView implements SurfaceHolder.Callback {
/**
@@ -49,7 +49,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
private SecureItPreferences prefs;
private int cameraFacing = 0;
- private List<MotionListener> listeners = new ArrayList<MotionListener>();
+ private List<MotionAsyncTask.MotionListener> listeners = new ArrayList<MotionAsyncTask.MotionListener>();
/**
* Timestamp of the last picture processed
@@ -128,7 +128,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
}
}
- public void addListener(MotionListener listener) {
+ public void addListener(MotionAsyncTask.MotionListener listener) {
listeners.add(listener);
}
@@ -248,12 +248,12 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {
size.height,
updateHandler,
motionSensitivity);
- for (MotionListener listener : listeners) {
+ for (MotionAsyncTask.MotionListener listener : listeners) {
Log.i("Preview", "Added listener");
task.addListener(listener);
}
doingProcessing = true;
- task.addListener(new MotionListener() {
+ task.addListener(new MotionAsyncTask.MotionListener() {
public void onProcess(Bitmap oldBitmap, Bitmap newBitmap,
boolean motionDetected) {
diff --git a/src/main/java/info/guardianproject/phoneypot/async/AudioRecorderTask.java b/src/main/java/info/guardianproject/phoneypot/async/AudioRecorderTask.java
index c395f91..6e71dde 100644
--- a/src/main/java/info/guardianproject/phoneypot/async/AudioRecorderTask.java
+++ b/src/main/java/info/guardianproject/phoneypot/async/AudioRecorderTask.java
@@ -7,7 +7,6 @@
package info.guardianproject.phoneypot.async;
-import me.ziccard.phoneypot.SecureItPreferences;
import android.content.ContentValues;
import android.content.Context;
import android.media.MediaRecorder;
@@ -15,6 +14,8 @@ import android.os.Environment;
import android.provider.MediaStore;
import android.util.Log;
+import info.guardianproject.phoneypot.SecureItPreferences;
+
public class AudioRecorderTask extends Thread {
/**
diff --git a/src/main/java/info/guardianproject/phoneypot/async/MicSamplerTask.java b/src/main/java/info/guardianproject/phoneypot/async/MicSamplerTask.java
index cf097c0..2e1955b 100644
--- a/src/main/java/info/guardianproject/phoneypot/async/MicSamplerTask.java
+++ b/src/main/java/info/guardianproject/phoneypot/async/MicSamplerTask.java
@@ -9,10 +9,11 @@ package info.guardianproject.phoneypot.async;
import java.io.IOException;
-import me.ziccard.phoneypot.codec.AudioCodec;
import android.os.AsyncTask;
import android.util.Log;
+import info.guardianproject.phoneypot.codec.AudioCodec;
+
public class MicSamplerTask extends AsyncTask<Void,Object,Void> {
private MicListener listener = null;
diff --git a/src/main/java/info/guardianproject/phoneypot/async/MotionAsyncTask.java b/src/main/java/info/guardianproject/phoneypot/async/MotionAsyncTask.java
index ddfb796..1c12f89 100644
--- a/src/main/java/info/guardianproject/phoneypot/async/MotionAsyncTask.java
+++ b/src/main/java/info/guardianproject/phoneypot/async/MotionAsyncTask.java
@@ -10,15 +10,15 @@ package info.guardianproject.phoneypot.async;
import java.util.ArrayList;
import java.util.List;
-import me.ziccard.phoneypot.codec.ImageCodec;
-import me.ziccard.phoneypot.motiondetection.IMotionDetector;
-import me.ziccard.phoneypot.motiondetection.LuminanceMotionDetector;
-
import android.graphics.Bitmap;
import android.graphics.Color;
import android.os.Handler;
import android.util.Log;
+import info.guardianproject.phoneypot.codec.ImageCodec;
+import info.guardianproject.phoneypot.motiondetection.IMotionDetector;
+import info.guardianproject.phoneypot.motiondetection.LuminanceMotionDetector;
+
/**
* Task doing all image processing in backgrounds,
* has a collection of listeners to notify in after having processed
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
index ea8ca30..0f75bfc 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
@@ -5,9 +5,6 @@
package info.guardianproject.phoneypot.service;
-import me.ziccard.phoneypot.MonitorActivity;
-import me.ziccard.phoneypot.R;
-import me.ziccard.phoneypot.SecureItPreferences;
import android.annotation.SuppressLint;
import android.app.Notification;
@@ -23,6 +20,10 @@ import android.os.Messenger;
import android.telephony.SmsManager;
import android.widget.Toast;
+import info.guardianproject.phoneypot.MonitorActivity;
+import info.guardianproject.phoneypot.R;
+import info.guardianproject.phoneypot.SecureItPreferences;
+
@SuppressLint("HandlerLeak")
public class MonitorService extends Service {