narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'development' of github.com:siacs/Conversations into development

Browse source
This commit is contained in:
Daniel Gultsch 2015-05-21 09:19:56 +02:00
parent 75977818ea d908b70340
commit 9d1a8c607f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/utils/GeoHelper.java
View file

@ -54,8 +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);
if (conversation.getMode() == Conversation.MODE_SINGLE && message.getStatus() == Message.STATUS_RECEIVED) { if (conversation.getMode() == Conversation.MODE_SINGLE) {
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);