From c1afbfbaa82ee4b1c6236d2c82009b228041297d Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 2 Feb 2022 10:08:15 -0600
Subject: [PATCH] Fix crash when fetching current location

---
 app/build.gradle.kts                                 |  4 ++--
 .../org/tasks/location/LocationServiceGooglePlay.kt  |  3 ++-
 deps_googleplay.txt                                  | 12 ++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 06f5b3eed..0228ac284 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -235,8 +235,8 @@ dependencies {
         exclude("com.google.android.gms", "play-services-ads-identifier")
     }
     googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}")
-    googleplayImplementation("com.google.android.gms:play-services-location:19.0.0")
-    googleplayImplementation("com.google.android.gms:play-services-maps:18.0.1")
+    googleplayImplementation("com.google.android.gms:play-services-location:19.0.1")
+    googleplayImplementation("com.google.android.gms:play-services-maps:18.0.2")
     googleplayImplementation("com.android.billingclient:billing-ktx:3.0.3")
 
     androidTestImplementation("com.google.dagger:hilt-android-testing:${Versions.hilt}")
diff --git a/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt b/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt
index 1ebe256d7..2af7f55f2 100644
--- a/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt
+++ b/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt
@@ -27,7 +27,8 @@ class LocationServiceGooglePlay @Inject constructor(
                     .lastLocation
                     .addOnSuccessListener {
                         cont.resumeWith(
-                                it.let { Result.success(MapPosition(it.latitude, it.longitude)) }
+                            it?.let { Result.success(MapPosition(it.latitude, it.longitude)) }
+                                ?: Result.failure(NullPointerException())
                         )
                     }
                     .addOnFailureListener { cont.resumeWith(Result.failure(it)) }
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 15f07b447..d0484745b 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -225,20 +225,20 @@
 +|    +--- com.google.firebase:firebase-installations:17.0.0 (*)
 +|    +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.31 (*)
-++--- com.google.android.gms:play-services-location:19.0.0
-+|    +--- com.google.android.gms:play-services-base:18.0.0
+++--- com.google.android.gms:play-services-location:19.0.1
++|    +--- com.google.android.gms:play-services-base:18.0.1
 +|    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    +--- androidx.core:core:1.2.0 -> 1.7.0 (*)
 +|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.4.0 (*)
 +|    |    +--- com.google.android.gms:play-services-basement:18.0.0 (*)
-+|    |    \--- com.google.android.gms:play-services-tasks:18.0.0 -> 18.0.1 (*)
++|    |    \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
 +|    +--- com.google.android.gms:play-services-basement:18.0.0 (*)
 +|    +--- com.google.android.gms:play-services-places-placereport:17.0.0
 +|    |    \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
-+|    \--- com.google.android.gms:play-services-tasks:18.0.0 -> 18.0.1 (*)
-++--- com.google.android.gms:play-services-maps:18.0.1
++|    \--- com.google.android.gms:play-services-tasks:18.0.1 (*)
+++--- com.google.android.gms:play-services-maps:18.0.2
 +|    +--- androidx.fragment:fragment:1.0.0 -> 1.4.0 (*)
-+|    +--- com.google.android.gms:play-services-base:18.0.0 (*)
++|    +--- com.google.android.gms:play-services-base:18.0.1 (*)
 +|    \--- com.google.android.gms:play-services-basement:18.0.0 (*)
 ++--- com.android.billingclient:billing-ktx:3.0.3
 +|    +--- com.android.billingclient:billing:3.0.3