57 commits

Author	SHA1	Message	Date
Florian Schmaus	e87c463927	Merge pull request #147 from vanitasvitae/fixMUC ... Fix OMEMO MUC receiving	2017-07-03 11:48:03 +02:00
Florian Schmaus	3a79566f1c	OmemoManager: Fix typo s/defaulDeviceId/defaultDeviceId/	2017-07-03 11:07:26 +02:00
vanitasvitae	248e76ff46	Fix receiving OMEMO MUC messages ... The method OmemoManager.getSender() was faulty and returned null for MUC occupants, which lead to NPEs when receiving MUC messages with OMEMO.	2017-06-30 14:30:19 +02:00
Florian Schmaus	2b11074950	Merge branch '4.2'	2017-06-17 15:55:38 +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	28f3130cf9	Add Use of Cryptographic Hashfunctions (XEP-300) ... Also move bouncycastle dep from smack-omemo to smack-experimental.	2017-06-03 00:33:56 +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