aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Conversation.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵iNPUTmice2014-11-161-4/+2
| | | | shareable uri where ever possible
* added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-111-0/+4
|
* initial smp supportiNPUTmice2014-11-111-2/+28
|
* refactored code to always contain full jid for counterpartiNPUTmice2014-11-091-5/+5
|
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-34/+40
|
* Make conversations the root projectSam Whited2014-10-221-0/+500