From db0143859a6af4254a32b32c2b1e5f29f7122569 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Wed, 8 Dec 2021 23:43:56 -0500 Subject: [PATCH] Add support for experimental Firefox releases (#891) * Add support for experimental Firefox releases Closes #217, #889 --- .../certificate/firefox/locator/AppAlias.java | 4 +++- .../installer/certificate/firefox/locator/AppInfo.java | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/qz/installer/certificate/firefox/locator/AppAlias.java b/src/qz/installer/certificate/firefox/locator/AppAlias.java index 0c82187d5..d689e2616 100644 --- a/src/qz/installer/certificate/firefox/locator/AppAlias.java +++ b/src/qz/installer/certificate/firefox/locator/AppAlias.java @@ -5,7 +5,9 @@ public enum AppAlias { // Tor Browser intentionally excluded; Tor's proxy blocks localhost connections FIREFOX( - new Alias("Mozilla", "Mozilla Firefox", "org.mozilla.firefox", true), // Windows + new Alias("Mozilla", "Mozilla Firefox", "org.mozilla.firefox", true), + new Alias("Mozilla", "Firefox Developer Edition", "org.mozilla.firefoxdeveloperedition", true), + new Alias("Mozilla", "Firefox Nightly", "org.mozilla.nightly", true), new Alias("Mozilla", "SeaMonkey", "org.mozilla.seamonkey", false), new Alias("Waterfox", "Waterfox", "net.waterfox.waterfoxcurrent", true), new Alias("Waterfox", "Waterfox Classic", "org.waterfoxproject.waterfox classic", false), diff --git a/src/qz/installer/certificate/firefox/locator/AppInfo.java b/src/qz/installer/certificate/firefox/locator/AppInfo.java index 3defe0986..9d76f40dc 100644 --- a/src/qz/installer/certificate/firefox/locator/AppInfo.java +++ b/src/qz/installer/certificate/firefox/locator/AppInfo.java @@ -73,7 +73,15 @@ private static Version parseVersion(String version) { version = version + ".0"; } return Version.valueOf(version); - } catch(Exception ignore) {} + } catch(Exception ignore1) { + // Catch poor formatting (e.g. "97.0a1"), try to use major version only + if(version.split("\\.").length > 0) { + try { + String[] tryFix = version.split("\\."); + return Version.valueOf(tryFix[0] + ".0.0-unknown"); + } catch(Exception ignore2) {} + } + } return null; }