aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Imports organizedsteckbrief2016-02-124-7/+2
|
* Compilation errors and merge mixups fixedsteckbrief2016-02-111-5/+7
|
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-114-66/+498
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * refactored user handling in conferences. show try again button when ↵Daniel Gultsch2016-02-011-1/+8
| | | | | | | | conference has errors
| * 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-312-7/+8
| | | | | | | | #1618
| * let message parser not artifically fail on messages with no to attributeDaniel Gultsch2015-12-171-4/+4
| |
| * more detailed loggingDaniel Gultsch2015-12-121-2/+1
| |
| * 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
| |
| * always show conversations with pending subscription requestsDaniel Gultsch2015-12-091-3/+5
| |
| * when no avatar found show avatar of contact and not the muc user in conferencesDaniel Gultsch2015-12-091-1/+4
| |
| * 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
| |
| * properly clear muc user avatar cachesDaniel Gultsch2015-12-041-2/+4
| |
| * use proposed nick as default nick in mucoptionsDaniel Gultsch2015-12-041-4/+0
| |
| * parse vcard avatars from muc presencesDaniel Gultsch2015-12-032-7/+112
| |
| * Show status message when contact requests presenceSam Whited2015-12-021-2/+14
| | | | | | | | Remove presence when conversation closed
| * 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
| |
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-0/+29
| | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
| * 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
| * catch invalid base64 on omemo key decodingDaniel Gultsch2015-08-301-3/+8
| |
| * Revert "improved compatibility with muc components that change the message id"Daniel Gultsch2015-08-261-3/+2
| | | | | | | | This reverts commit df86b0fc47cb7af8e97826f97d0e202405cff414.
| * catch invalid base64 in axolotl key parsingDaniel Gultsch2015-08-241-1/+1
| |
| * introduce special iq type for internal timeouts. always use != result to ↵Daniel Gultsch2015-08-231-1/+1
| | | | | | | | check for error in callbacks
| * modified clearIqCallbacks into 2-step processDaniel Gultsch2015-08-231-6/+6
| |
| * Merge branch 'development'Daniel Gultsch2015-08-153-16/+221
| |\
| | * 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
| | |
| | * end otr session when receiving failed otr message warningsDaniel Gultsch2015-07-211-1/+7
| | |
| | * bugfix: changed condition of onOtrSessionEstablished being calledDaniel Gultsch2015-07-211-6/+6
| | | | | | | | | | | | | | | | | | fixed #1263 fixed #1260 fixed #1293
| | * Optimize importsAndreas Straub2015-07-202-2/+0
| | |
| | * Overhauled Message taggingAndreas Straub2015-07-191-1/+2
| | | | | | | | | | | | | | | | | | Messages are now tagged with the IdentityKey fingerprint of the originating session. IdentityKeys have one of three trust states: undecided (default), trusted, and untrusted/not yet trusted.
| | * Clean up loggingAndreas Straub2015-07-192-8/+9
| | | | | | | | | | | | | | | Add a fixed prefix to axolotl-related log messages, set log levels sensibly.
| | * Fix devicelist update handlingAndreas Straub2015-07-191-0/+1
| | | | | | | | | | | | | | | | | | No longer store own device ID (so that we don't encrypt messages for ourselves), verify that own device ID is present in update list (otherwise republish), reflect update in UI.
| | * Return empty set on invalid PEP devicelistAndreas Straub2015-07-191-18/+18
| | |
| | * Properly track message senderAndreas Straub2015-07-191-4/+4
| | | | | | | | | | | | | | | | | | | | | Previously, the sender was assumed to be the conversation counterpart. This broke carboned own-device messages. We now track the sender properly, and also set the status (sent by one of the own devices vs received from the counterpart) accordingly.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 01:26:51 +0000