sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed small typos (#2933) 

* Fixed typo when removing OTR

There are two encrypt methods avaliable now

* Deleting a repeated resource
This commit is contained in:
esu23 2018-04-02 16:49:00 +02:00 committed by Daniel Gultsch
parent a4dc7eb3ee
commit cc54f02ab3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -288,7 +288,7 @@ I am available for hire. Contact me via XMPP: `inputmice@siacs.eu`
### Security ### 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). * 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. * 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.

3
src/main/res/values/about.xml
View File

@ -51,7 +51,6 @@
\n\nhttps://github.com/rtreffer/minidns\n(WTFPL) \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://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://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/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/timroes/EnhancedListView\n(Apache License, Version 2.0)
\n\nhttps://github.com/leolin310148/ShortcutBadger\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/jdamcd/android-crop\n(Apache License, Version 2.0)
\n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
</string> </string>
</resources> </resources>