From 4cfdddaa76f3d6b789e0f7eec70fcfedf4e24b35 Mon Sep 17 00:00:00 2001 From: "Christian S." Date: Tue, 6 Oct 2015 10:36:49 +0200 Subject: Added more info to alertbox --- src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java index 4f43a70b8..4c8b524f7 100644 --- a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java @@ -158,6 +158,7 @@ public class UpdaterActivity extends Activity { //get the latest version from the JSON string int latestVersionCode = responseObj.getInt("latestVersionCode"); String latestVersion = responseObj.getString("latestVersion"); + String changelog = responseObj.getString("changelog"); /* //display the new version in a TextView TextView versionText = (TextView) findViewById(R.id.versionName); @@ -174,7 +175,8 @@ public class UpdaterActivity extends Activity { AlertDialog.Builder builder = new AlertDialog.Builder(UpdaterActivity.this); builder.setCancelable(false); - builder.setMessage(R.string.update_available) + String UpdateMessageInfo = getResources().getString(R.string.update_available); + builder.setMessage(String.format(UpdateMessageInfo, changelog, latestVersion, version) .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() { //if the user agrees to upgrade public void onClick(DialogInterface dialog, int id) { -- cgit v1.2.3 From 79caa639b6b4e17050bd37fd705b4a40e72fe3ef Mon Sep 17 00:00:00 2001 From: "Christian S." Date: Tue, 6 Oct 2015 10:38:00 +0200 Subject: added changelog to JSON object in updater --- .../java/eu/siacs/conversations/services/CheckAppVersionService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java b/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java index 0fffb8a78..ddc89e1a4 100644 --- a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java +++ b/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java @@ -33,6 +33,7 @@ public class CheckAppVersionService extends HttpServlet { myObj.addProperty("success", true); myObj.addProperty("latestVersionCode", 2); myObj.addProperty("latestVersion", "1.0.0"); + myObj.addProperty("changelog", ""); myObj.addProperty("appURI", ""); out.println(myObj.toString()); out.close(); @@ -40,4 +41,4 @@ public class CheckAppVersionService extends HttpServlet { } -} \ No newline at end of file +} -- cgit v1.2.3 From 91899621905467fb9b22cf761789f9c1ce3a1f5d Mon Sep 17 00:00:00 2001 From: Christian S Date: Tue, 6 Oct 2015 21:46:25 +0200 Subject: update Updater --- .../java/eu/siacs/conversations/ui/UpdaterActivity.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java index 4c8b524f7..3df4dca75 100644 --- a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java @@ -155,6 +155,17 @@ public class UpdaterActivity extends Activity { boolean success = responseObj.getBoolean("success"); //if the reponse was successful check further if(success){ + //Overall information about the contents of a package + //This corresponds to all of the information collected from AndroidManifest.xml. + PackageInfo pInfo = null; + try { + pInfo = getPackageManager().getPackageInfo(getPackageName(), 0); + } + catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + //get the app version Name for display + String version = pInfo.versionName; //get the latest version from the JSON string int latestVersionCode = responseObj.getInt("latestVersionCode"); String latestVersion = responseObj.getString("latestVersion"); @@ -176,7 +187,7 @@ public class UpdaterActivity extends Activity { builder.setCancelable(false); String UpdateMessageInfo = getResources().getString(R.string.update_available); - builder.setMessage(String.format(UpdateMessageInfo, changelog, latestVersion, version) + builder.setMessage(String.format(UpdateMessageInfo, latestVersion, changelog, version)) .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() { //if the user agrees to upgrade public void onClick(DialogInterface dialog, int id) { -- cgit v1.2.3