aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-5/+3
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-091-8/+6
|\|
* | Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-1/+1
|\ \
| * | save otr fingerprint in messageDaniel Gultsch2016-03-311-1/+1
* | | 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
* | | Fixed merge issue for resolving FS#47 (preferences involved in the decision f...steckbrief2016-02-241-1/+1
* | | Imports organizedsteckbrief2016-02-121-8/+0
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-0/+1
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-39/+119
|\| |
| * | request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-1/+2
| * | 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-251-0/+2
| * | code clean upDaniel Gultsch2015-10-121-2/+1
| * | introduce special iq type for internal timeouts. always use != result to chec...Daniel Gultsch2015-08-231-5/+4
| * | 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-101-1/+4
| * | 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-011-19/+78
| * | rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-5/+1
| * | Optimize importsAndreas Straub2015-07-201-6/+7
| * | 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-171-1/+1
| * | renamed downloadable to transferableDaniel Gultsch2015-07-101-16/+15
| * | initial http upload supportDaniel Gultsch2015-06-291-20/+0
| * | don't offer initiator his own candidatesDaniel Gultsch2015-05-181-2/+4
| * | let jingle connection and manager handle message statusDaniel Gultsch2015-05-161-0/+4
| * | fixed encrypted ibb file transfer which was broken with ART. fixes #1172Daniel Gultsch2015-05-071-1/+1
| * | use xmppserviceconnection to send iq packets in jingle connectionDaniel Gultsch2015-04-261-4/+4
| * | some bug fixes concerning 0byte files. fixes #1126iNPUTmice2015-04-151-1/+1
* | | 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-101-1/+1
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-35/+35
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-061-5/+4
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-3/+5
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-971/+0
* | | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-45/+33
|/ /
* / implementation for downloading only when enabled wlanlookshe2015-04-121-2/+2
|/
* set jingle file transfer to offer after iq offer has returnediNPUTmice2015-01-251-6/+17
* keep proper image file extensionDaniel Gultsch2015-01-111-8/+8
* code cleanup for jingle proxy discoveryDaniel Gultsch2015-01-091-52/+39
* mark sent images as sent_received instead of sentDaniel Gultsch2015-01-061-2/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 20:13:25 +0000