1 files changed, 55 insertions, 20 deletions

diff --git a/src/main/java/de/pixart/messenger/utils/GeoHelper.java b/src/main/java/de/pixart/messenger/utils/GeoHelper.java
index 209fd75db..f6af7c018 100644
--- a/src/main/java/de/pixart/messenger/utils/GeoHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/GeoHelper.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
+import org.osmdroid.util.GeoPoint;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -11,6 +13,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import de.pixart.messenger.Config;
+import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Contact;
 import de.pixart.messenger.entities.Conversation;
 import de.pixart.messenger.entities.Conversational;
@@ -43,41 +46,43 @@ public class GeoHelper {
         return "https://xmpp.pix-art.de/staticmap/staticmap.php?center=" + latitude + "," + longitude + "&size=500x500&markers=" + latitude + "," + longitude + "&zoom= " + Config.DEFAULT_ZOOM;
     }
 
-    public static ArrayList<Intent> createGeoIntentsFromMessage(Message message, Context context) {
-        final ArrayList<Intent> intents = new ArrayList<>();
-        Matcher matcher = GEO_URI.matcher(message.getBody());
+    private static GeoPoint parseGeoPoint(String body) throws IllegalArgumentException {
+        Matcher matcher = GEO_URI.matcher(body);
+        ;
         if (!matcher.matches()) {
-            return intents;
+            throw new IllegalArgumentException("Invalid geo uri");
         }
         double latitude;
         double longitude;
         try {
             latitude = Double.parseDouble(matcher.group(1));
             if (latitude > 90.0 || latitude < -90.0) {
-                return intents;
+                throw new IllegalArgumentException("Invalid geo uri");
             }
             longitude = Double.parseDouble(matcher.group(2));
             if (longitude > 180.0 || longitude < -180.0) {
-                return intents;
+                throw new IllegalArgumentException("Invalid geo uri");
             }
-        } catch (NumberFormatException nfe) {
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("Invalid geo uri", e);
+        }
+        return new GeoPoint(latitude, longitude);
+    }
+
+    public static ArrayList<Intent> createGeoIntentsFromMessage(Context context, Message message) {
+        final ArrayList<Intent> intents = new ArrayList<>();
+        final GeoPoint geoPoint;
+        try {
+            geoPoint = parseGeoPoint(message.getBody());
+        } catch (IllegalArgumentException e) {
             return intents;
         }
         final Conversational conversation = message.getConversation();
-        String label;
-        if (conversation instanceof Conversation && conversation.getMode() == Conversation.MODE_SINGLE && message.getStatus() == Message.STATUS_RECEIVED) {
-            try {
-                label = "(" + URLEncoder.encode(((Conversation) conversation).getName().toString(), "UTF-8") + ")";
-            } catch (UnsupportedEncodingException e) {
-                label = "";
-            }
-        } else {
-            label = "";
-        }
+        final String label = getLabel(context, message);
 
         Intent locationPluginIntent = new Intent(context, ShowLocationActivity.class);
-        locationPluginIntent.putExtra("latitude", latitude);
-        locationPluginIntent.putExtra("longitude", longitude);
+        locationPluginIntent.putExtra("latitude", geoPoint.getLatitude());
+        locationPluginIntent.putExtra("longitude", geoPoint.getLongitude());
         if (message.getStatus() != Message.STATUS_RECEIVED) {
             locationPluginIntent.putExtra("jid", conversation.getAccount().getJid().toString());
             locationPluginIntent.putExtra("name", conversation.getAccount().getJid().getLocal());
@@ -93,8 +98,38 @@ public class GeoHelper {
         intents.add(locationPluginIntent);
 
         Intent geoIntent = new Intent(Intent.ACTION_VIEW);
-        geoIntent.setData(Uri.parse("geo:" + String.valueOf(latitude) + "," + String.valueOf(longitude) + "?q=" + String.valueOf(latitude) + "," + String.valueOf(longitude) + label));
+        geoIntent.setData(Uri.parse("geo:" + String.valueOf(geoPoint.getLatitude()) + "," + String.valueOf(geoPoint.getLongitude()) + "?q=" + String.valueOf(geoPoint.getLatitude()) + "," + String.valueOf(geoPoint.getLongitude()) + label));
         intents.add(geoIntent);
         return intents;
     }
+
+    public static void view(Context context, Message message) {
+        final GeoPoint geoPoint = parseGeoPoint(message.getBody());
+        final String label = getLabel(context, message);
+        context.startActivity(geoIntent(geoPoint, label));
+    }
+
+    private static Intent geoIntent(GeoPoint geoPoint, String label) {
+        Intent geoIntent = new Intent(Intent.ACTION_VIEW);
+        geoIntent.setData(Uri.parse("geo:" + String.valueOf(geoPoint.getLatitude()) + "," + String.valueOf(geoPoint.getLongitude()) + "?q=" + String.valueOf(geoPoint.getLatitude()) + "," + String.valueOf(geoPoint.getLongitude()) + "(" + label + ")"));
+        return geoIntent;
+    }
+
+    public static boolean openInOsmAnd(Context context, Message message) {
+        final GeoPoint geoPoint = parseGeoPoint(message.getBody());
+        final String label = getLabel(context, message);
+        return geoIntent(geoPoint, label).resolveActivity(context.getPackageManager()) != null;
+    }
+
+    private static String getLabel(Context context, Message message) {
+        if (message.getStatus() == Message.STATUS_RECEIVED) {
+            try {
+                return URLEncoder.encode(UIHelper.getMessageDisplayName(message), "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                throw new AssertionError(e);
+            }
+        } else {
+            return context.getString(R.string.me);
+        }
+    }
 }
\ No newline at end of file