sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1212 from emdete/add_jid_to_show_location 

fix to detect the sender jid correctly
This commit is contained in:
Daniel Gultsch 2015-05-20 18:31:18 +02:00
parent bb065680e5 4759607a77
commit d908b70340
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/siacs/conversations/utils/GeoHelper.java
View File

@ -54,9 +54,14 @@ public class GeoHelper {
Intent locationPluginIntent = new Intent("eu.siacs.conversations.location.show"); Intent locationPluginIntent = new Intent("eu.siacs.conversations.location.show");
locationPluginIntent.putExtra("latitude",latitude); locationPluginIntent.putExtra("latitude",latitude);
locationPluginIntent.putExtra("longitude",longitude); locationPluginIntent.putExtra("longitude",longitude);
locationPluginIntent.putExtra("jid",conversation.getJid().toString()); if (conversation.getMode() == Conversation.MODE_SINGLE) {
if (conversation.getMode() == Conversation.MODE_SINGLE && message.getStatus() == Message.STATUS_RECEIVED) { if (message.getStatus() == Message.STATUS_RECEIVED) {
locationPluginIntent.putExtra("name",conversation.getName()); locationPluginIntent.putExtra("name",conversation.getName());
locationPluginIntent.putExtra("jid",message.getCounterpart().toString());
}
else {
locationPluginIntent.putExtra("jid",conversation.getAccount().getJid().toString());
}
} }
intents.add(locationPluginIntent); intents.add(locationPluginIntent);