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
/
services
/
XmppConnectionService.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Compile Clean after merge
trz/merge_1.5.2
steckbrief
2015-08-11
1
-0
/
+3
*
Merged 1.5.2 into trz/master with conflicts resolved
steckbrief
2015-08-11
1
-228
/
+385
|
\
|
*
bugfix: use sendIqPacket method in service instead of invoking XmppConnection...
Daniel Gultsch
2015-07-21
1
-3
/
+2
|
*
only try to change affilations for known jids
Daniel Gultsch
2015-07-11
1
-1
/
+1
|
*
renamed downloadable to transferable
Daniel Gultsch
2015-07-10
1
-5
/
+4
|
*
display toast in ui on failed http download
Daniel Gultsch
2015-07-10
1
-4
/
+44
|
*
refactored sendMessage and merged with resendMessage
Daniel Gultsch
2015-07-05
1
-148
/
+97
|
*
make sure unread count is initialized as 0. fixes #1270
Daniel Gultsch
2015-07-03
1
-1
/
+2
|
*
fixed share with activity to account for http file upload
Daniel Gultsch
2015-07-02
1
-3
/
+4
|
*
show attach button in conferences when http upload is available
Daniel Gultsch
2015-06-29
1
-3
/
+2
|
*
initial http upload support
Daniel Gultsch
2015-06-29
1
-29
/
+37
|
*
made i/o and memory intensive operations execute in serial order
Daniel Gultsch
2015-06-05
1
-11
/
+18
|
*
reworked handeling of system contacts
Daniel Gultsch
2015-06-03
1
-3
/
+12
|
*
removed unnecessary / inacurate debug logging
Daniel Gultsch
2015-05-26
1
-2
/
+1
|
*
update unread count badge only when necessary
Daniel Gultsch
2015-05-26
1
-7
/
+11
|
*
added default iq handler to print some iq error messages
Daniel Gultsch
2015-05-26
1
-4
/
+16
|
*
renamed OtrEngine to OtrService
Daniel Gultsch
2015-05-26
1
-3
/
+3
|
*
Merge branch 'master' into development
Daniel Gultsch
2015-05-25
1
-4
/
+11
|
|
\
|
|
*
log connection age and reshedule ping check
Daniel Gultsch
2015-05-25
1
-4
/
+11
|
*
|
added ShortcutBadger as a dependency to create unread counts on launcher icon
Daniel Gultsch
2015-05-20
1
-6
/
+18
|
*
|
provide helper function for getting the content of a child directly
Daniel Gultsch
2015-05-20
1
-2
/
+1
|
|
/
|
*
let jingle connection and manager handle message status
Daniel Gultsch
2015-05-16
1
-4
/
+0
|
*
clear avatar cache when uploading new avatar
Daniel Gultsch
2015-05-13
1
-0
/
+1
|
*
handle conference invites differently to deal with killed activities. fixes #...
Daniel Gultsch
2015-05-12
1
-0
/
+1
|
*
config option to reset attempt counts when changing network (default=true)
Daniel Gultsch
2015-05-08
1
-8
/
+18
|
*
fixed npe when binval value of vcard avatar is null
Daniel Gultsch
2015-05-07
1
-2
/
+3
|
*
avoid fetching avatars multiple times in parallel
Daniel Gultsch
2015-05-05
1
-8
/
+39
|
*
r/o support for vcard avatars. pep avatars will be prefered
Daniel Gultsch
2015-05-05
1
-9
/
+44
|
*
Merge pull request #1146 from BrianBlade/minor_otr_tweaks
Daniel Gultsch
2015-04-25
1
-5
/
+15
|
|
\
|
|
*
OTR: Fix onContactStatusChanged & dont archive OTR
BrianBlade
2015-04-21
1
-5
/
+15
|
*
|
send invite to other instanzes after creating ad hoc conference. fixes #1136
Daniel Gultsch
2015-04-23
1
-0
/
+8
|
|
/
|
*
Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...
iNPUTmice
2015-04-14
1
-3
/
+16
|
|
\
|
|
*
Add option to use MTM without default TrustManager
BrianBlade
2015-04-11
1
-3
/
+16
|
*
|
don't resume old session when changing resource
iNPUTmice
2015-04-09
1
-0
/
+5
|
*
|
Enable end-conversation by swipe gesture
BrianBlade
2015-04-08
1
-0
/
+1
|
|
/
*
|
changed received and read confirmation setting to one list and put it to sett...
lookshe
2015-04-14
1
-9
/
+1
*
|
implementation for downloading only when enabled wlan
lookshe
2015-04-12
1
-0
/
+20
*
|
differ between received and read message
lookshe
2015-04-11
1
-1
/
+5
|
/
*
# add delivery receipts for private muc msgs
BrianBlade
2015-03-18
1
-1
/
+1
*
display geo uris as location. show 'send loction' in share menu if request lo...
iNPUTmice
2015-03-07
1
-0
/
+18
*
avoid unnecessary thread creation
iNPUTmice
2015-03-05
1
-16
/
+21
*
added methods to count number of unread messages
Daniel Gultsch
2015-03-02
1
-0
/
+8
*
mark all sent messages up to a marker as displayed
Daniel Gultsch
2015-03-01
1
-9
/
+10
*
reset incoming chat state when going into background
iNPUTmice
2015-02-23
1
-0
/
+3
*
added typing notifications through XEP-0085. fixed #210
iNPUTmice
2015-02-21
1
-0
/
+22
*
always go through reconnect method instead of just starting XmppConnection th...
iNPUTmice
2015-02-18
1
-4
/
+1
*
moved roster loading to async task as well
iNPUTmice
2015-02-17
1
-10
/
+22
*
load messages asynchronously
iNPUTmice
2015-02-12
1
-2
/
+18
*
added actions to error notification
iNPUTmice
2015-02-10
1
-0
/
+24
*
adapt caps on whether or not message confirmation is on
iNPUTmice
2015-01-26
1
-1
/
+5
[next]