aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-4/+34
|\
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-6/+36
* | Imports organizedsteckbrief2016-02-121-7/+1
* | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-14/+1
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-5/+3
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-79/+249
|\|
| * register context menu long click listener on message text. fixes #1614Daniel Gultsch2015-12-271-1/+1
| * made text selectable again unless text contains more than 1 linkDaniel Gultsch2015-12-261-0/+11
| * make message text non-selectable. fixes #1606Daniel Gultsch2015-12-141-3/+0
| * request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-13/+1
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-1/+1
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-301-1/+5
| |\
| | * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-281-1/+5
| * | load avatars in message adapter in background taskDaniel Gultsch2015-10-291-11/+92
| * | show encryption type in warned/red messagesDaniel Gultsch2015-10-281-0/+6
| |/
| * open unknown files with wildcard intentDaniel Gultsch2015-10-201-9/+14
| * try to catch plattform bugs1.6.11Daniel Gultsch2015-10-021-1/+6
| * catch rare activity not found exception when opening downloaded filesDaniel Gultsch2015-09-271-4/+9
| * fixed highlight text color for white chat bubblesDaniel Gultsch2015-08-261-0/+1
| * remove unused imports.Michael2015-08-251-1/+0
| * added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-241-34/+51
| * use same code that is used to open files for imagesDaniel Gultsch2015-08-111-4/+1
| * changed color of 'whispered' prefixDaniel Gultsch2015-08-111-2/+1
| * Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-011-3/+3
| * Fix session logic: enforce same type of encryptionAndreas Straub2015-07-301-25/+3
| * fixed some colors in message adapterDaniel Gultsch2015-07-301-25/+31
| * Reset lock color for non-axolotl messagesAndreas Straub2015-07-291-0/+2
| * Tag carbon messages in parser, adapt session logicAndreas Straub2015-07-291-2/+2
| * Color plaintext messages in encrypted sessions redAndreas Straub2015-07-291-0/+30
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-291-3/+3
| * use 'interactive mode' when starting downloads from the context menuDaniel Gultsch2015-07-221-1/+1
| * changed message bubble appearanceRaphael Pohl2015-07-201-10/+27
| * Optimize importsAndreas Straub2015-07-201-1/+1
| * Fix trust status for outgoing messagesAndreas Straub2015-07-191-4/+4
| * Show trust status of messages' originating sessionAndreas Straub2015-07-191-0/+13
| * renamed HttpConnection to HttpDownloadConnectionDaniel Gultsch2015-07-101-1/+1
| * renamed downloadable to transferableDaniel Gultsch2015-07-101-11/+11
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-101-0/+2
| * show timestamp on images in mucsDaniel Gultsch2015-07-101-1/+1
| * refactored message context menuDaniel Gultsch2015-07-021-6/+6
| * made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-301-4/+4
| * avoid using paragraph style breaks by accidentDaniel Gultsch2015-05-111-3/+4
| * increased space between merged messages a bitDaniel Gultsch2015-05-111-1/+1
| * add a little bit of space between merged messages.Daniel Gultsch2015-05-111-1/+7
| * no font padding on red heartsDaniel Gultsch2015-05-111-2/+4
| * rewrote parts of message adapter to avoid using NULL viewsDaniel Gultsch2015-05-111-35/+6
| * paint single unicode hearts as red and slightly largerDaniel Gultsch2015-05-101-4/+22
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-5/+5
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-061-7/+5
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-031-19/+21
|\| |