diff --git a/forge-gui-android/src/forge/app/GitLogs.java b/forge-gui-android/src/forge/app/GitLogs.java index 6d7b0e32dde..66b794b0845 100644 --- a/forge-gui-android/src/forge/app/GitLogs.java +++ b/forge-gui-android/src/forge/app/GitLogs.java @@ -29,9 +29,9 @@ public class GitLogs { if (entry.updated == null) continue; Date feedDate = atomDate.parse(entry.updated); - if (buildDateOriginal != null && feedDate.before(buildDateOriginal)) + if (buildDateOriginal != null && feedDate.toInstant().isBefore(buildDateOriginal.toInstant())) continue; - if (maxDate != null && feedDate.after(maxDate)) + if (maxDate != null && feedDate.toInstant().isAfter(maxDate.toInstant())) continue; logs.append(simpleDate.format(feedDate)).append(" | ").append(StringEscapeUtils.unescapeXml(title).replace("\n", "").replace(" ", "")).append("\n\n"); if (c >= 15) diff --git a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java index 2fa85cee1c6..a99d188317a 100644 --- a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java +++ b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java @@ -72,11 +72,7 @@ public class AssetsDownloader { final String releaseTag = Forge.getDeviceAdapter().getReleaseTag(GITHUB_RELEASES_ATOM); try { URL versionUrl = new URL(versionText); - String version = ""; - if (GuiBase.isAndroid()) - version = FileUtil.readFileToString(versionUrl); - else //instead of parsing xml from earlier releases, get the latest github release tag - version = releaseTag.replace("forge-", ""); + String version = isSnapshots ? FileUtil.readFileToString(versionUrl) : releaseTag.replace("forge-", ""); String filename = ""; String installerURL = ""; if (GuiBase.isAndroid()) { @@ -121,7 +117,8 @@ public class AssetsDownloader { if (!Forge.getDeviceAdapter().isConnectedToWifi()) { message += " If so, you may want to connect to wifi first. The download is around " + (GuiBase.isAndroid() ? apkSize : packageSize) + "."; } - message += Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_ATOM, buildTimeStamp, snapsTimestamp); + if (isSnapshots) // this is for snaps initial info + message += Forge.getDeviceAdapter().getLatestChanges(GITHUB_COMMITS_ATOM, buildTimeStamp, snapsTimestamp); //failed to grab latest github tag if (!isSnapshots && releaseTag.isEmpty()) { if (!GuiBase.isAndroid())