aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-03 11:43:06 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-03 11:43:06 +0200
commit32648ec859f2e8e31a0b165fe9808fe62412c053 (patch)
tree9d60921adcd7605571de34b4d1761a3b96b7c3d8 /src/eu/siacs
parent655ce108432a4b696df38c9c8576bc0406e03c1f (diff)
parente02ae4cde20eaacd006609b1545a0e5da3b9d4e3 (diff)
Merge branch 'development'
Diffstat (limited to 'src/eu/siacs')
-rw-r--r--src/eu/siacs/conversations/ui/ContactsActivity.java7
-rw-r--r--src/eu/siacs/conversations/utils/UIHelper.java1
2 files changed, 6 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/ContactsActivity.java b/src/eu/siacs/conversations/ui/ContactsActivity.java
index 811ae876..fee3de7a 100644
--- a/src/eu/siacs/conversations/ui/ContactsActivity.java
+++ b/src/eu/siacs/conversations/ui/ContactsActivity.java
@@ -485,8 +485,11 @@ public class ContactsActivity extends XmppActivity {
}
private boolean isMuc(Contact contact) {
- String server = contact.getJid().split("@")[1];
- return getMucServers().contains(server);
+ String[] parts = contact.getJid().split("@");
+ if (parts.length != 2) {
+ return false;
+ }
+ return getMucServers().contains(parts[1]);
}
public void startConversation(Contact contact, Account account, boolean muc) {
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 15bb8969..529d2b4c 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -129,6 +129,7 @@ public class UIHelper {
int textColor, int left, int top, int right, int bottom) {
Paint tilePaint = new Paint(), textPaint = new Paint();
tilePaint.setColor(tileColor);
+ textPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
textPaint.setColor(textColor);
textPaint.setTypeface(Typeface.create("sans-serif-light",
Typeface.NORMAL));