Make weather updates more reliable

azuo · Oct 15, 2021 · fb3f28d · fb3f28d
1 parent d8e204c
commit fb3f28d
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 238 deletions.
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
@@ -19,8 +19,15 @@ import com.tommasoberlose.anotherwidget.utils.isDarkTheme
 
 object WeatherHelper {
 
-    fun updateWeather(context: Context) {
-        WeatherWorker.enqueue(context)
+    fun updateWeather(context: Context, force: Boolean = false) {
+        if (Preferences.showWeather || force)
+            WeatherWorker.enqueue(context, replace = force)
+        else {
+            removeWeather(context)
+            org.greenrobot.eventbus.EventBus.getDefault().post(
+                com.tommasoberlose.anotherwidget.ui.fragments.MainFragment.UpdateUiMessageEvent()
+            )
+        }
     }
 
     fun removeWeather(context: Context) {

diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/network/WeatherNetworkApi.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/network/WeatherNetworkApi.kt
@@ -17,21 +17,19 @@ import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
 import com.tommasoberlose.anotherwidget.network.repository.*
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.greenrobot.eventbus.EventBus
 import java.lang.Exception
 import java.text.SimpleDateFormat
-import java.util.*
+import kotlin.coroutines.resume
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.greenrobot.eventbus.EventBus
 
 class WeatherNetworkApi(val context: Context) {
     suspend fun updateWeather() {
         Kotpref.init(context)
         Preferences.weatherProviderError = "-"
         Preferences.weatherProviderLocationError = ""
 
-        if (Preferences.showWeather && Preferences.customLocationLat != "" && Preferences.customLocationLon != "") {
+        if (Preferences.customLocationLat != "" && Preferences.customLocationLon != "") {
             when (Constants.WeatherProvider.fromInt(Preferences.weatherProvider)) {
                 Constants.WeatherProvider.OPEN_WEATHER -> useOpenWeatherMap(context)
                 Constants.WeatherProvider.WEATHER_GOV -> useWeatherGov(context)
@@ -42,46 +40,67 @@ class WeatherNetworkApi(val context: Context) {
                 Constants.WeatherProvider.YR -> useYrProvider(context)
             }
         } else {
-            if (!Preferences.showWeather)
-                Preferences.weatherProviderError = context.getString(R.string.show_weather_not_visible)
-            else {
-                Preferences.weatherProviderLocationError = context.getString(R.string.weather_provider_error_missing_location)
-                Preferences.weatherProviderError = ""
-            }
+            Preferences.weatherProviderLocationError = context.getString(R.string.weather_provider_error_missing_location)
+            Preferences.weatherProviderError = ""
 
             WeatherHelper.removeWeather(
                 context
             )
-
             EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
         }
     }
 
-    private fun useOpenWeatherMap(context: Context) {
+    private suspend fun useOpenWeatherMap(context: Context) {
         if (Preferences.weatherProviderApiOpen != "") {
             val helper = OpenWeatherMapHelper(Preferences.weatherProviderApiOpen)
             helper.setUnits(if (Preferences.weatherTempUnit == "F") Units.IMPERIAL else Units.METRIC)
-            helper.getCurrentWeatherByGeoCoordinates(Preferences.customLocationLat.toDouble(), Preferences.customLocationLon.toDouble(), object :
-                CurrentWeatherCallback {
-                override fun onSuccess(currentWeather: CurrentWeather?) {
-                    currentWeather?.let {
-                        Preferences.weatherTemp = currentWeather.main.temp.toFloat()
-                        Preferences.weatherIcon = currentWeather.weather[0].icon
-                        Preferences.weatherRealTempUnit = Preferences.weatherTempUnit
-                        MainWidget.updateWidget(context)
+            when (val response = suspendCancellableCoroutine<Any?> { continuation ->
+                helper.getCurrentWeatherByGeoCoordinates(Preferences.customLocationLat.toDouble(), Preferences.customLocationLon.toDouble(), object :
+                    CurrentWeatherCallback {
+                    override fun onSuccess(currentWeather: CurrentWeather?) {
+                        continuation.resume(currentWeather)
                     }
 
+                    override fun onFailure(throwable: Throwable?) {
+                        continuation.resume(throwable)
+                    }
+                })
+            }) {
+                is CurrentWeather -> {
+                    Preferences.weatherTemp = response.main.temp.toFloat()
+                    Preferences.weatherIcon = response.weather[0].icon
+                    Preferences.weatherRealTempUnit = Preferences.weatherTempUnit
+                    MainWidget.updateWidget(context)
+
                     Preferences.weatherProviderError = ""
                     Preferences.weatherProviderLocationError = ""
-                    EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
                 }
-
-                override fun onFailure(throwable: Throwable?) {
+                is Throwable -> {
+                    if (response.javaClass == Throwable::class.java) {
+                        // server error, see [OpenWeatherMapHelper.handleCurrentWeatherResponse]
+                        if (response.message?.startsWith("UnAuthorized") == true) {
+                            Preferences.weatherProviderError = context.getString(R.string.weather_provider_error_invalid_key)
+                            Preferences.weatherProviderLocationError = ""
+                        }
+                        else {
+                            Preferences.weatherProviderError = context.getString(R.string.weather_provider_error_generic)
+                            Preferences.weatherProviderLocationError = ""
+                        }
+                        WeatherHelper.removeWeather(
+                            context
+                        )
+                    }
+                    else {
+                        Preferences.weatherProviderError = context.getString(R.string.weather_provider_error_connection)
+                        Preferences.weatherProviderLocationError = ""
+                    }
+                }
+                else -> {
                     Preferences.weatherProviderError = context.getString(R.string.weather_provider_error_generic)
                     Preferences.weatherProviderLocationError = ""
-                    EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
                 }
-            })
+            }
+            EventBus.getDefault().post(MainFragment.UpdateUiMessageEvent())
         } else {
             Preferences.weatherProviderError = context.getString(R.string.weather_provider_error_missing_key)
             Preferences.weatherProviderLocationError = ""

diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt
@@ -13,11 +13,8 @@ import com.tommasoberlose.anotherwidget.helpers.*
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.setExactIfCanSchedule
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import org.joda.time.Period
 import java.util.*
+import org.joda.time.Period
 
 
 class UpdatesReceiver : BroadcastReceiver() {
@@ -40,17 +37,20 @@ class UpdatesReceiver : BroadcastReceiver() {
                 CalendarHelper.updateEventList(context)
             }
 
-            "com.sec.android.widgetapp.APPWIDGET_RESIZE",
-            AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED,
-            Actions.ACTION_ALARM_UPDATE,
-            Actions.ACTION_UPDATE_GREETINGS,
             Actions.ACTION_TIME_UPDATE -> {
                 MainWidget.updateWidget(context)
                 if (intent.hasExtra(EVENT_ID)) {
                     setUpdates(context, intent.getLongExtra(EVENT_ID, -1))
                 }
             }
 
+            "com.sec.android.widgetapp.APPWIDGET_RESIZE",
+            AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED,
+            Actions.ACTION_ALARM_UPDATE,
+            Actions.ACTION_UPDATE_GREETINGS -> {
+                MainWidget.updateWidget(context)
+            }
+
             Actions.ACTION_CLEAR_NOTIFICATION -> {
                 ActiveNotificationsHelper.clearLastNotification(context)
             }

diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt
@@ -1,18 +1,12 @@
 package com.tommasoberlose.anotherwidget.receivers
 
-import android.app.AlarmManager
-import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Preferences
+import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
 import com.tommasoberlose.anotherwidget.services.WeatherWorker
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import java.util.concurrent.TimeUnit
-
 
 class WeatherReceiver : BroadcastReceiver() {
 
@@ -22,32 +16,22 @@ class WeatherReceiver : BroadcastReceiver() {
             Intent.ACTION_MY_PACKAGE_REPLACED,
             Intent.ACTION_TIMEZONE_CHANGED,
             Intent.ACTION_LOCALE_CHANGED,
-            Intent.ACTION_TIME_CHANGED -> setUpdates(context)
-
+            Intent.ACTION_TIME_CHANGED,
             Actions.ACTION_WEATHER_UPDATE -> {
-                WeatherWorker.enqueue(context)
+                WeatherHelper.updateWeather(context)
             }
         }
     }
 
     companion object {
         fun setUpdates(context: Context) {
             if (Preferences.showWeather) {
-                val interval = when (Preferences.weatherRefreshPeriod) {
-                    0 -> 30
-                    1 -> 60
-                    2 -> 60L * 3
-                    3 -> 60L * 6
-                    4 -> 60L * 12
-                    5 -> 60L * 24
-                    else -> 60
-                }
-                WeatherWorker.enqueuePeriodic(context, interval, TimeUnit.MINUTES)
+                WeatherWorker.enqueueTrigger(context)
             }
         }
 
         fun removeUpdates(context: Context) {
-            WeatherWorker.cancelPeriodic(context)
+            WeatherWorker.cancelTrigger(context)
         }
     }
 }