1 files changed, 9 insertions, 9 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
index d27481df..31089a62 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
@@ -20,6 +20,7 @@ import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.entities.Presence;
 import de.thedevstack.conversationsplus.entities.Transferable;
+import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 
 public class UIHelper {
@@ -89,8 +90,8 @@ public class UIHelper {
 		return sameDay(date,new Date(System.currentTimeMillis()));
 	}
 
-	public static boolean sameDay(long timestamp1, long timestamp2) {
-		return sameDay(new Date(timestamp1),new Date(timestamp2));
+	public static boolean sameDay(long timestamp, long timestamp2) {
+		return sameDay(new Date(timestamp),new Date(timestamp2));
 	}
 
 	private static boolean sameDay(Date a, Date b) {
@@ -147,8 +148,7 @@ public class UIHelper {
 									getFileDescriptionString(context,message)),true);
 				case Transferable.STATUS_DOWNLOADING:
 					return new Pair<>(context.getString(R.string.receiving_x_file,
-									getFileDescriptionString(context,message),
-									d.getProgress()),true);
+									getFileDescriptionString(context,message)),true);
 				case Transferable.STATUS_OFFER:
 				case Transferable.STATUS_OFFER_CHECK_FILESIZE:
 					return new Pair<>(context.getString(R.string.x_file_offered_for_download,
@@ -158,7 +158,7 @@ public class UIHelper {
 				case Transferable.STATUS_FAILED:
 					return new Pair<>(context.getString(R.string.file_transmission_failed),true);
 				case Transferable.STATUS_UPLOADING:
-					if (message.getStatus() == Message.STATUS_OFFERED) {
+					if (message.getFileParams().getFileStatus() == FileStatus.NEEDS_UPLOAD) {
 						return new Pair<>(context.getString(R.string.offering_x_file,
 								getFileDescriptionString(context, message)), true);
 					} else {
@@ -173,7 +173,7 @@ public class UIHelper {
 		} else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
 			return new Pair<>(context.getString(R.string.decryption_failed), true);
 		} else if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) {
-			if (message.getStatus() == Message.STATUS_RECEIVED) {
+			if (MessageUtil.isMessageReceived(message)) {// Todo: Check if Transmitted && Displayed && Received should be used here
 				return new Pair<>(context.getString(R.string.received_x_file,
 							getFileDescriptionString(context, message)), true);
 			} else {
@@ -183,7 +183,7 @@ public class UIHelper {
 			if (message.hasMeCommand()) {
 				return new Pair<>(message.getBodyReplacedMeCommand(UIHelper.getMessageDisplayName(message)), false);
 			} else if (GeoHelper.isGeoUri(message.getBody())) {
-				if (message.getStatus() == Message.STATUS_RECEIVED) {
+				if (MessageUtil.isMessageReceived(message)) { // Todo: Check if Transmitted && Displayed && Received should be used here
 					return new Pair<>(context.getString(R.string.received_location), true);
 				} else {
 					return new Pair<>(context.getString(R.string.location), true);
@@ -233,7 +233,7 @@ public class UIHelper {
 
 	public static String getMessageDisplayName(final Message message) {
 		final Conversation conversation = message.getConversation();
-		if (message.getStatus() == Message.STATUS_RECEIVED) {
+		if (MessageUtil.isIncomingMessage(message)) {
 			final Contact contact = message.getContact();
 			if (conversation.getMode() == Conversation.MODE_MULTI) {
 				if (contact != null) {
@@ -304,7 +304,7 @@ public class UIHelper {
 
 	public static boolean receivedLocationQuestion(Message message) {
 		if (message == null
-				|| message.getStatus() != Message.STATUS_RECEIVED
+				|| MessageUtil.isOutgoingMessage(message)
 				|| message.getType() != Message.TYPE_TEXT) {
 			return false;
 		}