Hotfix last known location error

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 51
-        versionName "2.0.2"
+        versionCode 54
+        versionName "2.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt

@@ -1,5 +1,6 @@
 package com.tommasoberlose.anotherwidget.helpers
 
+import android.Manifest
 import android.content.Context
 import com.google.android.gms.location.LocationServices
 import com.kwabenaberko.openweathermaplib.constants.Units
@@ -10,6 +11,7 @@ import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 
 
 /**
@@ -22,12 +24,17 @@ object WeatherHelper {
         val networkApi = WeatherNetworkApi(context)
         if (Preferences.customLocationAdd != "") {
             networkApi.updateWeather()
-        } else {
-            LocationServices.getFusedLocationProviderClient(context).lastLocation.addOnSuccessListener {
-                Preferences.customLocationLat = it.latitude.toString()
-                Preferences.customLocationLon = it.longitude.toString()
+        } else if (context.checkGrantedPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
+            LocationServices.getFusedLocationProviderClient(context).lastLocation.addOnCompleteListener { task ->
+                if (task.isSuccessful) {
+                    val location = task.result
+                    if (location != null) {
+                        Preferences.customLocationLat = location.latitude.toString()
+                        Preferences.customLocationLon = location.longitude.toString()
 
-                networkApi.updateWeather()
+                        networkApi.updateWeather()
+                    }
+                }
             }
         }
     }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt

@@ -176,7 +176,7 @@ class CalendarSettingsFragment : Fragment() {
                     cal1.accountName == cal1.name -> {
                         -1
                     }
-                    cal2.accountName == cal2.accountName -> {
+                    cal2.accountName == cal2.name -> {
                         1
                     }
                     else -> {