From 60d4d56f80378c760f1fbb0deb4b8101a2e32e39 Mon Sep 17 00:00:00 2001
From: Johan von Forstner <johan.forstner@gmail.com>
Date: Sun, 3 Jan 2021 11:00:22 +0100
Subject: [PATCH] Fix links to Google Maps

(maps app was not found due to https://developer.android.com/training/basics/intents/package-visibility)
---
 app/src/main/AndroidManifest.xml                      | 11 +++++++++++
 app/src/main/java/net/vonforst/evmap/MapsActivity.kt  |  2 +-
 .../java/net/vonforst/evmap/adapter/DetailsAdapter.kt |  3 ++-
 .../java/net/vonforst/evmap/fragment/MapFragment.kt   |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 21005978..89e8b65b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,17 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="geo" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="google.navigation" />
+        </intent>
+    </queries>
+
     <application
         android:name=".EvMapApplication"
         android:allowBackup="true"
diff --git a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
index feae5709..9858a688 100644
--- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
+++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
@@ -91,7 +91,7 @@ class MapsActivity : AppCompatActivity() {
                 cb.getRootView(),
                 R.string.no_maps_app_found,
                 Snackbar.LENGTH_SHORT
-            )
+            ).show()
         }
     }
 
diff --git a/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt b/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
index 608199c7..e4137b2d 100644
--- a/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
+++ b/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
@@ -48,7 +48,8 @@ fun buildDetails(
             R.drawable.ic_address,
             R.string.address,
             loc.address.toString(),
-            loc.locationDescription
+            loc.locationDescription,
+            clickable = true
         ),
         if (loc.operator != null) DetailsAdapter.Detail(
             R.drawable.ic_operator,
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
index 2e6563a8..4d34c307 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -593,7 +593,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     val charger = vm.chargerDetails.value?.data
                     if (charger != null) {
                         when (it.icon) {
-                            R.drawable.ic_location -> {
+                            R.drawable.ic_location, R.drawable.ic_address -> {
                                 (activity as? MapsActivity)?.showLocation(charger)
                             }
                             R.drawable.ic_fault_report -> {