Merge remote-tracking branch 'refs/remotes/siacs/master'

1 files changed, 9 insertions, 19 deletions

diff --git a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java
index aa9b2e50f..2db20a447 100644
--- a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java
@@ -41,7 +41,6 @@ public class GeoHelper {
 			return intents;
 		}
 		final Conversation conversation = message.getConversation();
-		final Contact contact = message.getContact();
 		String label;
 		if (conversation.getMode() == Conversation.MODE_SINGLE && message.getStatus() == Message.STATUS_RECEIVED) {
 			try {
@@ -56,25 +55,16 @@ public class GeoHelper {
 		Intent locationPluginIntent = new Intent("eu.siacs.conversations.location.show");
 		locationPluginIntent.putExtra("latitude",latitude);
 		locationPluginIntent.putExtra("longitude",longitude);
-		if (conversation.getMode() == Conversation.MODE_SINGLE) {
-			if (message.getStatus() == Message.STATUS_RECEIVED) {
-				locationPluginIntent.putExtra("name",conversation.getName());
-				locationPluginIntent.putExtra("jid",message.getCounterpart().toString());
-			}
-			else {
-				locationPluginIntent.putExtra("name", conversation.getAccount().getUsername());
-				locationPluginIntent.putExtra("jid",conversation.getAccount().getJid().toString());
-			}
+		if (message.getStatus() != Message.STATUS_RECEIVED) {
+			locationPluginIntent.putExtra("jid",conversation.getAccount().getJid().toString());
+			locationPluginIntent.putExtra("name",conversation.getAccount().getJid().getLocalpart());
 		} else {
-			if (message.getStatus() == Message.STATUS_RECEIVED) {
-				if (contact != null) {
-					locationPluginIntent.putExtra("name",contact.getDisplayName());
-				} 
-				locationPluginIntent.putExtra("jid",message.getCounterpart().toString());
-			}
-			else {
-				locationPluginIntent.putExtra("name", conversation.getAccount().getUsername());
-				locationPluginIntent.putExtra("jid",conversation.getAccount().getJid().toString());
+			Contact contact = message.getContact();
+			if (contact != null) {
+				locationPluginIntent.putExtra("name", contact.getDisplayName());
+				locationPluginIntent.putExtra("jid", contact.getJid().toString());
+			} else {
+				locationPluginIntent.putExtra("name", UIHelper.getDisplayedMucCounterpart(message.getCounterpart()));
 			}
 		}
 		intents.add(locationPluginIntent);