diff options
| author | Christian S <christian@pix-art.de> | 2015-12-29 14:00:50 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-29 14:00:50 +0100 |
| commit | 4879eb7cecacf6717486f483fc04041605cf4480 (patch) | |
| tree | 1a75011630716b51e2f588ac6942229728778626 | |
| parent | 14baee5a02b3e20ca5c5994acba3e10358d07774 (diff) | |
| parent | fa1817dd634284d79bb8e596dba34bbf1034e36f (diff) | |
Merge branch 'refs/heads/siacs-master' into development
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c05e19d8..d1e072d5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ ###Changelog ####Version 1.8.3 +* brought text selection back * bug fixes ####Version 1.8.2 +* fixed stuck at 'connecting...' bug +* make message box behave correctly with multiple links * bug fixes ####Version 1.8.1 diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index cac23f077..cf1e0d3b9 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -131,7 +131,7 @@ public class UIHelper { } public static int getColorForName(String name) { - if (name.isEmpty()) { + if (name == null || name.isEmpty()) { return 0xFF202020; } int colors[] = {0xFFe91e63, 0xFF9c27b0, 0xFF673ab7, 0xFF3f51b5, |