Move file chooser dialog for recording from record start to record stop

Now user will be asked to choose file where to save video when he'll hit Stop recording button.
Video will be saved in some temporary file under OS tmp folder before it'll be moved to user-picker file

Author: xSAVIKx

src/main/java/com/github/xsavikx/androidscreencast/api/AndroidDeviceImpl.java

@@ -21,7 +21,7 @@ public class AndroidDeviceImpl implements AndroidDevice {
     private static final Logger logger = Logger.getLogger(AndroidDeviceImpl.class);
     private final IDevice device;
 
-    @Autowired(required = false)
+    @Autowired
     public AndroidDeviceImpl(IDevice device) {
         this.device = device;
     }

src/main/java/com/github/xsavikx/androidscreencast/api/command/executor/ShellCommandExecutor.java

@@ -19,20 +19,22 @@
 public class ShellCommandExecutor implements CommandExecutor {
     private static final Logger LOGGER = Logger.getLogger(ShellCommandExecutor.class);
     private final IDevice device;
+    private final MultiLineReceiverPrinter multiLineReceiverPrinter;
     @Value("${adb.command.timeout:5}")
     private long adbCommandTimeout;
 
     @Autowired
-    public ShellCommandExecutor(IDevice device) {
+    public ShellCommandExecutor(IDevice device, MultiLineReceiverPrinter multiLineReceiverPrinter) {
         this.device = device;
+        this.multiLineReceiverPrinter = multiLineReceiverPrinter;
     }
 
     @Override
     public void execute(Command command) {
         LOGGER.debug("execute(Command command=" + command + ") - start");
 
         try {
-            device.executeShellCommand(command.getFormattedCommand(), new MultiLineReceiverPrinter(),
+            device.executeShellCommand(command.getFormattedCommand(), multiLineReceiverPrinter,
                     adbCommandTimeout, TimeUnit.SECONDS);
         } catch (TimeoutException | AdbCommandRejectedException | ShellCommandUnresponsiveException | IOException e) {
             LOGGER.error("execute(Command)", e);

src/main/java/com/github/xsavikx/androidscreencast/api/injector/ScreenCaptureRunnable.java

@@ -113,10 +113,7 @@ public void setListener(ScreenCaptureListener listener) {
 
     public void startRecording(File file) {
         try {
-            File outputFile = file;
-            if (!outputFile.getName().toLowerCase().endsWith(MOV_FILE_TYPE))
-                outputFile = new File(file.getAbsolutePath() + MOV_FILE_TYPE);
-            qos = new QuickTimeOutputStream(outputFile, QuickTimeOutputStream.VideoFormat.JPG);
+            qos = new QuickTimeOutputStream(file, QuickTimeOutputStream.VideoFormat.JPG);
         } catch (IOException e) {
             throw new IORuntimeException(e);
         }

src/main/java/com/github/xsavikx/androidscreencast/api/recording/QuickTimeOutputStream.java

@@ -84,6 +84,7 @@ public class QuickTimeOutputStream {
      * @throws IllegalArgumentException if videoFormat is null or if framerate is <= 0
      */
     public QuickTimeOutputStream(File file, VideoFormat format) throws IOException {
+        checkNotNull(file, "Result file should not be null.");
         checkNotNull(format, "Video format must not be null.");
         Files.deleteIfExists(file.toPath());
         out = new FileImageOutputStream(file);

src/main/java/com/github/xsavikx/androidscreencast/ui/JFrameMain.java

@@ -4,10 +4,12 @@
 import com.github.xsavikx.androidscreencast.api.injector.InputKeyEvent;
 import com.github.xsavikx.androidscreencast.app.AndroidScreencastApplication;
 import com.github.xsavikx.androidscreencast.constant.Constants;
+import com.github.xsavikx.androidscreencast.exception.IORuntimeException;
 import com.github.xsavikx.androidscreencast.spring.config.ApplicationContextProvider;
 import com.github.xsavikx.androidscreencast.ui.explorer.JFrameExplorer;
 import com.github.xsavikx.androidscreencast.ui.interaction.KeyEventDispatcherFactory;
 import com.github.xsavikx.androidscreencast.ui.interaction.KeyboardActionListenerFactory;
+import com.google.common.io.Files;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
@@ -19,6 +21,9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
 
 @Component
 public class JFrameMain extends JFrame {
@@ -92,22 +97,7 @@ public void initialize() {
         jbKbSearch.addActionListener(KeyboardActionListenerFactory.getInstance(InputKeyEvent.KEYCODE_SEARCH));
         jbKbPhoneOn.addActionListener(KeyboardActionListenerFactory.getInstance(InputKeyEvent.KEYCODE_CALL));
         jbKbPhoneOff.addActionListener(KeyboardActionListenerFactory.getInstance(InputKeyEvent.KEYCODE_ENDCALL));
-        jbRecord.addActionListener(new ActionListener() {
-            private boolean recordStarted = false;
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (!recordStarted) {
-                    recordStarted = true;
-                    jbRecord.setText("Stop record");
-                    startRecording();
-                } else {
-                    recordStarted = false;
-                    stopRecording();
-                    jbRecord.setText("Start record");
-                }
-            }
-        });
+        jbRecord.addActionListener(createRecordActionListener());
 
 
         jtbHardkeys.add(jbKbHome);
@@ -150,6 +140,45 @@ public void actionPerformed(ActionEvent e) {
         jtb.add(jbRecord);
     }
 
+    private ActionListener createRecordActionListener() {
+        return new ActionListener() {
+            private final Path tmpDir = Files.createTempDir().toPath();
+            private boolean recording = false;
+            private File tmpVideoFile;
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                try {
+                    if (!recording) {
+                        recording = true;
+                        jbRecord.setText("Stop record");
+                        tmpVideoFile = java.nio.file.Files.createTempFile(tmpDir, "androidScreenCast", ".mov.tmp").toFile();
+                        startRecording(tmpVideoFile);
+                    } else {
+                        recording = false;
+                        stopRecording();
+                        jbRecord.setText("Start record");
+                        JFileChooser jFileChooser = new JFileChooser();
+                        FileNameExtensionFilter filter = new FileNameExtensionFilter("Video file", "mov");
+                        jFileChooser.setFileFilter(filter);
+                        int returnVal = jFileChooser.showSaveDialog(JFrameMain.this);
+                        if (returnVal == JFileChooser.APPROVE_OPTION) {
+                            File resultFile = jFileChooser.getSelectedFile();
+                            if (!resultFile.getName().endsWith(".mov")) {
+                                resultFile = new File(resultFile.getAbsolutePath() + ".mov");
+                            }
+                            Files.move(tmpVideoFile, resultFile);
+                        } else {
+                            tmpVideoFile.deleteOnExit();
+                        }
+                    }
+                } catch (IOException ex) {
+                    throw new IORuntimeException(ex);
+                }
+            }
+        };
+    }
+
     public void launchInjector() {
         injector.setScreenCaptureListener((size, image, landscape) -> {
             if (oldImageDimension == null || !size.equals(oldImageDimension)) {
@@ -162,15 +191,8 @@ public void launchInjector() {
         injector.start();
     }
 
-    private void startRecording() {
-        JFileChooser jFileChooser = new JFileChooser();
-        FileNameExtensionFilter filter = new FileNameExtensionFilter("Video file", "mov");
-        jFileChooser.setFileFilter(filter);
-        int returnVal = jFileChooser.showSaveDialog(this);
-        jFileChooser.getName();
-        if (returnVal == JFileChooser.APPROVE_OPTION) {
-            injector.startRecording(jFileChooser.getSelectedFile());
-        }
+    private void startRecording(File file) {
+        injector.startRecording(file);
     }
 
     private void stopRecording() {