adding and removing roster items now possible. basic error display on error messages

2 files changed, 36 insertions, 1 deletions

diff --git a/src/de/gultsch/chat/utils/MessageParser.java b/src/de/gultsch/chat/utils/MessageParser.java
index aec492c84..1dca73432 100644
--- a/src/de/gultsch/chat/utils/MessageParser.java
+++ b/src/de/gultsch/chat/utils/MessageParser.java
@@ -116,4 +116,19 @@ public class MessageParser {
 		Conversation conversation = service.findOrCreateConversation(account, parts[0],false);
 		return new Message(conversation,fullJid, message.findChild("body").getContent(), Message.ENCRYPTION_NONE,status);
 	}
+
+	public static Message parseError(MessagePacket packet, Account account, XmppConnectionService service) {
+		
+			String[] fromParts = packet.getFrom().split("/");
+	Conversation conversation = service.findOrCreateConversation(account, fromParts[0],false);
+	Element error = packet.findChild("error");
+	String errorName = error.getChildren().get(0).getName();
+	String displayError;
+	if (errorName.equals("service-unavailable")) {
+		displayError = "Contact is offline and does not have offline storage";
+	} else {
+		displayError = errorName.replace("-", " ");
+	}
+	return new Message(conversation, packet.getFrom(), displayError, Message.ENCRYPTION_NONE, Message.STATUS_ERROR);
+	}
 }
diff --git a/src/de/gultsch/chat/utils/UIHelper.java b/src/de/gultsch/chat/utils/UIHelper.java
index 52292a0f4..5e81f0990 100644
--- a/src/de/gultsch/chat/utils/UIHelper.java
+++ b/src/de/gultsch/chat/utils/UIHelper.java
@@ -54,7 +54,7 @@ public class UIHelper {
 			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
 			return sdf.format(date);
 		} else {
-			SimpleDateFormat sdf = new SimpleDateFormat("M/D");
+			SimpleDateFormat sdf = new SimpleDateFormat("MM/dd");
 			return sdf.format(date);
 		}
 	}
@@ -85,6 +85,26 @@ public class UIHelper {
 
 		return bitmap;
 	}
+	
+	public static Bitmap getErrorPicture(int size) {
+		Bitmap bitmap = Bitmap
+				.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+		Canvas canvas = new Canvas(bitmap);
+
+		bitmap.eraseColor(0xFFe92727);
+
+		Paint paint = new Paint();
+		paint.setColor(0xffe5e5e5);
+		paint.setTextSize((float) (size * 0.9));
+		paint.setAntiAlias(true);
+		Rect rect = new Rect();
+		paint.getTextBounds("!", 0, 1, rect);
+		float width = paint.measureText("!");
+		canvas.drawText("!", (size / 2) - (width / 2), (size / 2)
+				+ (rect.height() / 2), paint);
+
+		return bitmap;
+	}
 
 	public static Notification getUnreadMessageNotification(Context context,
 			Conversation conversation) {