Skip to content

Commit

Permalink
Release 1.2.1
Browse files Browse the repository at this point in the history
Fixed saving configuration on pushbullet on/off switch
  • Loading branch information
Morph21 committed Feb 7, 2022
1 parent 5405b65 commit efaa2a3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.mercury.platform.core;

public class MercuryConstants {
public static final String APP_VERSION = "1.2.0";
public static final String APP_VERSION = "1.2.1";
public static final String SERVER_HOST = "exslims.ddns.net";
public static final int PORT = 5555;
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ public void enablePushbullet() {
MercuryStoreUI.repaintSubject.onNext(TaskBarFrame.class);
MercuryStoreCore.alertSubject.onNext("Pushbullet notifications on");
MercuryStoreCore.pushbulletSubject.onNext(true);
MercuryStoreCore.saveConfigSubject.onNext(true);
}

@Override
public void disablePushbullet() {
MercuryStoreUI.repaintSubject.onNext(TaskBarFrame.class);
MercuryStoreCore.alertSubject.onNext("Pushbullet notifications off");
MercuryStoreCore.pushbulletSubject.onNext(false);
MercuryStoreCore.saveConfigSubject.onNext(true);
}

@Override
Expand Down
8 changes: 8 additions & 0 deletions app-ui/src/main/resources/notes/patch/patch-notes-new.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
[
{
"version": "1.2.1",
"fix": [
{
"changed": "Fixed saving configuration on pushbullet on/off switch"
}
]
},
{
"version": "1.2.0",
"fix": [
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<packaging>pom</packaging>

<properties>
<project.version>1.2.0</project.version>
<project.version>1.2.1</project.version>

<jnativehook.version>2.0.2</jnativehook.version>
<devjna.version>4.4.0</devjna.version>
Expand Down
8 changes: 4 additions & 4 deletions release_files/release_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<opt>-XX:+UseG1GC</opt>
</jre>
<versionInfo>
<fileVersion>1.2.0.0</fileVersion>
<txtFileVersion>1.2.0</txtFileVersion>
<fileVersion>1.2.1.0</fileVersion>
<txtFileVersion>1.2.1</txtFileVersion>
<fileDescription>MercuryTrade</fileDescription>
<copyright>Morph21</copyright>
<productVersion>1.2.0.0</productVersion>
<txtProductVersion>1.2.0</txtProductVersion>
<productVersion>1.2.1.0</productVersion>
<txtProductVersion>1.2.1</txtProductVersion>
<productName>MercuryTrade</productName>
<companyName>Morph</companyName>
<internalName>MercuryTrade</internalName>
Expand Down

0 comments on commit efaa2a3

Please sign in to comment.