fixed issue 17

app/app.iml

@@ -22,7 +22,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
@@ -62,59 +62,46 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="floatingactionbutton-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="library-1.0.6" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.googlecode.mp4parser:isoparser:1.1.21@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.jpardogo.materialtabstrip:library-1.0.6" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:recyclerview-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:cardview-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.nineoldandroids:library:2.4.0@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.melnykov:floatingactionbutton-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:21.0.3@jar" level="project" />
   </component>
 </module>

app/build.gradle

@@ -28,4 +28,5 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:21.0.+'
     compile 'com.melnykov:floatingactionbutton:1.1.0'
     compile 'com.jpardogo.materialtabstrip:library:1.0.6'
+    compile 'com.googlecode.mp4parser:isoparser:1.1.21'
 }

app/src/main/java/com/danielkim/soundrecorder/RecordingService.java

@@ -6,20 +6,31 @@
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.media.MediaRecorder;
+import android.os.Binder;
 import android.os.Environment;
 import android.os.IBinder;
-import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.coremedia.iso.boxes.Container;
 import com.danielkim.soundrecorder.activities.MainActivity;
+import com.googlecode.mp4parser.FileDataSourceImpl;
+import com.googlecode.mp4parser.authoring.Movie;
+import com.googlecode.mp4parser.authoring.Track;
+import com.googlecode.mp4parser.authoring.builder.DefaultMp4Builder;
+import com.googlecode.mp4parser.authoring.container.mp4.MovieCreator;
+import com.googlecode.mp4parser.authoring.tracks.AppendTrack;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.channels.FileChannel;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -47,9 +58,20 @@ public class RecordingService extends Service {
     private Timer mTimer = null;
     private TimerTask mIncrementTimerTask = null;
 
+    private boolean isFilePathTemp = true;
+    private boolean isPaused;
+    private int tempFileCount = 0;
+
+    private ArrayList<String> filesPaused = new ArrayList<>();
+    private ArrayList<Long> pauseDurations= new ArrayList<>();
+
+    // Binder given to clients
+    private final IBinder mBinder = new LocalBinder();
+
+
     @Override
     public IBinder onBind(Intent intent) {
-        return null;
+        return mBinder;
     }
 
     public interface OnTimerChangedListener {
@@ -77,7 +99,32 @@ public void onDestroy() {
         super.onDestroy();
     }
 
+  public void setFileNameAndPath() {
+    if (isFilePathTemp) {
+      mFileName = getString(R.string.default_file_name) + (++tempFileCount )+ "_" + ".tmp";
+      mFilePath = Environment.getExternalStorageDirectory().getAbsolutePath();
+      mFilePath += "/SoundRecorder/" + mFileName;
+    } else {
+      int count = 0;
+      File f;
+
+      do {
+        count++;
+
+        mFileName =
+            getString(R.string.default_file_name) + "_" + (mDatabase.getCount() + count) + ".mp4";
+
+        mFilePath = Environment.getExternalStorageDirectory().getAbsolutePath();
+        mFilePath += "/SoundRecorder/" + mFileName;
+
+        f = new File(mFilePath);
+      } while (f.exists() && !f.isDirectory());
+    }
+  }
+
     public void startRecording() {
+        isPaused = false;
+        isFilePathTemp=true;
         setFileNameAndPath();
 
         mRecorder = new MediaRecorder();
@@ -104,35 +151,50 @@ public void startRecording() {
         }
     }
 
-    public void setFileNameAndPath(){
-        int count = 0;
-        File f;
-
-        do{
-            count++;
+    public void pauseRecording(){
+        isPaused = true;
+        mRecorder.stop();
+        mElapsedMillis = (System.currentTimeMillis() - mStartingTimeMillis);
+        pauseDurations.add(mElapsedMillis);
+        Toast.makeText(this, getString(R.string.toast_recording_paused), Toast.LENGTH_LONG).show();
 
-            mFileName = getString(R.string.default_file_name)
-                    + "_" + (mDatabase.getCount() + count) + ".mp4";
-            mFilePath = Environment.getExternalStorageDirectory().getAbsolutePath();
-            mFilePath += "/SoundRecorder/" + mFileName;
+        //remove notification
+        if (mIncrementTimerTask != null) {
+            mIncrementTimerTask.cancel();
+            mIncrementTimerTask = null;
+        }
+        filesPaused.add(mFilePath);
 
-            f = new File(mFilePath);
-        }while (f.exists() && !f.isDirectory());
     }
 
     public void stopRecording() {
-        mRecorder.stop();
-        mElapsedMillis = (System.currentTimeMillis() - mStartingTimeMillis);
+        if(!isPaused)
+            filesPaused.add(mFilePath);
+
+        isFilePathTemp =false;
+        setFileNameAndPath();
+
+        if (!isPaused) {
+            mRecorder.stop();
+            mElapsedMillis = (System.currentTimeMillis() - mStartingTimeMillis);
+        }
         mRecorder.release();
         Toast.makeText(this, getString(R.string.toast_recording_finish) + " " + mFilePath, Toast.LENGTH_LONG).show();
 
+        isPaused = false;
         //remove notification
         if (mIncrementTimerTask != null) {
             mIncrementTimerTask.cancel();
             mIncrementTimerTask = null;
         }
 
         mRecorder = null;
+        if (filesPaused != null && !filesPaused.isEmpty()) {
+            if (makeSingleFile(filesPaused)) {
+                for (long duration : pauseDurations)
+                    mElapsedMillis += duration;
+            }
+        }
 
         try {
             mDatabase.addRecording(mFileName, mFilePath, mElapsedMillis);
@@ -142,6 +204,56 @@ public void stopRecording() {
         }
     }
 
+    /**
+     * collect temp generated files because of pause to one target file
+     * @param filesPaused contains all temp files due to pause
+     */
+    private boolean makeSingleFile(ArrayList<String> filesPaused) {
+        ArrayList<Track> tracks =new ArrayList<>();
+        Movie finalMovie =new Movie();
+        for (String filePath : filesPaused) {
+            try {
+                 Movie movie = MovieCreator.build(new FileDataSourceImpl(filePath));
+                 List<Track> movieTracks = movie.getTracks();
+                tracks.addAll(movieTracks);
+            } catch (IOException e) {
+                e.printStackTrace();
+                return false;
+            }
+        }
+
+        if (tracks.size() > 0) {
+            try {
+                finalMovie.addTrack(new AppendTrack(tracks.toArray(new Track[tracks.size()])));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        Container mp4file = new DefaultMp4Builder().build(finalMovie);
+        FileChannel fc = null;
+        try {
+            fc = new FileOutputStream(new File(mFilePath)).getChannel();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            return false;
+        }
+        try {
+            mp4file.writeContainer(fc);
+            fc.close();
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+
+    }
+
+    public void resumeRecording(){
+        isPaused=false;
+        Toast.makeText(this, getString(R.string.toast_recording_resumed), Toast.LENGTH_LONG).show();
+        startRecording();
+    }
+
     private void startTimer() {
         mTimer = new Timer();
         mIncrementTimerTask = new TimerTask() {
@@ -171,4 +283,17 @@ private Notification createNotification() {
 
         return mBuilder.build();
     }
+
+
+
+    /**
+     * Class used for the client Binder.  Because we know this service always
+     * runs in the same process as its clients, we don't need to deal with IPC.
+     */
+    public class LocalBinder extends Binder {
+        public RecordingService getService() {
+            // Return this instance of LocalService so clients can call public methods
+            return RecordingService.this;
+        }
+    }
 }