From 077932eb558853e4c3c3046c54db18c530495d8c Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Fri, 29 May 2015 11:18:25 +0200 Subject: CryptoNext Menu entries added --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values/strings.xml') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index dc29ffd3..30a3e4d2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -154,6 +154,7 @@ Plain text OTR OpenPGP + Axolotl Edit account Delete account Temporarily disable -- cgit v1.2.3 From 7049904c326e6dabc02138fa436d209bf724e0bc Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Tue, 7 Jul 2015 19:36:22 +0200 Subject: Add basic PEP managemend UI to EditAccountActivity EditAccountActivity now show own fingerprint, and gives an option to regenerate local keying material (and wipe all sessions associated with the old keys in the process). It also now displays a list of other own devices, and gives an option to remove all but the current device. --- src/main/res/values/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/main/res/values/strings.xml') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 30a3e4d2..60ca5613 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -207,6 +207,8 @@ Reception failed Your fingerprint OTR fingerprint + Axolotl fingerprint + Other own Axolotl Devices Verify Decrypt Conferences @@ -313,6 +315,7 @@ Conference name Use room’s subject instead of JID to identify conferences OTR fingerprint copied to clipboard! + Axolotl fingerprint copied to clipboard! You are banned from this conference This conference is members only You have been kicked from this conference @@ -379,6 +382,9 @@ Reset Account avatar Copy OTR fingerprint to clipboard + Copy Axolotl fingerprint to clipboard + Copy Axolotl fingerprint to clipboard + Wipe other devices from PEP Fetching history from server No more history on server Updating… -- cgit v1.2.3 From 2628662a7f374dc7cbb01869afb6f5f8fdf5f619 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Wed, 8 Jul 2015 18:14:28 +0200 Subject: Display axolotl chat message hint --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values/strings.xml') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 60ca5613..6808f1bb 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -80,6 +80,7 @@ Choose presence to contact Send plain text message Send OTR encrypted message + Send Axolotl encrypted message Send OpenPGP encrypted message Your nickname has been changed Send unencrypted -- cgit v1.2.3 From 6f67469bda0ffe97cb8cd8d400affed5a17c34c5 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Sun, 19 Jul 2015 14:09:49 +0200 Subject: Refactor trust key ui and show in account details Refactored the trust key row UI element so it can be used in multiple places. It now also uses a slider to toggle the trust state, and the redundant trust state description was removed. EditAccountActivity now shows the keys of other devices associated with that account. --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values/strings.xml') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6808f1bb..f4c75ee1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -209,6 +209,8 @@ Your fingerprint OTR fingerprint Axolotl fingerprint + Own Axolotl fingerprint + Other devices Other own Axolotl Devices Verify Decrypt -- cgit v1.2.3 From 14010bf5a6198e4e53ba3f86328d061cf20b8da1 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Sun, 19 Jul 2015 18:36:28 +0200 Subject: Ask for key trust when sending messages If the contact (or the own account) has keys that have UNDECIDED trust, we now drop the user into the new TrustKeysActivity, where they have to decide for each new key whether it should be TRUSTED or UNTRUSTED. --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values/strings.xml') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index f4c75ee1..8537c118 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -211,6 +211,9 @@ Axolotl fingerprint Own Axolotl fingerprint Other devices + Trust Axolotl Keys + Fetching keys... + Done Other own Axolotl Devices Verify Decrypt -- cgit v1.2.3 From 480b1cde810e0ed2afc6ea424fb36fd973ae24b9 Mon Sep 17 00:00:00 2001 From: Andreas Straub Date: Sun, 19 Jul 2015 23:35:03 +0200 Subject: Add clear devices to overflow menu in EditAccount --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/res/values/strings.xml') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 8537c118..0f992884 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -391,6 +391,8 @@ Copy Axolotl fingerprint to clipboard Copy Axolotl fingerprint to clipboard Wipe other devices from PEP + Clear devices + Are you sure you want to clear all other devices from the axolotl announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime. Fetching history from server No more history on server Updating… -- cgit v1.2.3