Merge pull request #58 from inucat/bugfix/widget-npe

Fix exception on widget

Author: private-yusuke

app/src/main/java/net/twinte/android/datastore/schedule/ScheduleDataStore.kt

@@ -12,5 +12,5 @@ interface ScheduleDataStore {
         ),
     )
 
-    suspend fun getSchedule(date: Date): Timetable
+    suspend fun getSchedule(date: Date): Timetable?
 }

app/src/main/java/net/twinte/android/datastore/schedule/SharedPreferencesScheduleDataStore.kt

@@ -47,7 +47,7 @@ class SharedPreferencesScheduleDataStore @Inject constructor(
         }
     }
 
-    override suspend fun getSchedule(date: Date): Timetable = withContext(Dispatchers.IO) {
+    override suspend fun getSchedule(date: Date): Timetable? = withContext(Dispatchers.IO) {
         val d = simpleDateFormat.format(date)
         if (!pref.contains(d)) update(arrayOf(date))
 

app/src/main/java/net/twinte/android/widget/V3LargeWidgetProvider.kt

@@ -55,7 +55,7 @@ class V3LargeWidgetProvider @Inject constructor() : AppWidgetProvider() {
         val (current) = WidgetUpdater.getShouldShowCurrentDate()
 
         try {
-            val schedule = scheduleDataStore.getSchedule(current.time)
+            val schedule = scheduleDataStore.getSchedule(current.time) ?: return@runBlocking
 
             appWidgetIds.forEach { appWidgetId ->
                 val views = RemoteViews(

app/src/main/java/net/twinte/android/widget/V3MediumWidgetProvider.kt

@@ -54,7 +54,7 @@ class V3MediumWidgetProvider @Inject constructor() : AppWidgetProvider() {
         Log.d("V3MediumWidgetProvider", "OnUpdate received")
         val (current) = WidgetUpdater.getShouldShowCurrentDate()
         try {
-            val schedule = scheduleDataStore.getSchedule(current.time)
+            val schedule = scheduleDataStore.getSchedule(current.time) ?: return@runBlocking
 
             appWidgetIds.forEach { appWidgetId ->
                 val views = RemoteViews(

app/src/main/java/net/twinte/android/widget/V3SmallWidgetProvider.kt

@@ -53,7 +53,7 @@ class V3SmallWidgetProvider @Inject constructor() : AppWidgetProvider() {
         val (current, period) = WidgetUpdater.getShouldShowCurrentDate()
 
         try {
-            val schedule = scheduleDataStore.getSchedule(current.time)
+            val schedule = scheduleDataStore.getSchedule(current.time) ?: return@runBlocking
 
             appWidgetIds.forEach { appWidgetId ->
                 val views = RemoteViews(

app/src/main/java/net/twinte/android/work/ScheduleNotifier.kt

@@ -38,7 +38,7 @@ class ScheduleNotifier : BroadcastReceiver() {
                 if (get(Calendar.HOUR_OF_DAY) > 18) add(Calendar.DATE, 1)
             }
 
-            val schedule = scheduleDataStore.getSchedule(targetDate.time)
+            val schedule = scheduleDataStore.getSchedule(targetDate.time) ?: return@runBlocking
 
             val substitute = schedule.events.find { it.changeTo != null }?.changeTo
             if (substitute != null) {