aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Conversation.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-3/+7
|\ | | | | | | | | | | | | | | | | | | | | | | 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-3/+7
| |
* | Removed useless 'button-message' to load more messages. Implementation ↵steckbrief2016-02-231-12/+0
| | | | | | | | already done with a more convenient method
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-4/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * only offer message correction for the very last messageDaniel Gultsch2016-02-171-4/+11
| |
| * added some OTR loggingDaniel Gultsch2016-02-161-4/+7
| |
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-0/+20
| |
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-1/+29
|\| | | | | | | | | | | | | | | | | | | | | | | 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/+8
| |
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+12
| |
| * add more fault tolerant checks for messages left on serverDaniel Gultsch2016-02-041-0/+9
| |
* | Imports organizedsteckbrief2016-02-121-1/+1
| |
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-1/+2
| |
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-64/+129
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+1
| |
| * added Config.java variable to change the default notification behaviour to ↵Daniel Gultsch2016-01-081-1/+1
| | | | | | | | always
| * show per conference notification settings in details activityDaniel Gultsch2016-01-081-1/+15
| |
| * avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
| |
| * fixed stuck at omemo encryption when x509 verification is being usedDaniel Gultsch2015-12-271-7/+7
| |
| * only offer plain and omemo encryption when x509 verification is enabledDaniel Gultsch2015-12-191-1/+10
| |
| * splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+1
| |
| * get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-111-24/+6
| |
| * introduced build-time paranoia mode that disables unencrypted chats and ↵Daniel Gultsch2015-12-011-2/+9
| | | | | | | | forces TOR
| * Decrypt PGP messages in backgroundfiaxh2015-10-281-0/+1
| |
| * fixed read conversations showing up as notifications after a restartDaniel Gultsch2015-10-211-5/+4
| |
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-141-7/+21
| |
| * added missing type='submit' to mam queriesDaniel Gultsch2015-09-151-2/+2
| | | | | | | | | | fixed some nasty inheritance problems along the way fixes #1411
| * fixed bug that prevented newly opened conversations to load the entire ↵Daniel Gultsch2015-08-301-0/+4
| | | | | | | | history via mam. fixes #1328
| * be more restrictive about marking messages as sent_received in muc parserDaniel Gultsch2015-08-261-5/+16
| |
| * bugfix: next encryption is now being properly detectedDaniel Gultsch2015-08-231-2/+2
| |
| * improved 'next encryption' selectionDaniel Gultsch2015-07-311-27/+36
| |
| * treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-221-0/+7
| |
| * Fetch bundles on-demand, encrypt in backgroundAndreas Straub2015-07-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | 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.
| * avoid unnessary muc mam queries when message count is 0 after subjectDaniel Gultsch2015-06-021-0/+6
| |
| * renamed OtrEngine to OtrServiceDaniel Gultsch2015-05-261-2/+2
| |
| * rewrote parts of message adapter to avoid using NULL viewsDaniel Gultsch2015-05-111-0/+6
| |
* | Merge trz/rename into trz/rebasesteckbrief2015-10-221-1/+2
|\ \
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-770/+0
| |/ | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conferencelookshe2015-08-161-2/+8
| |
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-2/+14
|/
* respond to unreadable OTR messages with error message. fixed #1021iNPUTmice2015-03-211-0/+9
|
* Do not Strigprep JIDs from databaseMateusz "maxmati" Nowoty?ski2015-03-111-3/+1
|
* added methods to count number of unread messagesDaniel Gultsch2015-03-021-0/+13
|
* added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+31
|
* use time instead of uptime for unmuteiNPUTmice2015-02-121-2/+1
|
* Add download button on notification if applicableSam Whited2015-01-161-6/+6
|
* code cleanupDaniel Gultsch2015-01-031-8/+12
|
* improved OTR verification part oneDaniel Gultsch2015-01-021-16/+15
|
* catch another exception in fingerprint generationDaniel Gultsch2014-12-251-1/+1
|
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #791 Squash of commits: 534f25d7dae3ce6852243e28fdd0a69ac01e9463 808fdf5147f27a912a60bee39aa4bf1ddd4f43b4 1eaf8a8330710ad35ba7c368e04f909af623ae4c 31585242c2359efdcd0eeddb9745077f54dbc9eb 2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b e904fb5015bf3a1904ab941a1957edf3b1e7abd2 eebbadf3b3816bbf8fcccb763e419fed252d266f 7c5b87724ce494e5a6e8026557ed50a8fd9f23e8 b0eaaf446937794fe19cbdb4f8309c3ff83d4e42 8c652f9e8bb3512958d9ad8c6f1326505f2d98c8 ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f f5d49897e0dba691ef53a0eddb9ed34d129ad442 a08fa64c505bd895b7c626cfad182380373be20b de67079113e08394a276048c31f6b21baa300829 9069f342173ba30c2b20c67529c7ff497a6a257d 0169fa79d161ee898c4b6762e207087682a952d8 8585a5bd75a5d56927fed8317729bd15fffe4dcc 0053528a078369e0b65dcf71bda251072a1299c7 e901a9c3554bd7cca193e92919b463991eadfea7 c5c78257434813c69ab9b7558bcc8f7cbe858433 e905af348d46d77bc46b5f7211527684acc02fab 13a0f9a10c7892b0f90f5fabd2f2615701b0fd66 2cfba1e24b0139839e4453b92be7e20634d150cf 58e074fb5bb44b05a8104250fccd7c024c808c1a 0d6cf98fc8eab212d798ac79b336f9b70a14f06d e23620f56b85bcab9f3b5d9ce1c01524cd9674dc d72cd2fcc8d54176c3ff53411a69b9bb4642eff3 195143dff8836623a37094a6b8fa6aa01ef31580 5f5f3caf3a1e480a99d27ee5c34ba516419c52e4 1dee3d5861c9f9c710da4cbda3688d94c622ca93 23949b8aa32c78b27bab49bb3c4f3ff588925ce1 9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 08:04:56 +0000