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
make sure audio file is done recording before sending
n8fr8294c75b48d15
diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java b/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.javaindex 8251594..3d54626 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java+++ b/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java@@ -134,17 +134,24 @@ public final class MicrophoneMonitor implements MicSamplerTask.MicListener {if (!MicrophoneTaskFactory.isRecording()) {try {AudioRecorderTask audioRecorderTask = MicrophoneTaskFactory.makeRecorder(context);+ audioRecorderTask.setAudioRecorderListener(new AudioRecorderTask.AudioRecorderListener() {+ @Override+ public void recordingComplete(String path) {++ Message message = new Message();+ message.what = EventTrigger.MICROPHONE;+ message.getData().putString("path",path);+ try {+ if (serviceMessenger != null)+ serviceMessenger.send(message);+ } catch (RemoteException e) {+ // Cannot happen+ }+ }+ });audioRecorderTask.start();- Message message = new Message();- message.what = EventTrigger.MICROPHONE;- message.getData().putString("path",audioRecorderTask.getAudioFilePath());- try {- if (serviceMessenger != null)- serviceMessenger.send(message);- } catch (RemoteException e) {- // Cannot happen- }+} catch (MicrophoneTaskFactory.RecordLimitExceeded rle) {Log.w("MicrophoneMonitor", "We are already recording!");}diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java b/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.javaindex 4ec9634..3eaf6ef 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java+++ b/src/main/java/info/guardianproject/phoneypot/sensors/media/AudioRecorderTask.java@@ -51,7 +51,14 @@ public class AudioRecorderTask extends Thread {public boolean isRecording() {return recording;}-++ private AudioRecorderListener mListener;++ public interface AudioRecorderListener+ {+ public void recordingComplete (String path);+ }+/*** We make recorder protected in order to forse* Factory usage@@ -112,6 +119,9 @@ public class AudioRecorderTask extends Thread {MicrophoneTaskFactory.restartSampling();+ if (mListener != null)+ mListener.recordingComplete(audioPath.toString());+}public String getAudioFilePath ()@@ -119,4 +129,8 @@ public class AudioRecorderTask extends Thread {return audioPath.toString();}+ public void setAudioRecorderListener (AudioRecorderListener listener)+ {+ mListener = listener;+ }}