aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser/MessageParser.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixes FS#151 - Missing button on image-linkslookshe2016-03-071-2/+1
|
* Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-7/+5
|
* Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/res/menu/message_context.xml src/main/res/xml/preferences.xml
| * made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-4/+3
| |
| * update notification after message correctionDaniel Gultsch2016-02-231-0/+1
| |
* | Fixes FS#48 and FS#136lookshe2016-02-281-1/+2
| | | | | | | | | | - corrected preference "confirm_messages" to "confirm_messages_list" - removed unused "heart message" garbage
* | Removed stupid message correctionsteckbrief2016-02-231-35/+0
| |
* | Removed unnecessary dependencies to XmppConnectionService and added ↵steckbrief2016-02-231-1/+1
| | | | | | | | allowMessageCorrection to preferences
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-23/+66
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
| * change uuid when replacing messagesDaniel Gultsch2016-02-201-1/+4
| |
| * decrypt pgp message correctionsDaniel Gultsch2016-02-191-8/+9
| |
| * only offer message correction for the very last messageDaniel Gultsch2016-02-171-1/+5
| |
| * log reason why otr message won't be parsedDaniel Gultsch2016-02-161-1/+2
| |
| * added setting to opt-out of message correction. renamed preferences and ↵Daniel Gultsch2016-02-161-1/+1
| | | | | | | | options to settings
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-14/+47
| |
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-5/+7
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * prepend instead off append mam messages to conversations when going in reverseDaniel Gultsch2016-02-041-1/+5
| |
| * count all messages in a queryDaniel Gultsch2016-02-031-4/+2
| |
| * Revert "get rid of broken totalMessageCount for mam queries"Daniel Gultsch2016-02-031-2/+4
| | | | | | | | This reverts commit 58c6f9bfb283f5c54695b9662b5b4b08e5d4357f.
| * get rid of broken totalMessageCount for mam queriesDaniel Gultsch2016-02-021-4/+2
| |
* | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵steckbrief2016-02-131-1/+1
| | | | | | | | should be shown for a message
* | Imports organizedsteckbrief2016-02-121-2/+2
| |
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-44/+133
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * fixed false set of subject in conference with empty body tagDaniel Gultsch2016-01-311-1/+1
| |
| * use actual message timestamp instead of delay when updating last seen. fixes ↵Daniel Gultsch2015-12-311-3/+4
| | | | | | | | #1618
| * let message parser not artifically fail on messages with no to attributeDaniel Gultsch2015-12-171-4/+4
| |
| * set bookmark name to room subject if no subject has been set beforeDaniel Gultsch2015-12-111-2/+10
| |
| * get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-111-6/+1
| |
| * notify on mam catchup messagesDaniel Gultsch2015-12-101-5/+15
| |
| * properly clean up timed out mam queriesDaniel Gultsch2015-12-101-1/+1
| |
| * check for query object as condition to trigger deduplication instead of serverIdDaniel Gultsch2015-12-051-1/+1
| |
| * parse stanza-id from messagesDaniel Gultsch2015-12-041-3/+19
| |
| * parse vcard avatars from muc presencesDaniel Gultsch2015-12-031-1/+1
| |
| * combine multiple message receipts into single messageDaniel Gultsch2015-12-011-6/+7
| |
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-301-1/+9
| |\ | | | | | | PGP messages background decryption
| | * Decrypt PGP messages in backgroundfiaxh2015-10-281-1/+9
| | |
| * | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-1/+1
| |/
| * update last seen in mucs. fixes #1508Daniel Gultsch2015-10-191-1/+5
| |
| * work with muc services that change the message idDaniel Gultsch2015-10-141-1/+1
| |
| * clear notification and activate grace period when receiving chat marker from ↵Daniel Gultsch2015-10-061-1/+5
| | | | | | | | another instance
| * Revert "improved compatibility with muc components that change the message id"Daniel Gultsch2015-08-261-3/+2
| | | | | | | | This reverts commit df86b0fc47cb7af8e97826f97d0e202405cff414.
| * Merge branch 'development'Daniel Gultsch2015-08-151-15/+58
| |\
| | * Provide process function for key transport messageAndreas Straub2015-07-311-1/+1
| | |
| | * Refactor axolotl message processing workflowAndreas Straub2015-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XmppAxolotlMessage is now entirely responsible for handling encryption and decryption of messages, only leveraging XmppAxolotlSession as a packing/unpacking primitive for payload keys. Removed pseudo-dead session generation code step from prepareMessage function, as sessions have been created by invoking the TrustKeysActivity for a while now. Added prepareKeyTransportMessage function, which creates a message with no payload. The key that is packed into the header keyElements can then be used for other purposes (e.g. encrypted file transfer).
| | * Change to new wire protocol versionAndreas Straub2015-07-311-1/+1
| | |
| | * improved 'next encryption' selectionDaniel Gultsch2015-07-311-2/+0
| | |
| | * Tag carbon messages in parser, adapt session logicAndreas Straub2015-07-291-1/+4
| | | | | | | | | | | | | | | | | | Messages sent from another device of the own account are now explicitly tagged as carboned message. The session detection logic now uses this tag to find "session borders".
| | * log reason for message failureDaniel Gultsch2015-07-281-0/+7
| | |
| | * use type=chat more often to go along with new, simple carbon and mam rulesDaniel Gultsch2015-07-221-6/+10
| | | | | | | | | | | | | | | * change chat states to type=chat and chat markers to type=chat * use same type as requesting stanza for delivery receipts (which should make them type=chat most of the time)
| | * fixed npe in error message handlingDaniel Gultsch2015-07-211-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 21:54:58 +0000