external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix android updater, add fallback to android check

Browse Source 
- copy build.txt to assets (gdx.files.internal looks only inside assets folder)
This commit is contained in:
Anthony Calosa
2024-10-29 16:44:29 +08:00
parent b70df0d422
commit 1ef0656495
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-gui-android/pom.xml
View File

@@ -425,6 +425,23 @@
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
<execution>
<id>android-additional-asset</id>
<phase>test</phase>
<configuration>
<target>
<delete file="${basedir}/assets/build.txt"/>
<copy todir="${basedir}/assets">
<fileset dir="${project.build.directory}/classes">
<include name="build.txt" />
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution> <execution>
<id>android-release-packaging</id> <id>android-release-packaging</id>
<phase>package</phase> <phase>package</phase>

5
forge-gui-mobile/src/forge/assets/AssetsDownloader.java
View File

@@ -58,7 +58,7 @@ public class AssetsDownloader {
final String versionText = isSnapshots ? snapsURL + "version.txt" : releaseURL + "maven-metadata.xml"; final String versionText = isSnapshots ? snapsURL + "version.txt" : releaseURL + "maven-metadata.xml";
FileHandle assetsDir = Gdx.files.absolute(ASSETS_DIR); FileHandle assetsDir = Gdx.files.absolute(ASSETS_DIR);
FileHandle resDir = Gdx.files.absolute(RES_DIR); FileHandle resDir = Gdx.files.absolute(RES_DIR);
FileHandle buildTxtFileHandle = Gdx.files.classpath("build.txt"); FileHandle buildTxtFileHandle = GuiBase.isAndroid() ? Gdx.files.internal("build.txt") : Gdx.files.classpath("build.txt");
final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
boolean verifyUpdatable = false; boolean verifyUpdatable = false;
boolean mandatory = false; boolean mandatory = false;
@@ -101,6 +101,9 @@ public class AssetsDownloader {
buildTimeStamp = format.parse(buildTxtFileHandle.readString()); buildTimeStamp = format.parse(buildTxtFileHandle.readString());
buildDate = buildTimeStamp.toString(); buildDate = buildTimeStamp.toString();
verifyUpdatable = snapsTimestamp.after(buildTimeStamp); verifyUpdatable = snapsTimestamp.after(buildTimeStamp);
} else {
//fallback to old version comparison
verifyUpdatable = !StringUtils.isEmpty(version) && !versionString.equals(version);
} }
} }
} else { } else {