aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵lookshe2016-03-121-20/+27
| | | | | | | | extraction of fileextension (FS#38)
* | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * 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 ↵steckbrief2016-02-241-1/+1
| | | | | | | | for auto downloading image links moved to global Utility Class)
* | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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
| | | | | | | | #1576
| * 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 ↵Daniel Gultsch2015-09-301-0/+1
| | | | | | | | queue
| * remove unused imports.Michael2015-08-251-26/+0
| |
| * introduce special iq type for internal timeouts. always use != result to ↵Daniel Gultsch2015-08-232-6/+5
| | | | | | | | check for error in callbacks
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-111-19/+25
| | | | | | | | fixed #522
| * 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 ↵Daniel Gultsch2015-08-101-2/+6
| | | | | | | | compatible with conversations > 1.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
| | | | | | | | be careful: little error handling and no encryption
| * 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
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 11:11:37 +0000