1.0.1.7 release commit

app-core/pom.xml

@@ -22,11 +22,6 @@
         <dependency>
             <groupId>com.1stleg</groupId>
             <artifactId>jnativehook</artifactId>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>lc.kra.system</groupId>
-            <artifactId>system-hook</artifactId>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>

app-core/src/main/java/com/mercury/platform/core/update/core/ClientChannelInitializer.java

@@ -10,9 +10,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-/**
- * Created by Frost on 14.01.2017.
- */
 public class ClientChannelInitializer extends ChannelInitializer<SocketChannel> {
 
     private static final Logger LOGGER = LogManager.getLogger(ClientChannelInitializer.class.getSimpleName());

app-core/src/main/java/com/mercury/platform/core/update/core/UpdaterClient.java

@@ -12,11 +12,9 @@
 import org.apache.logging.log4j.Logger;
 
 import java.net.InetSocketAddress;
+import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Created by Frost on 14.01.2017.
- */
 public class UpdaterClient {
 
     private static final Logger LOGGER = LogManager.getLogger(UpdaterClient.class.getSimpleName());
@@ -71,7 +69,7 @@ public void operationComplete(ChannelFuture future) throws Exception {
                         future.channel().close();
                         future.channel().eventLoop().schedule(() -> {
                             bootstrap.connect().addListener(this);
-                        },3,TimeUnit.MINUTES);
+                        },new Random().nextInt(5),TimeUnit.MINUTES);
                     } else {
                         channel = future.channel();
                         connectionEstablished = true;

app-core/src/main/java/com/mercury/platform/core/utils/MessageFileHandler.java

@@ -68,9 +68,7 @@ public void parse() {
                 .collect(Collectors.toList());
 
         List<String> resultMessages = filteredMessages.stream().filter(message -> {
-            message = StringUtils.substring(message, 0, 20);
-            Matcher matcher = datePattern.matcher(message);
-            if(matcher.find()) {
+            if(message.contains("2017") || message.contains("2018")) { //todo
                 Date date = new Date(StringUtils.substring(message, 0, 20));
                 return date.after(lastMessageDate);
             }else {

app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeysConfigurationService.java

@@ -7,7 +7,6 @@
 import com.mercury.platform.shared.config.descriptor.HotKeyType;
 import com.mercury.platform.shared.config.descriptor.ProfileDescriptor;
 import com.mercury.platform.shared.store.MercuryStoreCore;
-import lc.kra.system.keyboard.event.GlobalKeyEvent;
 import org.jnativehook.keyboard.NativeKeyEvent;
 
 import java.util.HashMap;

app-core/src/main/java/com/mercury/platform/shared/store/MercuryStoreCore.java

@@ -9,7 +9,6 @@
 import com.mercury.platform.shared.entity.message.MercuryError;
 import com.mercury.platform.shared.entity.message.Message;
 import com.mercury.platform.shared.config.descriptor.SoundDescriptor;
-import lc.kra.system.keyboard.event.GlobalKeyEvent;
 import rx.subjects.PublishSubject;
 
 

app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java

@@ -9,9 +9,12 @@
 import com.mercury.platform.ui.manager.FramesManager;
 import com.mercury.platform.ui.misc.AppThemeColor;
 import com.mercury.platform.ui.misc.MercuryStoreUI;
+import com.mercury.platform.ui.misc.note.Note;
+import com.mercury.platform.ui.misc.note.NotesLoader;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
 
@@ -114,6 +117,23 @@ private JPanel getOperationsButtons(){
         root.add(this.componentsFactory.wrapToSlide(openTutorial));
         root.add(this.componentsFactory.wrapToSlide(checkUpdates));
         root.add(this.componentsFactory.wrapToSlide(openTests));
+
+        JButton patchNotes = componentsFactory.getBorderedButton("Open patch notes");
+        patchNotes.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if(SwingUtilities.isLeftMouseButton(e)){
+                    NotesLoader notesLoader = new NotesLoader();
+                    java.util.List<Note> patchNotes = notesLoader.getPatchNotes();
+                    if(patchNotes.size() != 0){
+                        NotesFrame patchNotesFrame = new NotesFrame(patchNotes, NotesFrame.NotesType.PATCH);
+                        patchNotesFrame.init();
+                        patchNotesFrame.showComponent();
+                    }
+                }
+            }
+        });
+//        root.add(patchNotes);
         return root;
     }
 

app-ui/src/main/resources/notes/patch/patch-notes.json

@@ -1,9 +1,9 @@
 {
-  "version":"1.0.1.6.1",
+  "version":"1.0.1.7.0",
   "notes":[
     {
-      "title" : "Hotfix",
-      "text" : "Overseer:\n- Fixed a bug with tracker not working properly with multiple simultanious key presses.\n- Fixed a bug with components not being removed properly.\n- Improved the icon selection dialog performance.\n- Now you can bind left/midle/right mouse buttons as a hotkey.\n\nThanks for your fast feedback and support. New features are coming soon!",
+      "title" : "Update",
+      "text" : "More than 5000 unique users this week! Here is an update for you!\n-Completely reworked Settings GUI.\n-All the issues with non-English keyboard layouts should be gone. Also now you can bind absolutely any mouse / keyboard button you have.\n-Fixed an issue when you couldn't close Notification panel.\n-Now components are cleaned up properly on a profile switch.\nCheck out the Overseer channel on Discord - post your setups, share profiles and converse!\n\nStay with us as there are more mind-blowing features to come. And don't forget to support the app, judging from all the activity looks like it's probably worth some!",
       "image" : "",
       "layout" : "VERTICAL"
     }

pom.xml

@@ -20,7 +20,7 @@
     <properties>
         <project.version>1.0.0.5</project.version>
 
-        <systemhook.version>3.1</systemhook.version>
+        <jnativehook.version>2.0.2</jnativehook.version>
         <devjna.version>4.4.0</devjna.version>
         <commonsio.version>2.5</commonsio.version>
         <junit.version>4.12</junit.version>
@@ -42,16 +42,16 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>lc.kra.system</groupId>
-                <artifactId>system-hook</artifactId>
-                <version>${systemhook.version}</version>
-            </dependency>
             <dependency>
                 <groupId>net.jodah</groupId>
                 <artifactId>expiringmap</artifactId>
                 <version>${expiringmap.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.1stleg</groupId>
+                <artifactId>jnativehook</artifactId>
+                <version>${jnativehook.version}</version>
+            </dependency>
             <dependency>
                 <groupId>net.java.dev.jna</groupId>
                 <artifactId>jna</artifactId>
@@ -144,16 +144,6 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <repositories>
-        <repository>
-            <id>system-hook-mvn-repo</id>
-            <url>https://raw.github.com/kristian/system-hook/mvn-repo/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
     <build>
         <plugins>
             <plugin>