From 08174e3b0585c0dddd1cfc1d9bf60d84a8b6d5db Mon Sep 17 00:00:00 2001 From: Safwat Halaby Date: Sat, 10 Oct 2015 12:03:25 +0300 Subject: [PATCH 1/3] Fixed a typo in string.xml --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 37263ed4f..5be800883 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -76,7 +76,7 @@ Clear Conversation History Do you want to delete all messages within this Conversation?\n\nWarning: This will not influence messages stored on other devices or servers. Delete messages - End this conversations afterwards + End this conversation afterwards Choose presence to contact Send unencrypted message Send OTR encrypted message From 0cfc1a738e7e4c94aa3952b2d83bf8329779e3e8 Mon Sep 17 00:00:00 2001 From: Safwat Halaby Date: Sat, 10 Oct 2015 14:16:24 +0300 Subject: [PATCH 2/3] Update build system in README Fixes #1479. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9e2444345..080b6a58b 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ Translations are managed on [Transifex](https://www.transifex.com/projects/p/con #### How do I install Conversations? Conversations is entirely open source and licensed under GPLv3. So if you are a -software developer you can check out the sources from GitHub and use ant to +software developer you can check out the sources from GitHub and use Gradle to build your apk file. The more convenient way — which not only gives you automatic updates but also From 0407111416add09a6c7a4c27177bfdbb01573845 Mon Sep 17 00:00:00 2001 From: Safwat Halaby Date: Sat, 10 Oct 2015 14:31:34 +0300 Subject: [PATCH 3/3] Added OMEMO to Readme --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 080b6a58b..3932c4da6 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Conversations: the very last word in instant messaging ## Features -* End-to-end encryption with either [OTR](https://otr.cypherpunks.ca/) or [OpenPGP](http://www.openpgp.org/about_openpgp/) +* End-to-end encryption with [OMEMO](http://conversations.im/omemo/), [OTR](https://otr.cypherpunks.ca/), or [OpenPGP](http://www.openpgp.org/about_openpgp/) * Send and receive images as well as other kind of files * Share your location via an external [plug-in](https://play.google.com/store/apps/details?id=eu.siacs.conversations.sharelocation&referrer=utm_source%3Dgithub) * Indication when your contact has read your message @@ -236,11 +236,9 @@ I am available for hire. Contact me via XMPP: `inputmice@siacs.eu` ### Security -#### Why are there two end-to-end encryption methods and which one should I choose? +#### Why are there three end-to-end encryption methods and which one should I choose? -In most cases OTR should be the encryption method of choice. It works out of the -box with most contacts as long as they are online. However PGP can, in some -cases, (message carbons to multiple clients) be more flexible. +In most cases OTR should be the encryption method of choice. It works out of the box with most contacts as long as they are online. However, openPGP can, in some cases, (message carbons to multiple clients) be more flexible. Unlike OTR, OMEMO works even when a contact is offline, and works with multiple devices. It also allows asynchronous file-transfer when the server has [HTTP File Upload](http://xmpp.org/extensions/xep-0363.html). However, OMEMO is not as widely supported as OTR and is currently implemented only by Conversations. OMEMO should be preffered over OTR for contacts who use Conversations. #### How do I use OpenPGP