aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Message.java (unfollow)
Commit message (Collapse)AuthorFilesLines
2015-08-01Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub1-2/+2
2015-07-31improved 'next encryption' selectionDaniel Gultsch1-1/+1
2015-07-30Fix session logic: enforce same type of encryptionAndreas Straub1-0/+31
2015-07-29Tag carbon messages in parser, adapt session logicAndreas Straub1-3/+21
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".
2015-07-29Refactor out inner classes, cache trust storeAndreas Straub1-2/+2
Moves SQLiteAxolotlStore and XmppAxolotlSession into proper classes. IdentityKeys trust statuses are now cached in an LruCache to prevent hammering the database when rendering the UI.
2015-07-28removed recursion in message.getMerged*()Daniel Gultsch1-13/+19
2015-07-19Don't merge messages with different trust statusesAndreas Straub1-1/+7
2015-07-19Show trust status of messages' originating sessionAndreas Straub1-0/+4
Shade lock icon red if message was received in a session that has not been marked trusted by the user or fingerprint is unknown
2015-07-19Overhauled Message taggingAndreas Straub1-9/+10
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.
2015-07-19Tag messages with originating sessionAndreas Straub1-0/+4
This can be used later in order to display trust status of messages, as well as for potential resending of messages in case of preKey conflicts.
2015-07-19Reworked axolotl protocol layerAndreas Straub1-10/+4
Numerous fixes
2015-07-19CryptoNext persistance layer mockupAndreas Straub1-0/+13
Initial sketch of the peripheral storage infrastructure for the new axolotl-based encryption scheme.
2015-07-18account for downloaded http files in dup checkerDaniel Gultsch1-8/+18
2015-07-10renamed downloadable to transferableDaniel Gultsch1-12/+12
2015-07-05refactored sendMessage and merged with resendMessageDaniel Gultsch1-0/+20
2015-07-02also offer http download for some 'well known extensions'Daniel Gultsch1-1/+2
2015-07-02refactored message context menuDaniel Gultsch1-1/+1
2015-07-01changed mime type handlingDaniel Gultsch1-29/+56
2015-06-30made httpconnection (download) ready all kind of filesDaniel Gultsch1-53/+55
2015-06-30refactored bodyContainsDownloadable to be more flexibleDaniel Gultsch1-33/+35
2015-06-29initial http upload supportDaniel Gultsch1-0/+8
be careful: little error handling and no encryption
2015-06-10changed paragraph dividerDaniel Gultsch1-1/+1
2015-05-20added mam stuff to new message parserDaniel Gultsch1-1/+1
2015-05-16made white space check in bodyContainsDownloadable less aggresiveDaniel Gultsch1-1/+1
2015-05-13use zero width white space as message seperatorDaniel Gultsch1-1/+1
2015-05-11avoid using paragraph style breaks by accidentDaniel Gultsch1-1/+3
2015-05-11add a little bit of space between merged messages.Daniel Gultsch1-1/+1
2015-05-10optimized heart render code a bitDaniel Gultsch1-4/+1
2015-05-10added white heart to new rendering as wellDaniel Gultsch1-1/+3
2015-05-10paint single unicode hearts as red and slightly largerDaniel Gultsch1-32/+40
2015-04-13fixed typosiNPUTmice1-1/+1
2015-04-13Bugfix for issue #1121lookshe1-10/+18
check with lowercase to also match JPEG, JPeg ... changed image url in comment
2015-03-11Do not Strigprep JIDs from databaseMateusz "maxmati" Nowoty?ski1-2/+2
2015-03-07display geo uris as location. show 'send loction' in share menu if request ↵iNPUTmice1-0/+4
location intent can be resolved
2015-03-01merge messages with related status (unsend, send, send_received)iNPUTmice1-1/+17
2015-02-21added typing notifications through XEP-0085. fixed #210iNPUTmice1-1/+2
2015-02-07trim message bodys on displayDaniel Gultsch1-2/+2
2015-01-25fix mergable() for /me command.Michael1-2/+4
2015-01-20changed message duplicate finderiNPUTmice1-5/+10
2015-01-19don't trim bodiesiNPUTmice1-1/+1
2015-01-11Add XEP-0245 (/me command) supportSam Whited1-14/+33
2015-01-04made checks for valid image extensions case insensitiveDaniel Gultsch1-1/+1
2015-01-02allow cancellation of waiting filesDaniel Gultsch1-0/+4
2014-12-22Add support for XEP-0191 (Blocking command)Sam Whited1-12/+12
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
2014-12-14refactored the way certain messages are being found within a conversationiNPUTmice1-7/+3
2014-12-13reverse through mam history when loading larger chuncksiNPUTmice1-6/+7
2014-12-10save server id from mam messages. check for dups before adding mamiNPUTmice1-3/+26
2014-12-10added max history age (default 1w). automatically sort newly added mam messagesiNPUTmice1-0/+5
2014-12-01worked around rare npeiNPUTmice1-5/+12
2014-11-18simplified message merge conditioniNPUTmice1-43/+13