From cc54f02ab333a86b93cb616ca25e0b4d19f93dd0 Mon Sep 17 00:00:00 2001 From: esu23 Date: Mon, 2 Apr 2018 16:49:00 +0200 Subject: [PATCH] Fixed small typos (#2933) * Fixed typo when removing OTR There are two encrypt methods avaliable now * Deleting a repeated resource --- README.md | 2 +- src/main/res/values/about.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 940fede3a7b0d26fca7c0705b3916e0e761b6847..cc40de4c2cd420307f458e0d93a683ab40199fa9 100644 --- a/README.md +++ b/README.md @@ -288,7 +288,7 @@ I am available for hire. Contact me via XMPP: `inputmice@siacs.eu` ### Security -#### Why are there three end-to-end encryption methods and which one should I choose? +#### Why are there two end-to-end encryption methods and which one should I choose? * 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 not widely support and is currently implemented only implemented [by a handful of clients](https://omemo.top). * OpenPGP (XEP-0027) is a very old encryption method that has some advantages over OMEMO but should only be used by people who what they are doing. diff --git a/src/main/res/values/about.xml b/src/main/res/values/about.xml index 648e96e3f9eaa3a98138b6db7cad3a8ed955860d..239ab204987856ed04ee1323fd066e26b1a62f55 100644 --- a/src/main/res/values/about.xml +++ b/src/main/res/values/about.xml @@ -51,7 +51,6 @@ \n\nhttps://github.com/rtreffer/minidns\n(WTFPL) \n\nhttps://github.com/open-keychain/openkeychain-api-lib\n(Apache License, Version 2.0) \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) - \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) \n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0) \n\nhttps://github.com/leolin310148/ShortcutBadger\n(Apache License, Version 2.0) @@ -60,4 +59,4 @@ \n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) - \ No newline at end of file +