aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (unfollow)
Commit message (Expand)AuthorFilesLines
2015-08-01Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub1-2/+2
2015-08-01enable axolotl encryption for jingle supported file transfersDaniel Gultsch1-17/+17
2015-07-31improved 'next encryption' selectionDaniel Gultsch2-28/+37
2015-07-30Fix session logic: enforce same type of encryptionAndreas Straub1-0/+31
2015-07-29use gcm for file encryption over httpDaniel Gultsch1-89/+8
2015-07-29Tag carbon messages in parser, adapt session logicAndreas Straub1-3/+21
2015-07-29Refactor out inner classes, cache trust storeAndreas Straub1-2/+2
2015-07-28removed recursion in message.getMerged*()Daniel Gultsch1-13/+19
2015-07-22show warning when trying to highlight users that have left the conferenceDaniel Gultsch1-0/+9
2015-07-22treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch1-0/+7
2015-07-20Optimize importsAndreas Straub3-10/+4
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
2015-07-19Overhauled Message taggingAndreas Straub1-9/+10
2015-07-19Fix displaying Contact IdentityKeysAndreas Straub1-64/+0
2015-07-19Tag messages with originating sessionAndreas Straub1-0/+4
2015-07-19Fetch bundles on-demand, encrypt in backgroundAndreas Straub1-3/+3
2015-07-19Reformat code to use tabsAndreas Straub1-10/+10
2015-07-19Reworked axolotl protocol layerAndreas Straub3-29/+54
2015-07-19CryptoNext persistance layer mockupAndreas Straub3-64/+135
2015-07-18account for downloaded http files in dup checkerDaniel Gultsch1-8/+18
2015-07-10renamed downloadable to transferableDaniel Gultsch3-15/+15
2015-07-05refactored sendMessage and merged with resendMessageDaniel Gultsch1-0/+20
2015-07-03avoid very rare npeDaniel Gultsch1-0/+3
2015-07-03avoid very rare npeDaniel Gultsch1-0/+3
2015-07-02also offer http download for some 'well known extensions'Daniel Gultsch2-1/+4
2015-07-02refactored message context menuDaniel Gultsch1-1/+1
2015-07-01changed mime type handlingDaniel Gultsch2-39/+63
2015-06-30made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch1-53/+55
2015-06-30refactored bodyContainsDownloadable to be more flexibleDaniel Gultsch1-33/+35
2015-06-29show attach button in conferences when http upload is availableDaniel Gultsch1-0/+4
2015-06-29initial http upload supportDaniel Gultsch3-22/+23
2015-06-10changed paragraph dividerDaniel Gultsch1-1/+1
2015-06-03reworked handeling of system contactsDaniel Gultsch2-7/+19
2015-06-02avoid unnessary muc mam queries when message count is 0 after subjectDaniel Gultsch1-0/+6
2015-05-26renamed OtrEngine to OtrServiceDaniel Gultsch2-10/+10
2015-05-20added mam stuff to new message parserDaniel Gultsch1-1/+1
2015-05-20provide helper function for getting the content of a child directlyDaniel Gultsch1-12/+2
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-12don't set unknown error in mucDaniel Gultsch1-2/+0
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-11rewrote parts of message adapter to avoid using NULL viewsDaniel Gultsch1-0/+6
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-10changed conversation red to material redDaniel Gultsch1-2/+2
2015-05-10paint single unicode hearts as red and slightly largerDaniel Gultsch1-32/+40
2015-05-05r/o support for vcard avatars. pep avatars will be preferedDaniel Gultsch1-7/+19
2015-04-13fixed typosiNPUTmice1-1/+1