index
:
conversations
BrianBlade-feature/swipe_out_conversation
CryptoNextAlpha
CryptoNextBeta
JingleFixes
MessageParserNext
UnreadCountBadge
cbe
delay_fixes
development
dnsfixes
feature/file_transfer
feature/foreground_service
feature/http_upload
feature/mam
feature/otr_verification
idn_fixes
issue921
lolipop_dns_server_discovery
master
more_logging_for_view_intent
muc_vcard_avatars
nfc
possible_copperhead_fixes
reworked_host_finder_loop
show_members_in_conference
show_send_button_in_softkeyboard
six_love
slack_workaround
tor_support
travis-fixes
travis_fixes
trz/emojicon-merge
trz/emojicon-new
trz/master
trz/merge_1.10.0
trz/merge_1.10.1
trz/merge_1.11.0
trz/merge_1.11.1
trz/merge_1.11.7
trz/merge_1.12.4
trz/merge_1.5.2
trz/merge_1.6.3
trz/merge_1.9.3
trz/merge_1.9.4
trz/rebase
trz/rename
trz/test
verbose_login_log
copy of conversations repo
lookshe
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
src
/
main
/
java
/
eu
/
siacs
/
conversations
/
crypto
/
OtrService.java
(
unfollow
)
Commit message (
Expand
)
Author
Files
Lines
2016-05-25
sending warning to receiving client if that client doesn't support omemo.
Daniel Gultsch
1
-1
/
+1
2015-09-01
use same method to add message hints to otr message everywhere it is needed
Daniel Gultsch
1
-4
/
+2
2015-07-21
and now do that properly
Daniel Gultsch
1
-1
/
+1
2015-07-21
and now do that properly
Daniel Gultsch
1
-1
/
+1
2015-07-21
bugfix: also add no-permanent-storage to message hints
Daniel Gultsch
1
-1
/
+1
2015-07-21
bugfix: also add no-permanent-storage to message hints
Daniel Gultsch
1
-1
/
+1
2015-07-20
Optimize imports
Andreas Straub
1
-16
/
+15
2015-05-26
renamed OtrEngine to OtrService
Daniel Gultsch
1
-3
/
+3
2015-04-21
OTR: Fix onContactStatusChanged & dont archive OTR
BrianBlade
1
-1
/
+1
2015-04-01
Fix OTR-Error messages
BrianBlade
1
-16
/
+22
2015-03-21
respond to unreadable OTR messages with error message. fixed #1021
iNPUTmice
1
-3
/
+15
2015-02-21
added typing notifications through XEP-0085. fixed #210
iNPUTmice
1
-0
/
+14
2015-01-20
otr4j: update to 0.22
Michael
1
-0
/
+6
2015-01-02
some further otr improvements
Daniel Gultsch
1
-1
/
+1
2015-01-02
improved OTR verification part one
Daniel Gultsch
1
-3
/
+3
2014-12-10
mark otr messages as no-store for mam
iNPUTmice
1
-0
/
+1
2014-11-21
verify contacts key only on initiating side of smp
iNPUTmice
1
-3
/
+7
2014-11-11
initial smp support
iNPUTmice
1
-17
/
+55
2014-11-10
initial smp support
iNPUTmice
1
-17
/
+55
2014-11-09
Rework `Account.getJid()' to return full JIDs
Sam Whited
1
-1
/
+1
2014-11-09
Move a chunk of classes over to using JID objects
Sam Whited
1
-6
/
+4
2014-10-22
Make conversations the root project
Sam Whited
1
-0
/
+0