aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* some further otr improvementsDaniel Gultsch2015-01-021-2/+8
|
* improved OTR verification part oneDaniel Gultsch2015-01-021-129/+171
|
* verify contacts key only on initiating side of smpiNPUTmice2014-11-211-3/+10
|
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-161-7/+101
|
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵iNPUTmice2014-11-161-2/+3
| | | | shareable uri where ever possible
* Make account status an enumSam Whited2014-11-151-1/+1
|
* check if account is online before doing smpiNPUTmice2014-11-121-11/+24
|
* Merge branch 'feature/otr_verification' of ↵iNPUTmice2014-11-111-1/+0
|\ | | | | | | | | | | | | https://github.com/siacs/Conversations into feature/otr_verification Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
| * small bug fixiNPUTmice2014-11-101-8/+3
| |
| * added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-101-47/+81
| |
| * initial smp supportiNPUTmice2014-11-101-0/+264
|
* use auto register for verify otr listenersiNPUTmice2014-11-111-9/+0
|
* small bug fixiNPUTmice2014-11-111-8/+3
|
* added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-111-47/+81
|
* initial smp supportiNPUTmice2014-11-111-0/+264