Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger

2 files changed, 18 insertions, 0 deletions

diff --git a/art/Feature_OMEMO.png b/art/Feature_OMEMO.png
new file mode 100644
index 000000000..1afdb8d6e
--- /dev/null
+++ b/art/Feature_OMEMO.png
diff --git a/docs/encryption.md b/docs/encryption.md
new file mode 100644
index 000000000..edd7e6c5e
--- /dev/null
+++ b/docs/encryption.md
@@ -0,0 +1,18 @@
+Dear users,
+
+Pix-Art Messenger will remove the implementation of OTR encryption by 30th June of 2020. 
+
+Unfortunately, it does not make sense to continue support on a rather out-dated technology, even as we see some users keep using it. For the moment, OTR (as well as OpenPGP) can be activated via the expert settings for advanced users. Pix-Art Messenger always tries to be usable for even [non-technical users](https://github.com/kriztan/Pix-Art-Messenger/issues/227), OTR however is not counted as appropriate for this.
+
+Please consider to use OMEMO in the future, many other clients has implemented this, have a look at [omemo.top](https://omemo.top/). However, if you really need to continue using it, please refer to e.g. [Miranda](https://www.miranda-ng.org/de/), [Pidgin](https://pidgin.im/), [Profanity](https://profanity-im.github.io/). You are also able to fork Pix-Art Messenger and continue the implementation on your own.
+
+Please consider the differences between encryption protocols and also advantages of OMEMO: 
+
+<img src="https://github.com/kriztan/Pix-Art-Messenger/blob/master/art/Feature_OMEMO.png" width="400">
+Source: [https://conversations.im/omemo](https://conversations.im/omemo)
+
+Some limitations of OTR: [wikipedia.org/wiki/Off-the-Record](https://en.wikipedia.org/wiki/Off-the-Record_Messaging#Limitations)
+
+Please inform your contacts who may also use it.
+
+Mastodon: https://social.tchncs.de/@pixart