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
/
xmpp
/
jingle
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge tag '1.6.3' into trz/rebase
trz/merge_1.6.3
lookshe
2015-08-24
6
-87
/
+170
|
\
|
*
introduce special iq type for internal timeouts. always use != result to chec...
Daniel Gultsch
2015-08-23
2
-6
/
+5
|
*
do not touch pictures that are already in the right format
Daniel Gultsch
2015-08-11
1
-19
/
+25
|
*
put wake locks on out of band file transfers
Daniel Gultsch
2015-08-10
2
-25
/
+17
|
*
report wrong file size in otr encrypted jingle file transfers to be compatibl...
Daniel Gultsch
2015-08-10
1
-2
/
+6
|
*
fixed image preview in notfications for images that arrived over jingle
Daniel Gultsch
2015-08-08
1
-6
/
+4
|
*
enable axolotl encryption for jingle supported file transfers
Daniel Gultsch
2015-08-01
5
-85
/
+94
|
*
use gcm for file encryption over http
Daniel Gultsch
2015-07-29
3
-4
/
+77
|
*
rely on refreshUi/refreshUiReal and make sure it is being used everywhere
Daniel Gultsch
2015-07-20
1
-5
/
+1
|
*
Optimize imports
Andreas Straub
2015-07-20
3
-12
/
+15
|
*
bugfix: don't crash if aes key could not be set before jingle transfer
Daniel Gultsch
2015-07-19
1
-1
/
+4
|
*
increased ibb block size
Daniel Gultsch
2015-07-17
2
-4
/
+2
|
*
renamed downloadable to transferable
Daniel Gultsch
2015-07-10
2
-19
/
+17
|
*
initial http upload support
Daniel Gultsch
2015-06-29
2
-24
/
+4
|
*
properly calculate remaining size. should fix #1243
Daniel Gultsch
2015-06-03
1
-2
/
+7
|
*
use a 20s timeout on socks5 connections
Daniel Gultsch
2015-05-18
1
-2
/
+5
|
*
don't offer initiator his own candidates
Daniel Gultsch
2015-05-18
1
-2
/
+4
|
*
let jingle connection and manager handle message status
Daniel Gultsch
2015-05-16
2
-0
/
+10
|
*
always log reason for failed file transfer
Daniel Gultsch
2015-05-14
2
-2
/
+18
|
*
fixed encrypted ibb file transfer which was broken with ART. fixes #1172
Daniel Gultsch
2015-05-07
2
-26
/
+33
|
*
use xmppserviceconnection to send iq packets in jingle connection
Daniel Gultsch
2015-04-26
1
-4
/
+4
|
*
cleaned up file handling
Daniel Gultsch
2015-04-25
2
-10
/
+10
|
*
some bug fixes concerning 0byte files. fixes #1126
iNPUTmice
2015-04-15
2
-1
/
+2
*
|
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
4
-88
/
+111
*
|
implementation for downloading only when enabled wlan
lookshe
2015-04-12
1
-2
/
+2
|
/
*
set jingle file transfer to offer after iq offer has returned
iNPUTmice
2015-01-25
1
-6
/
+17
*
keep proper image file extension
Daniel Gultsch
2015-01-11
1
-8
/
+8
*
code cleanup for jingle proxy discovery
Daniel Gultsch
2015-01-09
3
-99
/
+71
*
mark sent images as sent_received instead of sent
Daniel Gultsch
2015-01-06
1
-2
/
+1
*
made checks for valid image extensions case insensitive
Daniel Gultsch
2015-01-04
1
-1
/
+1
*
Make IqPacket type an enum
Sam Whited
2015-01-04
3
-14
/
+14
*
Fix typo in method name
Sam Whited
2014-12-29
3
-6
/
+6
*
Make account status an enum
Sam Whited
2014-11-15
1
-1
/
+1
*
better cleanup after unsuccesful transfers
iNPUTmice
2014-11-15
3
-1
/
+35
*
fixed description in notifications and conversation overview
iNPUTmice
2014-11-15
1
-3
/
+10
*
fixed resending for files as well
iNPUTmice
2014-11-15
1
-0
/
+1
*
made file transfers cancelable
iNPUTmice
2014-11-15
3
-20
/
+48
*
progress for ibb transfers
iNPUTmice
2014-11-15
4
-13
/
+25
*
some mime and pgp fixes for file transfer
iNPUTmice
2014-11-15
1
-1
/
+20
*
support for pgp files
iNPUTmice
2014-11-15
1
-0
/
+2
*
progress for http images as well. fixed open button for sent files
iNPUTmice
2014-11-15
1
-2
/
+6
*
bug fixes and various improvements for file transfer
iNPUTmice
2014-11-15
1
-7
/
+4
*
basic arbitrary file transfer
iNPUTmice
2014-11-15
2
-55
/
+84
*
more refactoring for presence selection. removed getTo, getFrom and getJid fr...
iNPUTmice
2014-11-10
1
-1
/
+1
*
Rework `Account.getJid()' to return full JIDs
Sam Whited
2014-11-09
3
-14
/
+14
*
refactored code to always contain full jid for counterpart
iNPUTmice
2014-11-09
1
-1
/
+1
*
Update more files to use JID objects
Sam Whited
2014-11-09
5
-40
/
+52
*
Merge branch 'gradle' into development
Sam Whited
2014-10-30
2
-16
/
+13
*
Make conversations the root project
Sam Whited
2014-10-22
13
-0
/
+1873