From 527c64af269bdb7abae6ce2c68576362364deb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Mon, 8 Jan 2018 21:50:38 +0100 Subject: [PATCH] Checking new versions on Github --- lib/minimal-json-0.9.5.jar | Bin 0 -> 34221 bytes lib/minimal-json.license.txt | 19 ++++++++++ .../decompiler/flash/ApplicationInfo.java | 33 ++++++------------ .../com/jpexs/decompiler/flash/Version.java | 24 ++----------- nbproject/project.xml | 2 +- .../decompiler/flash/gui/MainFrameMenu.java | 6 ++-- 6 files changed, 36 insertions(+), 48 deletions(-) create mode 100644 lib/minimal-json-0.9.5.jar create mode 100644 lib/minimal-json.license.txt diff --git a/lib/minimal-json-0.9.5.jar b/lib/minimal-json-0.9.5.jar new file mode 100644 index 0000000000000000000000000000000000000000..8405dff1da9efd280bf27b538579945f92f2e9cd GIT binary patch literal 34221 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 literal 0 HcmV?d00001 diff --git a/lib/minimal-json.license.txt b/lib/minimal-json.license.txt new file mode 100644 index 000000000..ad2fd8e30 --- /dev/null +++ b/lib/minimal-json.license.txt @@ -0,0 +1,19 @@ +Copyright (c) 2013, 2014 EclipseSource + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ApplicationInfo.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ApplicationInfo.java index bfaf4d1a3..7aa93f321 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ApplicationInfo.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ApplicationInfo.java @@ -53,17 +53,24 @@ public class ApplicationInfo { public static String shortApplicationVerName; - public static final String PROJECT_PAGE = "https://www.free-decompiler.com/flash"; + public static final String GIT_HUB_PROJECT = "jindrapetrik/jpexs-decompiler"; + + public static final String PROJECT_PAGE = "https://github.com/" + GIT_HUB_PROJECT; /** * URL for checking new updates */ - public static String updateCheckUrl = "https://www.free-decompiler.com/flash/update/check/?currentVersion=¤tRevision=¤tVersionMajor=¤tVersionMinor=¤tVersionRelease=¤tVersionBuild=¤tNightly="; + public static final String GITHUB_RELEASES_LATEST_URL = "https://api.github.com/repos/" + GIT_HUB_PROJECT + "/releases/latest"; + + /** + * URL for checking new updates + */ + public static final String GITHUB_RELEASES_URL = "https://api.github.com/repos/" + GIT_HUB_PROJECT + "/releases"; /** * URL for doing update */ - public static String updateUrl = "https://www.free-decompiler.com/flash/update/update/?currentVersion=¤tRevision=¤tVersionMajor=¤tVersionMinor=¤tVersionRelease=¤tVersionBuild=¤tNightly="; + public static String UPDATE_URL = PROJECT_PAGE; static { loadProperties(); @@ -105,26 +112,6 @@ public class ApplicationInfo { } catch (IOException | NullPointerException | NumberFormatException ex) { // ignore version = "unknown"; - } - try { - updateCheckUrl = updateCheckUrl - .replace("", URLEncoder.encode(revision, "UTF-8")) - .replace("", URLEncoder.encode(version, "UTF-8")) - .replace("", "" + version_major) - .replace("", "" + version_minor) - .replace("", "" + version_release) - .replace("", "" + version_build) - .replace("", nightly ? "1" : "0"); - updateUrl = updateUrl - .replace("", URLEncoder.encode(revision, "UTF-8")) - .replace("", URLEncoder.encode(version, "UTF-8")) - .replace("", "" + version_major) - .replace("", "" + version_minor) - .replace("", "" + version_release) - .replace("", "" + version_build) - .replace("", nightly ? "1" : "0"); - } catch (UnsupportedEncodingException e) { - } applicationVerName = APPLICATION_NAME + " v." + version; shortApplicationVerName = SHORT_APPLICATION_NAME + " v." + version; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/Version.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/Version.java index 90dc4f76d..0a6bf64e0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/Version.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/Version.java @@ -26,31 +26,13 @@ import java.util.Map; */ public class Version { - public int versionId; - - public String revision; + public String tagName; public String versionName; - public String longVersionName; - public String releaseDate; - public String appName; + public boolean prerelease; - public String appFullName; - - public String updateLink; - - public int major; - - public int minor; - - public int release; - - public int build; - - public boolean nightly; - - public Map> changes = new HashMap<>(); + public String description; } diff --git a/nbproject/project.xml b/nbproject/project.xml index ff64d9046..8e37dff20 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -323,7 +323,7 @@ src - lib/LZMA.jar;lib/jna-3.5.1.jar;lib/jpproxy.jar;lib/trident-6.2.jar;lib/substance-flamingo-6.2.jar;lib/flamingo-6.2.jar;lib/substance-6.2.jar;lib/jl1.0.1.jar;lib/nellymoser.jar;lib/gif.jar;lib/avi.jar;lib/ttf.jar;lib/jpacker.jar;lib/sfntly.jar;lib/gnujpdf.jar;libsrc/ffdec_lib/src;lib/tablelayout.jar;lib/jsyntaxpane-0.9.5.jar;lib/JavactiveX.jar;lib/flashdebugger.jar;lib/treetable.jar + lib/LZMA.jar;lib/jna-3.5.1.jar;lib/jpproxy.jar;lib/trident-6.2.jar;lib/substance-flamingo-6.2.jar;lib/flamingo-6.2.jar;lib/substance-6.2.jar;lib/jl1.0.1.jar;lib/nellymoser.jar;lib/gif.jar;lib/avi.jar;lib/ttf.jar;lib/jpacker.jar;lib/sfntly.jar;lib/gnujpdf.jar;libsrc/ffdec_lib/src;lib/tablelayout.jar;lib/jsyntaxpane-0.9.5.jar;lib/JavactiveX.jar;lib/flashdebugger.jar;lib/treetable.jar;lib/minimal-json-0.9.5.jar build javadoc reports diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java index 8efd1cbec..0edf1a29d 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java @@ -506,7 +506,7 @@ public abstract class MainFrameMenu implements MenuBuilder { return; } - String helpUsURL = ApplicationInfo.PROJECT_PAGE + "/help_us.html?utm_source=app&utm_medium=menu&utm_campaign=app"; + String helpUsURL = ApplicationInfo.PROJECT_PAGE; if (!View.navigateUrl(helpUsURL)) { View.showMessageDialog(null, translate("message.helpus").replace("%url%", helpUsURL)); } @@ -751,7 +751,7 @@ public abstract class MainFrameMenu implements MenuBuilder { setMenuEnabled("_/checkUpdates", !isWorking); setMenuEnabled("/help/checkUpdates", !isWorking); - setMenuEnabled("/help/helpUs", !isWorking); + //setMenuEnabled("/help/helpUs", !isWorking); setMenuEnabled("/help/homePage", !isWorking); setMenuEnabled("_/about", !isWorking); setMenuEnabled("/help/about", !isWorking); @@ -1030,7 +1030,7 @@ public abstract class MainFrameMenu implements MenuBuilder { //Help addMenuItem("/help", translate("menu.help"), null, null, 0, null, false, null, false); - addMenuItem("/help/helpUs", translate("menu.help.helpus"), "donate32", this::helpUsActionPerformed, PRIORITY_TOP, null, true, null, false); + //addMenuItem("/help/helpUs", translate("menu.help.helpus"), "donate32", this::helpUsActionPerformed, PRIORITY_TOP, null, true, null, false); addMenuItem("/help/homePage", translate("menu.help.homepage"), "homepage16", this::homePageActionPerformed, PRIORITY_MEDIUM, null, true, null, false); addSeparator("/help"); addMenuItem("/help/checkUpdates", translate("menu.help.checkupdates"), "update16", this::checkUpdatesActionPerformed, PRIORITY_MEDIUM, null, true, null, false);