Fix #217: track puzzlesgen version explicitly, not by timestamp.

Bump version.
chrisboyle · Oct 26, 2014 · 7259a13 · 7259a13
1 parent ba99717
commit 7259a13
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
 
     defaultConfig {
         applicationId "name.boyle.chris.sgtpuzzles"
-        versionCode 88
-        versionName "10286.4"
+        versionCode 89
+        versionName "10286.5"
 
         if (file(ndkDir.absolutePath + '/platforms/android-15').exists()) {  // the last without PIE
             minSdkVersion 7

diff --git a/app/src/main/java/name/boyle/chris/sgtpuzzles/GamePlay.java b/app/src/main/java/name/boyle/chris/sgtpuzzles/GamePlay.java
@@ -37,6 +37,7 @@
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
@@ -98,6 +99,7 @@ public class GamePlay extends ActionBarActivity implements OnSharedPreferenceCha
 	public static final String SAVED_COMPLETED_PREFIX = "savedCompleted_";
 	public static final String SAVED_GAME_PREFIX = "savedGame_";
 	public static final String LAST_PARAMS_PREFIX = "last_params_";
+	private static final String PUZZLESGEN_LAST_UPDATE = "puzzlesgen_last_update";
 
 	private ProgressDialog progress;
 	private TextView statusBar;
@@ -564,6 +566,7 @@ private String generateGame(final List<String> args) throws IllegalArgumentExcep
 		return game;
 	}
 
+	@SuppressLint("CommitPrefEdits")
 	private void startGameGenProcess(final List<String> args) throws IOException {
 		final ApplicationInfo applicationInfo = getApplicationInfo();
 		final File dataDir = new File(applicationInfo.dataDir);
@@ -577,8 +580,13 @@ private void startGameGenProcess(final List<String> args) throws IOException {
 		final String suffix = canRunPIE ? "-with-pie" : "-no-pie";
 		File installablePath = new File(libDir, "libpuzzlesgen" + suffix + ".so");
 		File executablePath = new File(dataDir, "puzzlesgen" + suffix);
-		if (!executablePath.exists() ||
-				executablePath.lastModified() < installablePath.lastModified()) {
+		boolean needCopy = true;
+		try {
+			final int currentVersion = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
+			needCopy = !executablePath.exists() || (prefs.getInt(PUZZLESGEN_LAST_UPDATE, 0) < currentVersion);
+			prefsSaver.save(prefs.edit().putInt(PUZZLESGEN_LAST_UPDATE, currentVersion));
+		} catch (PackageManager.NameNotFoundException ignored) {}
+		if (needCopy) {
 			copyFile(installablePath, executablePath);
 		}
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {