make sure audio file is done recording before sending

guardianproject · Dec 13, 2017 · 294c75b · 294c75b
1 parent e9c4f21
commit 294c75b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git 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 void onSignalReceived(short[] signal) {
             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.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,11 +119,18 @@ public void run() {
 
         MicrophoneTaskFactory.restartSampling();
 
+        if (mListener != null)
+        	mListener.recordingComplete(audioPath.toString());
+
 	}
 
 	public String getAudioFilePath ()
 	{
 		return audioPath.toString();
 	}
 
+	public void setAudioRecorderListener (AudioRecorderListener listener)
+	{
+		mListener = listener;
+	}
 }