Commit Graph

8 Commits

Author SHA1 Message Date
Paul Schaub ce5b5f88ef
Rebase on master 2018-06-09 14:29:18 +02:00
Paul Schaub 50f8a4f1fe Reimplement encryption, solve compiler errors 2018-06-09 13:59:36 +02:00
Paul Schaub 2db7717abc Temp commit 2018-06-09 13:59:01 +02:00
Paul Schaub b0acf0bcc3 Temp commit 2018-06-09 13:57:51 +02:00
Paul Schaub 85171ee71b Temp commit 2018-06-09 13:53:04 +02:00
Florian Schmaus 5ab2903c32 Change Element.toXml() to toXml(String enclosingNamespace) 2018-04-27 10:05:25 +02:00
Florian Schmaus 08e897113d Add CustomImportOrder checkstyle rule
And matching ImportOrder settings for Eclipse in
resources/eclipse/smack.importorder
2017-06-14 17:12:43 +02:00
vanitasvitae e86700b040 Add OMEMO support
This commit adds the modules smack-omemo and smack-omemo-signal.
smack-omemo is licensed under the Apache license like the rest of the smack project.
smack-omemo-signal on the other hand is licensed under the GPLv3.
Due to the fact, that smack-omemo is not of much use without smack-omemo-signal,
the OMEMO feature can currently only be used by GPLv3 compatible software.
This may change in the future, when a more permissively licensed module becomes available.

Fixes SMACK-743.
2017-06-02 13:40:10 +02:00