fix, v2.0.0

Author: alllexey-dev

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "dev.alllexey.itmowidgets"
         minSdk = 26
         targetSdk = 36
-        versionCode = 1
-        versionName = "1.4"
+        versionCode = 2
+        versionName = "2.0.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -55,7 +55,7 @@
             android:label="@string/qr_widget_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="me.alllexey123.itmowidgets.action.QR_WIDGET_CLICK" />
+                <action android:name="dev.alllexey.itmowidgets.action.QR_WIDGET_CLICK" />
             </intent-filter>
 
             <meta-data

app/src/main/java/dev/alllexey/itmowidgets/AppIntents.kt

@@ -1,6 +1,6 @@
 package dev.alllexey.itmowidgets
 
 object AppIntents {
-    const val EXTRA_TARGET_FRAGMENT = "me.alllexey123.itmowidgets.TARGET_FRAGMENT"
+    const val EXTRA_TARGET_FRAGMENT = "dev.alllexey.itmowidgets.TARGET_FRAGMENT"
     const val TARGET_SCHEDULE_FRAGMENT = "SCHEDULE"
 }

app/src/main/java/dev/alllexey/itmowidgets/ui/widgets/QrCodeWidget.kt

@@ -126,7 +126,7 @@ class QrCodeWidget : AppWidgetProvider() {
 
     companion object {
 
-        const val ACTION_WIDGET_CLICK: String = "me.alllexey123.itmowidgets.action.QR_WIDGET_CLICK"
+        const val ACTION_WIDGET_CLICK: String = "dev.alllexey.itmowidgets.action.QR_WIDGET_CLICK"
 
         fun updateAppWidget(
             context: Context,

app/src/main/java/dev/alllexey/itmowidgets/workers/LessonWidgetUpdateWorker.kt

@@ -99,7 +99,7 @@ class LessonWidgetUpdateWorker(
     }
 
     companion object {
-        private const val WIDGET_UPDATE_WORK_NAME = "me.alllexey123.itmowidgets.LessonWidgetUpdate"
+        private const val WIDGET_UPDATE_WORK_NAME = "dev.alllexey.itmowidgets.LessonWidgetUpdate"
 
         fun enqueueImmediateUpdate(context: Context) {
             val request = OneTimeWorkRequestBuilder<LessonWidgetUpdateWorker>().build()

app/src/main/java/dev/alllexey/itmowidgets/workers/QrAnimationWorker.kt

@@ -25,7 +25,7 @@ class QrAnimationWorker(appContext: Context, workerParams: WorkerParameters) :
     CoroutineWorker(appContext, workerParams) {
 
     companion object {
-        const val WORK_NAME = "me.alllexey123.itmowidgets.QrWidgetAnimation"
+        const val WORK_NAME = "dev.alllexey.itmowidgets.QrWidgetAnimation"
         const val KEY_APP_WIDGET_ID = "app_widget_id"
 
         fun easeInOut(fraction: Float): Float {

app/src/main/java/dev/alllexey/itmowidgets/workers/QrWidgetUpdateWorker.kt

@@ -30,10 +30,21 @@ class QrWidgetUpdateWorker(val appContext: Context, workerParams: WorkerParamete
             return Result.success()
         }
 
-        val bitmap: Bitmap = if (storage.settings.getQrSpoilerState()) {
+        val qrHex = try {
+            qrToolkit.getQrHex(allowCached = false) // update
+        } catch (e1: Exception) {
+            appContainer.errorLogRepository.logThrowable(e1, QrWidgetUpdateWorker::class.java.name)
+            try {
+                qrToolkit.getQrHex(allowCached = true)
+            } catch (e2: Exception) {
+                appContainer.errorLogRepository.logThrowable(e2, QrWidgetUpdateWorker::class.java.name)
+                null
+            }
+        }
+
+        val bitmap: Bitmap = if (qrHex == null || storage.settings.getQrSpoilerState()) {
             qrToolkit.generateSpoilerBitmap()
         } else {
-            val qrHex = qrToolkit.getQrHex(allowCached = false)
             qrToolkit.generateQrBitmap(qrHex)
         }
 
@@ -57,7 +68,7 @@ class QrWidgetUpdateWorker(val appContext: Context, workerParams: WorkerParamete
     }
 
     companion object {
-        const val WIDGET_UPDATE_WORK_NAME = "me.alllexey123.itmowidgets.QrWidgetUpdate"
+        const val WIDGET_UPDATE_WORK_NAME = "dev.alllexey.itmowidgets.QrWidgetUpdate"
 
         fun enqueueImmediateUpdate(context: Context) {
             val immediateWorkRequest = OneTimeWorkRequestBuilder<QrWidgetUpdateWorker>()

app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">ITMO.Widgets</string>
-    <string name="app_version">1.4.0</string>
+    <string name="app_version">2.0.0</string>
     <string name="single_lesson_widget_name">Пара</string>
     <string name="single_lesson_widget_description">Текущая или следующая</string>
     <string name="list_lesson_widget_name">Расписание</string>
@@ -10,7 +10,7 @@
     <string name="refresh_token_help_url">https://github.com/alllexey-dev/ITMO.Widgets?tab=readme-ov-file#использование</string>
     <string name="latest_release_url">https://github.com/alllexey-dev/ITMO.Widgets/releases/latest</string>
     <string name="default_notification_channel_id" translatable="false">fcm_default_channel</string>
-    <string name="title_web">Сайт MyItmo</string>
+    <string name="title_web">My ITMO</string>
     <string name="title_qr">Пропуск</string>
     <string name="title_schedule">Расписание</string>
     <string name="title_sport">Спорт</string>