Merge branch 'Update_Startup' into development

5 files changed, 23 insertions, 4 deletions

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index d590e6612..422fab5b7 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -30,6 +30,11 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
                 <action android:name="android.intent.action.ACTION_SHUTDOWN" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REPLACED" />
+                <data android:scheme="package" android:path="eu.siacs.conversations" />
             </intent-filter>
         </receiver>
 
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
+}
diff --git a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java
index 4f43a70b8..3df4dca75 100644
--- a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java
@@ -155,9 +155,21 @@ 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");
+                    String changelog = responseObj.getString("changelog");
                     /*
                     //display the new version in a TextView
                     TextView versionText = (TextView) findViewById(R.id.versionName);
@@ -174,7 +186,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, latestVersion, changelog, version))
                                 .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
                                     //if the user agrees to upgrade
                                     public void onClick(DialogInterface dialog, int id) {
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 33d4ac11a..13cd4adbb 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -491,7 +491,7 @@
   <string name="checking_for_updates">Auf Conversations Updates prüfen</string>
   <string name="title_activity_updater">Update Dienst</string>
   <string name="update">Aktualisieren</string>
-  <string name="update_available">Eine neuere Version von Conversations ist verfügbar. Jetzt aktualisieren?</string>
+  <string name="update_available">Conversations %1$s mit folgenden Änderungen ist verfügbar:\n\n%2$s\n\nMöchtest Du von Conversations %3$s auf Conversations %1$s aktualisieren?</string>
   <string name="download_started">Download gestartet</string>
   <string name="no_update_available">Kein Update verfügbar</string>
   <string name="account_status_dns_timeout">Zeitüberschreitung bei der Namensauflösung</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 941acbaa0..4f7e4a1f4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -522,7 +522,7 @@
 	<string name="account_status_dns_timeout">Timeout in DNS</string>
 	<string name="action_check_update">Check for Updates</string>
 	<string name="title_activity_updater">Update Service</string>
-	<string name="update_available">There is newer version of this application available. Upgrade now?</string>
+	<string name="update_available">Conversations %1$s with the following changes is available:\n\n%2$s\n\nUpdate Conversations %3$s to Conversations %1$s now?</string>
 	<string name="checking_for_updates">Checking for Conversations updates</string>
 	<string name="remind_later">later</string>
 	<string name="update">Update</string>