From f0b1761ec3826b72fe3b20032b532dc5b1adfc1c Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 28 Nov 2015 20:11:38 +0100 Subject: initial tor support --- src/main/res/values/strings.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index fa484a825..eaff35341 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -540,4 +540,12 @@ Error fetching OMEMO key! Verified OMEMO key with certificate! Your device does not support the selection of client certificates! + Connection options + Connect via Tor + Tunnel all connections through the TOR network. Requires Orbot + Hostname + Port + Server- or .onion-Address + This is not a valid port number + This is not a valid hostname -- cgit v1.2.3 From 2225b0b6d5586d608b15d4e1ac13faa99b8971bf Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 30 Nov 2015 16:01:48 +0100 Subject: add error state for unavailable tor network --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index eaff35341..9f2573637 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -521,7 +521,7 @@ Download failed: Could not connect to host Use white background Show received messages as black text on a white background - Timeout in DNS + TOR network unavailable Broken Presence settings Away when screen is off -- cgit v1.2.3 From 65b5504e68e36116234bd69126304d6d764b678b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 1 Dec 2015 17:15:36 +0100 Subject: introduce config.java variable to optionally show number of connected accounts in notification --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 9f2573637..e312bd59d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -548,4 +548,5 @@ Server- or .onion-Address This is not a valid port number This is not a valid hostname + %1$d of %2$d accounts connected -- cgit v1.2.3 From e1aeb376ac80af214947143572cc381660fe3023 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 4 Nov 2015 21:08:06 -0600 Subject: =?UTF-8?q?s/.../=E2=80=A6/=20in=20default=20strings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e312bd59d..5b3ef186f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -218,7 +218,7 @@ Own OMEMO fingerprint Other devices Trust OMEMO Fingerprints - Fetching keys... + Fetching keys… Done Verify Decrypt @@ -478,7 +478,7 @@ Offering %s Hide offline Disable Account - %s is typing... + %s is typing… %s has stopped typing Typing notifications Let your contact know when you are writing a new message -- cgit v1.2.3 From 8455e5b5dd82371d58b2d5e7474779cd6ee5d5f3 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 2 Dec 2015 12:54:55 +0100 Subject: hide message content in notifications in paranoia mode --- src/main/res/values/strings.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e312bd59d..69f964d70 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -549,4 +549,8 @@ This is not a valid port number This is not a valid hostname %1$d of %2$d accounts connected + + %d message + %d messages + -- cgit v1.2.3 From 0329c9c7384b4518514555fca70a968241acb1be Mon Sep 17 00:00:00 2001 From: Philip Flohr Date: Fri, 6 Nov 2015 11:14:05 +0100 Subject: users are now able to crop their avatar pictures using the android-crop library --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 69f964d70..59c5e1c0f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -314,6 +314,7 @@ \n\nhttps://github.com/kyleduo/SwitchButton\n(Apache License, Version 2.0) \n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3) \n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0) + \n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0) Quiet Hours Start time -- cgit v1.2.3 From 3553b15c9f018471172bfce83c536baf2812b6d4 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 2 Dec 2015 17:24:56 +0100 Subject: renamed x509 verified omemo to v\OMEMO --- src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 0726375d6..584b419f5 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -82,7 +82,7 @@ Send unencrypted message Send OTR encrypted message Send OMEMO encrypted message - Send OMEMO (X.509 verified) encrypted message + Send v\\OMEMO encrypted message Send OpenPGP encrypted message Your nickname has been changed Send unencrypted @@ -212,9 +212,9 @@ Your fingerprint OTR fingerprint OMEMO fingerprint - OMEMO fingerprint (X.509 verified) + v\\OMEMO fingerprint OMEMO fingerprint of message - OMEMO fingerprint (X.509 verified) of message + v\\OMEMO fingerprint of message Own OMEMO fingerprint Other devices Trust OMEMO Fingerprints -- cgit v1.2.3 From 739a2d609d15be7472575adb937e9a0b164dd4a9 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 6 Dec 2015 11:55:37 +0100 Subject: implement direct sharing in android 6.0. fixes #1321 --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 584b419f5..ffbb69ce1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -91,6 +91,7 @@ Conversations utilizes a third party app called OpenKeychain to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n(Please restart Conversations afterwards.) Restart Install + Please install OpenKeychain offering… waiting… No OpenPGP Key found @@ -554,4 +555,6 @@ %d message %d messages + Shared file with %s + Shared image with %s -- cgit v1.2.3 From c3e8fb3446237dee34bf49436076a10d07e2efdf Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 6 Dec 2015 18:23:59 +0100 Subject: request storage permission when needed on Android 6.0 --- src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ffbb69ce1..780460400 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -557,4 +557,5 @@ Shared file with %s Shared image with %s + Conversations need access to external storage -- cgit v1.2.3 From 739648e909446c83fe1474636b8465a7ef91cce2 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 7 Dec 2015 00:33:50 +0100 Subject: ask for contact permissions when first opening StartConversationActivity --- src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 780460400..25af5be12 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -558,4 +558,7 @@ Shared file with %s Shared image with %s Conversations need access to external storage + Synchronize with contacts + Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server. + Synchronize now -- cgit v1.2.3 From ac06cb2e4f8f4d2821265847376e651b08c38e31 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 7 Dec 2015 13:17:06 +0100 Subject: modified contact permission dialog --- src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/main/res/values') diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 25af5be12..d3cda8668 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -559,6 +559,5 @@ Shared image with %s Conversations need access to external storage Synchronize with contacts - Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server. - Synchronize now + Conversations wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts. -- cgit v1.2.3