Merge branch 'fix-timer-cancel-on-stop' into 'master'

Fix: Exception on stop because timer already cancelled & input prompt

See merge request group-bear/mouse-automove!1

Author: aizuddindeyn

README.md

@@ -1,12 +1,12 @@
 # mouse-automove
 
 ## Background
-My employee is financial institution, therefore a lot of securities were imposed on laptop. 
+My employer is financial institution, therefore a lot of securities were imposed on laptop.
 Although the laptop could have restricted access to internet, but any download will be blocked.
 Setting was made so that the laptop will be lock after few minutes, good when in office, but a hassle when working from home.
 Since download was blocked, so anti-idle application could not be downloaded and used.
 
-Therefore, the app was born, so that I could make a coffee with ease of mind. 
+Therefore, the app was born, so that I could make a coffee with ease of mind.
 
 ## Introduction
 **mouse-automove** is simple Java application that uses Java AWT **Robot API** to move mouse randomly.

script/compile.bat

@@ -1,4 +1,5 @@
 @ECHO OFF
+TITLE mouse-automation-compile
 CD ..
 IF EXIST bin (RMDIR /S /Q bin)
 MKDIR bin

script/run.bat

@@ -1,4 +1,5 @@
 @ECHO OFF
+TITLE mouse-automation-run
 cd ..\bin
 java -jar mouse-app.jar
 cd ..\script

src/com/aizuddindeyn/mouse/MouseApplication.java

@@ -4,27 +4,37 @@
  */
 package com.aizuddindeyn.mouse;
 
+import java.text.MessageFormat;
+import java.util.Scanner;
+
 /**
  * @author aizuddindeyn
  * @date 11/7/2020
  */
 public class MouseApplication {
 
+    private static final Scanner SCANNER = new Scanner(System.in);
+
     public static void main(String[] args) {
         MouseUtils.log("Starting application");
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             MouseInstance.getInstance().stop();
+            SCANNER.close();
             MouseUtils.log("Stopping application");
         }));
 
         MouseInstance.getInstance().start();
 
         while (true) {
             try {
-                int key = System.in.read();
+                String status = (MouseInstance.getInstance().isStarted()) ? "started" : "paused";
+                String action = (MouseInstance.getInstance().isStarted()) ? "pause" : "resume";
+                System.out.println();
+                System.out.print(MessageFormat.format("App {0}. Press 'p' and Enter to {1}: ", status, action));
+                String input = SCANNER.next();
                 // Type 'p' to pause or resume
-                if (key == 112) {
+                if ((input != null && !input.isEmpty()) && 'p' == input.charAt(0)) {
                     if (MouseInstance.getInstance().isStarted()) {
                         MouseInstance.getInstance().stop();
                     } else {

src/com/aizuddindeyn/mouse/MouseInstance.java

@@ -35,15 +35,15 @@ public static MouseInstance getInstance() {
         return INSTANCE;
     }
 
-    public void start() {
+    public synchronized void start() {
         timer = new Timer();
         MouseUtils.log("Timer started");
 
         new MouseTask(timer, INSTANCE).run();
         started = true;
     }
 
-    public void stop() {
+    public synchronized void stop() {
         timer.cancel();
         started = false;
         MouseUtils.log("Timer stopped");
@@ -63,7 +63,7 @@ public void execute() {
         }
     }
 
-    public boolean isStarted() {
+    public synchronized boolean isStarted() {
         return started;
     }
 }

src/com/aizuddindeyn/mouse/MouseTask.java

@@ -34,6 +34,8 @@ public void run() {
     private void setup() {
         int seconds = MouseUtils.generateIntervalSeconds(DELAY_TIMES_MIN, (DELAY_TIMES_MAX - DELAY_TIMES_MIN));
         MouseUtils.log("Next interval: " + seconds + "s");
-        timer.schedule(new MouseTask(timer, instance), seconds * 1000L);
+        if (instance.isStarted()) {
+            timer.schedule(new MouseTask(timer, instance), seconds * 1000L);
+        }
     }
 }