9 commits

Author	SHA1	Message	Date
Michael	fa7d748c3f	otr4j: update to 0.22	2015-01-20 18:01:39 +01:00
Daniel Gultsch	1988e244ef	some further otr improvements	2015-01-02 15:14:06 +01:00
Daniel Gultsch	3833e6dfef	improved OTR verification part one	2015-01-02 01:21:14 +01:00
iNPUTmice	f2510ae9f6	mark otr messages as no-store for mam	2014-12-10 14:08:06 +01:00
iNPUTmice	de0b36fc78	verify contacts key only on initiating side of smp	2014-11-21 13:42:25 +01:00
iNPUTmice	6cd2ff0d88	initial smp support	2014-11-11 17:40:51 +01:00
Sam Whited	180a0e4408	Rework `Account.getJid()' to return full JIDs ... Remove `Account.getFullJid()'	2014-11-09 10:57:22 -05:00
Sam Whited	9053f4aca0	Move a chunk of classes over to using JID objects	2014-11-09 07:00:40 -05:00
Sam Whited	281ce3105f	Make conversations the root project	2014-10-22 15:47:11 -04:00

Renamed from conversations/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java (Browse further)