From 38ec8561983912136a6751ada5a89c362a49f2c9 Mon Sep 17 00:00:00 2001 From: a1batross Date: Sat, 21 May 2016 20:13:18 +0300 Subject: [PATCH] Fix new version checking --- src/in/celest/xash3d/LauncherActivity.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java index 4c9471e5..ef7fabf8 100644 --- a/src/in/celest/xash3d/LauncherActivity.java +++ b/src/in/celest/xash3d/LauncherActivity.java @@ -121,7 +121,7 @@ public class LauncherActivity extends Activity { if(mPref.getBoolean("check_updates", true)) { - new RetrieveJSON(true).execute(UPDATE_LINK); + new CheckUpdate(true).execute(UPDATE_LINK); } } @@ -221,12 +221,12 @@ public class LauncherActivity extends Activity { return super.onOptionsItemSelected(item); } - private class RetrieveJSON extends AsyncTask { + private class CheckUpdate extends AsyncTask { InputStream is = null; ByteArrayOutputStream os = null; boolean mSilent; - public RetrieveJSON( boolean silent ) + public CheckUpdate( boolean silent ) { mSilent = silent; } @@ -272,7 +272,8 @@ public class LauncherActivity extends Activity { try { - if (os != null) { + if (os != null) + { os.close(); os = null; } @@ -288,9 +289,10 @@ public class LauncherActivity extends Activity { Log.d("Xash", "Found: " + version + ", I: " + getString(R.string.version_string)); - if( !getString(R.string.version_string).equals(version) ) + // this is an update + if( getString(R.string.version_string).compareTo(version) < 0 ) { - String dialog_message = getString(R.string.update_message).format(name); + String dialog_message = String.format(getString(R.string.update_message), name); AlertDialog.Builder builder = new AlertDialog.Builder(getBaseContext()); builder.setMessage(dialog_message) .setPositiveButton(R.string.update, new DialogInterface.OnClickListener()