7 commits

Author	SHA1	Message	Date
Daniel Gultsch	eed2d93145	integrate intent integrator to finish activity when needed	2018-02-12 11:22:51 +01:00
Daniel Gultsch	cbce73c301	fixed fingerprint trust (was messed up after library upgrade)	2017-06-25 18:18:13 +02:00
Daniel Gultsch	b0a8da35db	add ability to distrust inactive/trusted keys	2017-05-06 18:38:23 +02:00
cijo-saju	5a27da848b	Clean up	2017-04-08 11:04:20 +05:30
Haresh Khanna	c7912ed7ef	Changes the deprecated getColor() method	2017-03-29 22:05:35 +05:30
Daniel Gultsch	bfacc180c5	don't allow to purge keys. offer distrut instead	2017-01-12 15:59:13 +01:00
Daniel Gultsch	87746ca2ba	remove own fetch errors from device announcement	2016-12-16 17:12:26 +01:00

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