aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle (follow)
Commit message (Expand)AuthorAgeFilesLines
* FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-3/+1
|\
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-4/+1
| * only add image files to media scannerDaniel Gultsch2016-03-231-3/+1
* | removed duplicated sourcelookshe2016-03-121-21/+10
* | Added method to get body from message if hasMeCommand and harmonized extracti...lookshe2016-03-121-20/+27
* | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-4/+4
|\|
| * add a few more know file extensionsDaniel Gultsch2016-03-041-3/+3
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-1/+1
* | Fixes FS#151 - Missing button on image-linkslookshe2016-03-071-1/+2
* | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-8/+4
* | Fixed merge issue for resolving FS#47 (preferences involved in the decision f...steckbrief2016-02-241-1/+1
* | Imports organizedsteckbrief2016-02-124-23/+0
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-0/+1
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-118-109/+172
|\|
| * request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-1/+2
| * refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-011-29/+13
| * initial tor supportDaniel Gultsch2015-12-011-1/+5
| * fail jingle file transfer if axolotl key message could not be created. fixes ...Daniel Gultsch2015-11-261-1/+5
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-252-1/+3
| * code clean upDaniel Gultsch2015-10-124-7/+5
| * request stanza count after every ibb data stanza to not fill our own stanza q...Daniel Gultsch2015-09-301-0/+1
| * remove unused imports.Michael2015-08-251-26/+0
| * introduce special iq type for internal timeouts. always use != result to chec...Daniel Gultsch2015-08-232-6/+5
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-111-19/+25
| * put wake locks on out of band file transfersDaniel Gultsch2015-08-102-25/+17
| * report wrong file size in otr encrypted jingle file transfers to be compatibl...Daniel Gultsch2015-08-101-2/+6
| * fixed image preview in notfications for images that arrived over jingleDaniel Gultsch2015-08-081-6/+4
| * enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-015-85/+94
| * use gcm for file encryption over httpDaniel Gultsch2015-07-293-4/+77
| * rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-5/+1
| * Optimize importsAndreas Straub2015-07-203-12/+15
| * bugfix: don't crash if aes key could not be set before jingle transferDaniel Gultsch2015-07-191-1/+4
| * increased ibb block sizeDaniel Gultsch2015-07-172-4/+2
| * renamed downloadable to transferableDaniel Gultsch2015-07-102-19/+17
| * initial http upload supportDaniel Gultsch2015-06-292-24/+4
| * properly calculate remaining size. should fix #1243Daniel Gultsch2015-06-031-2/+7
| * use a 20s timeout on socks5 connectionsDaniel Gultsch2015-05-181-2/+5
| * don't offer initiator his own candidatesDaniel Gultsch2015-05-181-2/+4
| * let jingle connection and manager handle message statusDaniel Gultsch2015-05-162-0/+10
| * always log reason for failed file transferDaniel Gultsch2015-05-142-2/+18
| * fixed encrypted ibb file transfer which was broken with ART. fixes #1172Daniel Gultsch2015-05-072-26/+33
| * use xmppserviceconnection to send iq packets in jingle connectionDaniel Gultsch2015-04-261-4/+4
| * cleaned up file handlingDaniel Gultsch2015-04-252-10/+10
| * some bug fixes concerning 0byte files. fixes #1126iNPUTmice2015-04-152-1/+2
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-1/+2
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-104-5/+6
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-024-55/+55
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-063-9/+12
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-3/+5
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1913-1997/+0