From 7dd587554f81a35a42a2fdc4cdd74785b28114bc Mon Sep 17 00:00:00 2001
From: Christian S <christian@pix-art.de>
Date: Fri, 22 Jan 2016 21:39:53 +0100
Subject: show warning on back pressed during update check

---
 .../java/eu/siacs/conversations/ui/UpdaterActivity.java | 17 ++++++++++++++++-
 src/main/res/values-de/strings.xml                      |  4 ++++
 src/main/res/values/strings.xml                         |  5 ++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java
index f18b8fdab..535fda29a 100644
--- a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java
@@ -265,8 +265,23 @@ public class UpdaterActivity extends Activity {
         }
     };
 
-    //disable back button
+    //show warning on back pressed
     @Override
     public void onBackPressed() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setMessage(R.string.cancel_update)
+                .setCancelable(false)
+                .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        UpdaterActivity.this.finish();
+                    }
+                })
+                .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        dialog.cancel();
+                    }
+                });
+        AlertDialog alert = builder.create();
+        alert.show();
     }
 }
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 6570f32cf..8c01fb16f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -570,4 +570,8 @@
   <string name="battery_optimizations_enabled_explained">Dein Telefon wendet Batterioptimierungen bei Conversations an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können.\nEs ist empfehlenswert diese zu deaktivieren.</string>
   <string name="battery_optimizations_enabled_dialog">Dein Telefon wendet Batterioptimierungen bei Conversations an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können. Es ist empfehlenswert dies zu deaktivieren.</string>
   <string name="disable">Deaktivieren</string>
+  <string name="cancel_update">Update abbrechen?</string>
+  <string name="no">Nein</string>
+  <string name="selection_too_large">Das ausgewählte Bild ist zu groß</string>
+  <string name="yes">Ja</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ab01aedb0..3156c585f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -583,7 +583,7 @@
 	<string name="certificate_issuer">Issuer</string>
 	<string name="certificate_cn">Common Name</string>
 	<string name="certificate_o">Organization</string>
-	<string name="certificate_sha1" translatable="false">SHA1</string>
+	<string name="certificate_sha1">SHA1</string>
 	<string name="certicate_info_not_available">(Not available)</string>
 	<string name="certificate_not_found">No certificate found</string>
 	<string name="notify_on_all_messages">Notify on all messages</string>
@@ -599,4 +599,7 @@
 	<string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
 	<string name="disable">Disable</string>
 	<string name="selection_too_large">The selected area is too large</string>
+	<string name="cancel_update">Cancel update check?</string>
+	<string name="yes">Yes</string>
+	<string name="no">No</string>
 </resources>
-- 
cgit v1.2.3