diff options
author | Christian S <christian@pix-art.de> | 2015-12-29 13:59:29 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2015-12-29 13:59:29 +0100 |
commit | fa1817dd634284d79bb8e596dba34bbf1034e36f (patch) | |
tree | cbe0456bd4cedff8aab184df42ede81cad456bc3 | |
parent | 9c677377aa06410ffe93f8da48493595e39a8981 (diff) | |
parent | 42fb9539f82252b86b62622eef2266826714637d (diff) |
copy commits
-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, |