aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/http (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml
| * 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 ↵steckbrief2016-02-131-1/+2
| | | | | | | | generator classes.
* | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml CHANGELOG.md README.md art/render.rb build.gradle libs/openpgp-api-lib/build.gradle settings.gradle src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/entities/MucOptions.java src/main/java/eu/siacs/conversations/entities/Transferable.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/PhoneHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/utils/Xmlns.java src/main/java/eu/siacs/conversations/xml/XmlReader.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/drawable-hdpi/ic_launcher.png src/main/res/drawable-hdpi/ic_notification.png src/main/res/drawable-mdpi/ic_launcher.png src/main/res/drawable-mdpi/ic_notification.png src/main/res/drawable-xhdpi/ic_launcher.png src/main/res/drawable-xhdpi/ic_notification.png src/main/res/drawable-xxhdpi/ic_launcher.png src/main/res/drawable-xxhdpi/ic_notification.png src/main/res/drawable-xxxhdpi/ic_launcher.png src/main/res/drawable-xxxhdpi/ic_notification.png src/main/res/layout/account_row.xml src/main/res/layout/activity_about.xml src/main/res/layout/activity_change_password.xml src/main/res/layout/activity_contact_details.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/activity_publish_profile_picture.xml src/main/res/layout/activity_verify_otr.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/enter_jid_dialog.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/join_conference_dialog.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/layout/message_status.xml src/main/res/layout/quickedit.xml src/main/res/values-ar-rEG/strings.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fa-rIR/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-iw/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/values/themes.xml src/main/res/xml/preferences.xml
| * 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
| | | | | | | | fixed #522
| * 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
| | | | | | | | fixes #954
| * made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-302-4/+4
| |
| * untested pgp support for http uploadDaniel Gultsch2015-06-291-1/+22
| |
| * added trigger to Config.java to always enable aes encryption for uploaded filesDaniel Gultsch2015-06-291-0/+13
| |
| * show attach button in conferences when http upload is availableDaniel Gultsch2015-06-291-0/+1
| |
| * initial http upload supportDaniel Gultsch2015-06-293-6/+177
| | | | | | | | be careful: little error handling and no encryption
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-162-2/+4
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-102-2/+2
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-022-7/+7
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-062-6/+10
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-1/+2
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-192-338/+0
| |/ | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | fixes FS#44 - IOException if content-length is not presentlookshe2015-08-211-3/+3
| |
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-113-94/+319
|/
* Use platform ciphers as well, just prefer oursSam Whited2015-02-021-1/+1
|
* Harden the TLS connection cipher suitesSam Whited2015-01-141-37/+44
|
* keep proper image file extensionDaniel Gultsch2015-01-111-4/+13
|
* made checks for valid image extensions case insensitiveDaniel Gultsch2015-01-041-1/+1
|