Fixes, little changes, error logging

Author: alllexey

app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/SingleLessonWidget.kt

@@ -45,10 +45,10 @@ open class SingleLessonWidget : AppWidgetProvider() {
             views.setTextViewText(R.id.location_building, widgetData.building)
             views.setTextViewText(R.id.time, widgetData.times)
             views.setTextViewText(R.id.more_lessons_text, widgetData.moreLessonsText)
-            views.setViewVisibility(R.id.teacher_layout, if (widgetData.teacher == null) View.GONE else View.VISIBLE)
+            views.setViewVisibility(R.id.teacher_layout, if (widgetData.teacher.isNullOrEmpty()) View.GONE else View.VISIBLE)
             views.setViewVisibility(R.id.location_layout, if (widgetData.room == null && widgetData.building == null) View.GONE else View.VISIBLE)
-            views.setViewVisibility(R.id.time_layout, if (widgetData.times == null) View.GONE else View.VISIBLE)
-            views.setViewVisibility(R.id.more_lessons_layout, if (widgetData.moreLessonsText == null) View.GONE else View.VISIBLE)
+            views.setViewVisibility(R.id.time_layout, if (widgetData.times.isNullOrEmpty()) View.GONE else View.VISIBLE)
+            views.setViewVisibility(R.id.more_lessons_layout, if (widgetData.moreLessonsText.isNullOrEmpty()) View.GONE else View.VISIBLE)
 
             val colorId = ScheduleUtils.getWorkTypeColor(widgetData.workTypeId)
             views.setInt(

app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/data/LessonWidgetDataManager.kt

@@ -30,7 +30,7 @@ class LessonWidgetDataManager(
             listDataResult = getLessonListData(lessons)
             nextUpdateAt = getNextUpdateAt(lessons)
         } catch (e: Exception) {
-            e.printStackTrace()
+            storage.setErrorLog("[${javaClass.name}]: ${e.stackTraceToString()}}")
             singleDataResult = SingleLessonWidgetData.Error(getSingleLessonWidgetLayout())
 
             listDataResult = LessonListWidgetData(

app/src/main/java/me/alllexey123/itmowidgets/util/ScheduleUtils.kt

@@ -22,7 +22,7 @@ object ScheduleUtils {
         val currTime = DateTimeFormatter.ofPattern("HH:mm").format(timeContext)
 
         for (lesson in lessons) {
-            if (lesson.timeEnd >= currTime && lesson.timeStart <= currTime) {
+            if (lesson.timeEnd > currTime && lesson.timeStart <= currTime) {
                 result = lesson
                 break
             }

app/src/main/java/me/alllexey123/itmowidgets/workers/LessonWidgetUpdateWorker.kt

@@ -44,30 +44,34 @@ class LessonWidgetUpdateWorker(
             return Result.success()
         }
 
-        val onlyDataChanged = !storage.getLessonWidgetStyleChanged()
-
-        val dataManager = LessonWidgetDataManager(repository, storage)
-        val widgetsState = dataManager.getLessonWidgetsState()
-        
-        updateSingleLessonWidgets(
-            appWidgetManager,
-            singleWidgetIds,
-            widgetsState.singleLessonData
-        )
-        
-        updateLessonListWidgets(
-            appWidgetManager,
-            listWidgetIds,
-            widgetsState.lessonListWidgetData,
-            onlyDataChanged
-        )
+        try {
+            val onlyDataChanged = !storage.getLessonWidgetStyleChanged()
 
-        storage.setLessonWidgetStyleChanged(false)
+            val dataManager = LessonWidgetDataManager(repository, storage)
+            val widgetsState = dataManager.getLessonWidgetsState()
 
-        // Small offset to prevent update loops
-//        nextUpdateAt = nextUpdateAt?.plusSeconds(70)
+            updateSingleLessonWidgets(
+                appWidgetManager,
+                singleWidgetIds,
+                widgetsState.singleLessonData
+            )
+
+            updateLessonListWidgets(
+                appWidgetManager,
+                listWidgetIds,
+                widgetsState.lessonListWidgetData,
+                onlyDataChanged
+            )
+
+            storage.setLessonWidgetStyleChanged(false)
+
+            scheduleNextUpdate(appContext, widgetsState.nextUpdateAt)
+        } catch (e: Exception) {
+            storage.setErrorLog("[${javaClass.name}]: ${e.stackTraceToString()}}")
+
+            scheduleNextUpdate(appContext, null)
+        }
 
-        scheduleNextUpdate(appContext, widgetsState.nextUpdateAt)
         return Result.success()
     }