misc fixes/enhancements, update copyright, allow portable installations on Windows

Author: airsquared

.gitignore

@@ -75,7 +75,7 @@ Carthage/Build
 .idea/**/tasks.xml
 .idea/**/dictionaries
 .idea/**/shelf
-.idea/**/discord.xml # discord plugin
+.idea/discord.xml
 
 # Sensitive or high-churn files
 .idea/**/dataSources/

.idea/blobsaver.iml

@@ -3,9 +3,10 @@
 
 #define MyAppName "blobsaver"
 #define MyAppVersion "2.4.0"
-#define MyAppPublisher "blobsaver"
+#define MyAppPublisher "airsquared"
 #define MyAppURL "https://www.github.com/airsquared/blobsaver"
 #define MyAppExeName "blobsaver.exe"
+#define MyAppCopyright "Copyright (c) 2020  airsquared"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -19,8 +20,11 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
+AppCopyright={#MyAppCopyright}
+ArchitecturesAllowed=x64 arm64
+ArchitecturesInstallIn64BitMode=x64 arm64
+Uninstallable=not IsTaskSelected('portableMode')
 DefaultDirName={pf}\{#MyAppName}
-DisableDirPage=yes
 DisableProgramGroupPage=yes
 LicenseFile=build\tmp\innosetup\LICENSE
 OutputDir=build\distributions
@@ -35,6 +39,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+Name: portableMode; Description: "Portable Mode"
 
 [Files]
 Source: "build\tmp\innosetup\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs

.idea/compiler.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019  airsquared
+ * Copyright (c) 2020  airsquared
  *
  * This file is part of blobsaver.
  *
@@ -118,7 +118,7 @@ task createLinuxTargz(type: Tar, dependsOn: shadowJar) {
 
 launch4j { // Windows only, don't use this, use createWindowsInstaller
     mainClassName = "com.airsquared.blobsaver.Main"
-    copyright = "Copyright (c) 2019  airsquared"
+    copyright = "Copyright (c) 2020  airsquared"
     downloadUrl = "https://java.com/inc/BrowserRedirect1.jsp"
     icon = "${projectDir}/icons/blob_emoji.ico"
     jreMinVersion = "1.8.0"

.idea/misc.xml

@@ -1,3 +1,21 @@
+#
+# Copyright (c) 2020  airsquared
+#
+# This file is part of blobsaver.
+#
+# blobsaver is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# blobsaver is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with blobsaver.  If not, see <https://www.gnu.org/licenses/>.
+#
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

.idea/modules.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019  airsquared
+ * Copyright (c) 2020  airsquared
  *
  * This file is part of blobsaver.
  *

.idea/modules/blobsaver_main.iml renamed to .idea/modules/blobsaver.main.iml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019  airsquared
+ * Copyright (c) 2020  airsquared
  *
  * This file is part of blobsaver.
  *

.idea/modules/blobsaver_test.iml renamed to .idea/modules/blobsaver.test.iml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019  airsquared
+ * Copyright (c) 2020  airsquared
  *
  * This file is part of blobsaver.
  *
@@ -37,9 +37,7 @@
 import javafx.stage.WindowEvent;
 import org.json.JSONArray;
 
-import java.awt.Desktop;
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.prefs.BackingStoreException;
@@ -353,7 +351,7 @@ private void loadPreset(int preset) {
 
     private void presetButtonHandler(ActionEvent evt) {
         Button btn = (Button) evt.getTarget();
-        int preset = Integer.valueOf(btn.getId().substring("preset".length()));
+        int preset = Integer.parseInt(btn.getId().substring("preset".length()));
         if (editingPresets) {
             savePreset(preset);
             savePresetButton.fire();
@@ -577,11 +575,7 @@ public void aboutMenuHandler() {
                     licenseFile = new File(Main.jarDirectory, "LICENSE");
                 }
                 licenseFile.setReadOnly();
-                try {
-                    Desktop.getDesktop().edit(licenseFile);
-                } catch (IOException e) {
-                    newReportableError("Unable to open the license file.", e.toString());
-                }
+                openURL(licenseFile.toURI().toString());
                 break;
             case "Libraries Used":
                 File librariesUsedFile;
@@ -594,11 +588,7 @@ public void aboutMenuHandler() {
                     librariesUsedFile = new File(Main.jarDirectory, "libraries_used.txt");
                 }
                 librariesUsedFile.setReadOnly();
-                try {
-                    Desktop.getDesktop().edit(librariesUsedFile);
-                } catch (IOException e) {
-                    newReportableError("Unable to open the libraries used file.", e.toString());
-                }
+                openURL(librariesUsedFile.toURI().toString());
                 break;
             case "Donate!":
                 donate();
@@ -744,7 +734,7 @@ public void chooseTimeToRunHandler() {
         alert.showAndWait();
         if ((alert.getResult() != null) && !ButtonType.CANCEL.equals(alert.getResult()) && !"".equals(textField.getText()) && (choiceBox.getValue() != null)) {
             log("info given");
-            appPrefs.putInt("Time to run", Integer.valueOf(textField.getText()));
+            appPrefs.putInt("Time to run", Integer.parseInt(textField.getText()));
             appPrefs.put("Time unit for background", choiceBox.getValue());
         } else {
             log("alert menu canceled");
@@ -761,6 +751,9 @@ public void chooseTimeToRunHandler() {
     }
 
     public void startBackgroundHandler() {
+        if (!java.awt.SystemTray.isSupported()) {
+            newUnreportableError("System Tray is not supported on your OS/platform. Saving blobs in the background will not work without System Tray support.");
+        }
         if (Background.inBackground) { //stops background if already in background
             Background.stopBackground(true);
             appPrefs.putBoolean("Show background startup message", true);

.idea/vcs.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019  airsquared
+ * Copyright (c) 2020  airsquared
  *
  * This file is part of blobsaver.
  *

blobsaver.iss

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019  airsquared
+ * Copyright (c) 2020  airsquared
  *
  * This file is part of blobsaver.
  *

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019  airsquared
+ * Copyright (c) 2020  airsquared
  *
  * This file is part of blobsaver.
  *
@@ -43,7 +43,7 @@
 public class Libimobiledevice {
 
     public static long getEcid(boolean showErrorAlert) {
-        return Long.valueOf(getKeyFromConnectedDevice("UniqueChipID", PlistType.INTEGER, showErrorAlert));
+        return Long.parseLong(getKeyFromConnectedDevice("UniqueChipID", PlistType.INTEGER, showErrorAlert));
     }
 
     public static String getDeviceModelIdentifier(boolean showErrorAlert) {
@@ -209,6 +209,7 @@ public static void throwIfNeeded(int errorCode, boolean showAlert, ErrorCodeType
         }
     }
 
+    @SuppressWarnings("unused")
     public static class LibimobiledeviceException extends RuntimeException {
         public LibimobiledeviceException() {
             super();

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019  airsquared
+ * Copyright (c) 2020  airsquared
  *
  * This file is part of blobsaver.
  *
@@ -74,14 +74,14 @@ public static void main(String[] args) {
         try {
             Class.forName("javafx.application.Application");
             if (PlatformUtil.isMac() || PlatformUtil.isWindows() || PlatformUtil.isLinux()) {
-                JavaFxApplication.launchIt(args);
+                JavaFxApplication.launch(JavaFxApplication.class, args);
             } else {
                 int result = javax.swing.JOptionPane.showOptionDialog(null, "Cannot detect the OS. Assuming it is Linux. Continue?",
                         "Warning", javax.swing.JOptionPane.OK_CANCEL_OPTION, javax.swing.JOptionPane.WARNING_MESSAGE, null, null, null);
                 if (result == javax.swing.JOptionPane.CANCEL_OPTION) {
                     System.exit(0);
                 }
-                JavaFxApplication.launchIt(args);
+                JavaFxApplication.launch(JavaFxApplication.class, args);
             }
         } catch (ClassNotFoundException e) {
             javax.swing.JOptionPane.showMessageDialog(null, "JavaFX is not installed. " +
@@ -138,8 +138,15 @@ private static void setJNALibraryPath() {
 
     public static class JavaFxApplication extends Application {
 
-        static void launchIt(String[] args) {
-            launch(args);
+        private static Application INSTANCE;
+
+        public static Application getInstance() {
+            return INSTANCE;
+        }
+
+        @Override
+        public void init() {
+            INSTANCE = this;
         }
 
         @Override