From 93d11b3c99be49fdd2faa0e90db45b3360720e6a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 7 Mar 2014 20:22:26 +0100 Subject: [PATCH] made untrust certificate warning more beautified --- res/layout/cert_warning.xml | 29 ++++++++++++------- res/values/strings.xml | 1 + .../ui/ManageAccountActivity.java | 12 ++++++-- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/res/layout/cert_warning.xml b/res/layout/cert_warning.xml index 2e1e55117..59d718030 100644 --- a/res/layout/cert_warning.xml +++ b/res/layout/cert_warning.xml @@ -10,23 +10,32 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="18sp"/> + + + + - - - + android:textSize="20sp"/> + diff --git a/res/values/strings.xml b/res/values/strings.xml index 3b575db15..4995523b0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -22,4 +22,5 @@ Visitor Enter a new name: Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed. + The server %s presented you with an unstrusted, possible self signed, certificate. diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java index 91314686c..9e71edb13 100644 --- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -77,10 +77,16 @@ public class ManageAccountActivity extends XmppActivity { TextView hint = (TextView) view.findViewById(R.id.hint); StringBuilder humanReadableSha = new StringBuilder(); humanReadableSha.append(fingerprint); - for(int i = 2; i < 58; i += 3) { - humanReadableSha.insert(i, ":"); + for(int i = 2; i < 59; i += 3) { + Log.d("gultsch","insert into "+i); + if ((i==14)||(i==29)||(i==44)) { + humanReadableSha.insert(i, "\n"); + } else { + humanReadableSha.insert(i, ":"); + } + } - hint.setText(account.getServer()+" presented you with an unstrusted, possible self signed, certificate.\nThe SHA1 fingerprint is"); + hint.setText(getString(R.string.untrusted_cert_hint,account.getServer())); sha.setText(humanReadableSha.toString()); builder.setView(view); //builder.setMessage(server+" presented you with an unstrusted, possible self signed, certificate. The SHA1 fingerprint is "+fingerprint+" Do not connect unless you know exactly what you are doing");