From 09c9fd76434b8cbc5574bdb2795c68a063e02ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 10 Nov 2014 12:53:14 +0100
Subject: [PATCH] app version major/minor/release/build sending, nighlty build
 id display

---
 .../jpexs/decompiler/flash/ApplicationInfo.java    | 14 +++++++++++---
 src/com/jpexs/decompiler/flash/gui/Main.java       |  8 +++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

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 ac8a8781d..2950a63c1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ApplicationInfo.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ApplicationInfo.java
@@ -29,7 +29,11 @@ public class ApplicationInfo {
     public static final String SHORT_APPLICATION_NAME = "FFDec";
     public static final String VENDOR = "JPEXS";
     public static String version = "";
-    public static String build = "";
+    public static String revision = "";
+    public static int version_major = 4;
+    public static int version_minor = 0;
+    public static int version_release = 0;
+    public static int version_build = 0;
     public static boolean nightly = false;
     public static String applicationVerName;
     public static String shortApplicationVerName;
@@ -46,10 +50,14 @@ public class ApplicationInfo {
         try {
             prop.load(ApplicationInfo.class.getResourceAsStream("/project.properties"));
             version = prop.getProperty("version");
-            build = prop.getProperty("build");
+            revision = prop.getProperty("build");
+            version_major = Integer.parseInt(prop.getProperty("version.major"));
+            version_minor = Integer.parseInt(prop.getProperty("version.minor"));
+            version_release = Integer.parseInt(prop.getProperty("version.release"));
+            version_build = Integer.parseInt(prop.getProperty("version.build"));
             nightly = prop.getProperty("nightly").equals("true");
             if (nightly) {
-                version = version + " nightly build";
+                version = version + " nightly build " + version_build;
             }
         } catch (IOException | NullPointerException ex) {
             //ignore
diff --git a/src/com/jpexs/decompiler/flash/gui/Main.java b/src/com/jpexs/decompiler/flash/gui/Main.java
index a18e226fd..2f2442b7f 100644
--- a/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -1285,7 +1285,13 @@ public class Main {
             Socket sock = new Socket("www.free-decompiler.com", 80);
             OutputStream os = sock.getOutputStream();
             String currentLoc = Configuration.locale.get("en");
-            os.write(("GET /flash/update.html?action=check&currentVersion=" + URLEncoder.encode(currentVersion, "UTF-8") + "&currentBuild=" + URLEncoder.encode(ApplicationInfo.build, "UTF-8") + "&currentNightly=" + (ApplicationInfo.nightly ? "1" : "0") + " HTTP/1.1\r\n"
+            os.write(("GET /flash/update.html?action=check&currentVersion=" + URLEncoder.encode(currentVersion, "UTF-8") 
+                    + "&currentRevision=" + URLEncoder.encode(ApplicationInfo.revision, "UTF-8")
+                    + "&currentVersionMajor=" + URLEncoder.encode(""+ApplicationInfo.version_major, "UTF-8") 
+                    + "&currentVersionMinor=" + URLEncoder.encode(""+ApplicationInfo.version_minor, "UTF-8")
+                    + "&currentVersionRelease=" + URLEncoder.encode(""+ApplicationInfo.version_release, "UTF-8")
+                    + "&currentVersionBuild=" + URLEncoder.encode(""+ApplicationInfo.version_build, "UTF-8")
+                    + "&currentNightly=" + (ApplicationInfo.nightly ? "1" : "0") + " HTTP/1.1\r\n"
                     + "Host: www.free-decompiler.com\r\n"
                     + "X-Accept-Versions: " + acceptVersions + "\r\n"
                     + "X-Update-Major: " + UPDATE_SYSTEM_MAJOR + "\r\n"