aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/http (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-203-278/+25
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-091-2/+2
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+2
|\|
* | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-1/+0
|\ \
* \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-161-2/+7
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-1/+7
|\| |
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-252-10/+2
|\ \ \ | | |/ | |/|
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-232-14/+3
| * | only add image files to media scannerDaniel Gultsch2016-03-232-6/+2
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-21/+30
|\ \ \ | | |/ | |/|
* | | removed duplicated sourcelookshe2016-03-121-7/+3
* | | Added method to get body from message if hasMeCommand and harmonized extracti...lookshe2016-03-121-7/+12
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-68/+76
|\ \ \ | | |/ | |/|
| * | add a few more know file extensionsDaniel Gultsch2016-03-041-1/+1
* | | Fixes FS#151 - Missing button on image-linkslookshe2016-03-071-1/+3
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-022-22/+5
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-1/+2
|\| |
| * | use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-031-1/+2
* | | Fixed overwriting of changes for fixing FS#70. Unused method removed from gen...steckbrief2016-02-131-1/+2
* | | Imports organizedsteckbrief2016-02-123-10/+1
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-112-101/+179
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-112-26/+73
|\| |
| * | fix cancelation of http downloads and enable resumeDaniel Gultsch2015-12-111-8/+35
| * | request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-1/+1
| * | always use http proxy for http requests. (socks is leaking dns)Daniel Gultsch2015-12-011-5/+1
| * | initial tor supportDaniel Gultsch2015-12-013-3/+43
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-0/+3
| * | allow redownloading files from remote hosts. fixes #1504Daniel Gultsch2015-10-171-2/+11
| * | use Conversations 1.x.y as user agent string in http upload and downloadDaniel Gultsch2015-09-232-0/+3
| * | work around a NPE caused by arace condition in the http uploadDaniel Gultsch2015-09-151-3/+6
| * | do not touch pictures that are already in the right formatDaniel Gultsch2015-08-111-1/+8
| * | put wake locks on out of band file transfersDaniel Gultsch2015-08-102-0/+8
| * | provide more detailed error toasts for http file downloadDaniel Gultsch2015-08-101-37/+58
| * | use content-type in http slot request and stick with during uploadDaniel Gultsch2015-08-011-1/+4
| * | fixed calculated file size in http slot requestDaniel Gultsch2015-08-011-15/+13
| * | enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-012-35/+14
| * | use gcm for file encryption over httpDaniel Gultsch2015-07-292-11/+42
| * | changed logging. (work around logcat null pointerDaniel Gultsch2015-07-281-1/+1
| * | use 'interactive mode' when starting downloads from the context menuDaniel Gultsch2015-07-221-1/+0
| * | attempt to fix the delay problemDaniel Gultsch2015-07-202-5/+7
| * | rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-4/+1
| * | Optimize importsAndreas Straub2015-07-202-2/+2
| * | Encrypt files for HTTP upload in encrypted chatsAndreas Straub2015-07-192-3/+7
| * | bugfix: accept status code 201 on http uploadDaniel Gultsch2015-07-191-1/+1
| * | fixed inactive http downloadDaniel Gultsch2015-07-171-1/+1
| * | renamed HttpConnection to HttpDownloadConnectionDaniel Gultsch2015-07-102-15/+15
| * | renamed downloadable to transferableDaniel Gultsch2015-07-102-20/+12
| * | get file upload ready to work with httpsDaniel Gultsch2015-07-103-38/+53
| * | display toast in ui on failed http downloadDaniel Gultsch2015-07-102-25/+37
| * | made httpconnection (download) ready all kind of filesDaniel Gultsch2015-06-302-4/+4