aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/generator (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-0/+7
| |
* | Fixes FS#147: Disable OMEMOsteckbrief2016-03-022-6/+0
| |
* | Fixes FS#148: Remove 'store' hint from chat-markerssteckbrief2016-03-021-2/+1
| |
* | Removed stupid message correctionsteckbrief2016-02-231-6/+0
| |
* | Removed unnecessary dependencies to XmppConnectionService and added ↵steckbrief2016-02-232-26/+2
| | | | | | | | allowMessageCorrection to preferences
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-223-1/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * added setting to opt-out of message correction. renamed preferences and ↵Daniel Gultsch2016-02-161-1/+6
| | | | | | | | options to settings
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-152-0/+4
| |
| * add missing type='submit' attribute to enable push formDaniel Gultsch2016-02-151-0/+1
| |
| * send push enable to server. simplified loggingDaniel Gultsch2016-02-132-0/+15
| |
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-1/+15
| |
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-14/+9
|\| | | | | | | | | | | | | | | | | | | | | | | 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 a Presence class for presence informationStephen Paul Weber2016-01-241-15/+4
| | | | | | | | Only has status for now, but doing it so I can add disco to it
* | Fixes FS#105: XHTML par for images addedsteckbrief2016-02-131-0/+12
| |
* | Fixed overwriting of changes for fixing FS#70. Unused method removed from ↵steckbrief2016-02-134-73/+0
| | | | | | | | generator classes.
* | Imports organizedsteckbrief2016-02-123-7/+2
| |
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-1/+1
| |
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-114-44/+269
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * add obb url to unencrypted messagesDaniel Gultsch2016-01-031-0/+1
| |
| * removed xhtml body. fixes #1594Daniel Gultsch2016-01-011-12/+0
| |
| * add 'store' message hint to displayed chat markersDaniel Gultsch2015-12-171-0/+1
| |
| * renamed pretty-please-store message hint to storeDaniel Gultsch2015-12-101-1/+1
| |
| * combine multiple message receipts into single messageDaniel Gultsch2015-12-011-6/+8
| |
| * Sign empty statusfiaxh2015-11-091-1/+0
| |
| * push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-292-0/+7
| |
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-3/+7
| | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-111-0/+21
| |
| * Captcha support.Armin Novak2015-10-111-0/+10
| |
| * removed oob element from file messagesDaniel Gultsch2015-10-081-1/+0
| |
| * introduced expert options to set status to away and xa if screen is off or ↵Daniel Gultsch2015-10-081-1/+16
| | | | | | | | if phone is silenced
| * add xhtml image tag to unencrypted image urls. add oob tag to all files that ↵Daniel Gultsch2015-10-071-2/+18
| | | | | | | | are on remote hosts
| * use Conversations 1.x.y as user agent string in http upload and downloadDaniel Gultsch2015-09-231-3/+3
| |
| * fixed content-type indication in http uploadDaniel Gultsch2015-09-191-1/+1
| |
| * added missing type='submit' to mam queriesDaniel Gultsch2015-09-151-3/+4
| | | | | | | | | | fixed some nasty inheritance problems along the way fixes #1411
| * use same method to add message hints to otr message everywhere it is neededDaniel Gultsch2015-09-011-5/+9
| |
| * tag axolotl messages with pretty-please-storeDaniel Gultsch2015-09-011-0/+1
| |
| * use content-type in http slot request and stick with during uploadDaniel Gultsch2015-08-011-1/+4
| |
| * Refactor axolotl message processing workflowAndreas Straub2015-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * add no-store to chat statesDaniel Gultsch2015-07-221-0/+2
| |
| * use type=chat more often to go along with new, simple carbon and mam rulesDaniel Gultsch2015-07-221-6/+5
| | | | | | | | | | * 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)
| * made image file format configurable by Config.javaDaniel Gultsch2015-07-211-4/+0
| |
| * bugfix: also add no-permanent-storage to message hintsDaniel Gultsch2015-07-211-0/+1
| |
| * Refactor axolotl send processing/caching flowAndreas Straub2015-07-201-4/+1
| |
| * attempt to fix the delay problemDaniel Gultsch2015-07-201-27/+7
| |
| * Optimize importsAndreas Straub2015-07-202-5/+3
| |
| * Clean up loggingAndreas Straub2015-07-191-1/+1
| | | | | | | | | | Add a fixed prefix to axolotl-related log messages, set log levels sensibly.
| * Rework PEP content verificationAndreas Straub2015-07-191-1/+1
| | | | | | | | | | | | Now checks which part(s) are out of sync w/ local storage, and updates only those, rather than assuming the entire node corrupt and overwriting it all (especially relevant for preKey list)
| * Fetch bundles on-demand, encrypt in backgroundAndreas Straub2015-07-191-4/+6
| | | | | | | | | | | | | | | | | | | | | | Bundles are now fetched on demand when a session needs to be established. This should lessen the chance of changes to the bundles occuring before they're used, as well as lessen the load of fetching bundles. Also, the message encryption is now done in a background thread, as this can be somewhat costly if many sessions are present. This is probably not going to be an issue in real use, but it's good practice anyway.
| * Migrate to new PEP layoutAndreas Straub2015-07-191-20/+9
| | | | | | | | Merge prekeys into bundle node
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 03:42:15 +0000