16 Commits

Author	SHA1	Message	Date
iNPUTmice	a8ec36cda8	limit ui refresh rate	2015-02-17 14:18:35 +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	de0b36fc78	verify contacts key only on initiating side of smp	2014-11-21 13:42:25 +01:00
iNPUTmice	2067b9bd8d	made scan and show qr code more accessible in VerifyOtrActivity	2014-11-16 02:10:29 +01:00
iNPUTmice	88c3537b68	parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible	2014-11-16 00:20:20 +01:00
Sam Whited	d94b07c916	Make account status an enum	2014-11-15 11:12:41 -05:00
iNPUTmice	f1e2be4096	check if account is online before doing smp	2014-11-12 12:45:59 +01:00
iNPUTmice	52ca2e7391	Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification ... Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java	2014-11-11 17:45:16 +01:00
iNPUTmice	d1bf9a3f6d	use auto register for verify otr listeners	2014-11-11 17:42:09 +01:00
iNPUTmice	76f4cf1a73	small bug fix	2014-11-11 17:40:51 +01:00
iNPUTmice	e33fc26cbe	added snackbar to indicate smp. more error handling in verify activity	2014-11-11 17:40:51 +01:00
iNPUTmice	6cd2ff0d88	initial smp support	2014-11-11 17:40:51 +01:00
iNPUTmice	8cb97f517f	small bug fix	2014-11-10 23:47:04 +01:00
iNPUTmice	dc98b3dbd5	added snackbar to indicate smp. more error handling in verify activity	2014-11-10 22:03:23 +01:00
iNPUTmice	8740b55d37	initial smp support	2014-11-10 19:23:54 +01:00