once again: FS#34 - review all calls for String.trim()

2 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java b/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
index 11ff36da..6311d739 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
@@ -308,8 +308,7 @@ public class AvatarService {
 		}
 		bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
 		Canvas canvas = new Canvas(bitmap);
-		final String trimmedName = name.trim();
-		drawTile(canvas, trimmedName, 0, 0, size, size);
+		drawTile(canvas, name, 0, 0, size, size);
 		ImageUtil.addBitmapToCache(KEY, bitmap);
 		return bitmap;
 	}
@@ -382,7 +381,8 @@ public class AvatarService {
 
 	private boolean drawTile(Canvas canvas, String name, int left, int top, int right, int bottom) {
 		if (name != null) {
-			final String letter = name.isEmpty() ? "X" : name.substring(0, 1);
+			String trimmedName = name.trim();
+			final String letter = trimmedName.isEmpty() ? "X" : trimmedName.substring(0, 1);
 			final int color = UIHelper.getColorForName(name);
 			drawTile(canvas, letter, color, left, top, right, bottom);
 			return true;
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
index d3086d66..bd3dd684 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
@@ -742,7 +742,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 					Presence.Status s = p == null ? Presence.Status.OFFLINE : p.getStatus();
 					if (contact.showInRoster() && contact.match(needle)
 							&& (!this.mHideOfflineContacts
-							|| (needle != null && !needle.trim().isEmpty())
+							|| (needle != null && !needle.isEmpty())
 							|| s.compareTo(Presence.Status.OFFLINE) < 0)) {
 						this.contacts.add(contact);
 					}