Refactoring and QoL

alllexey-dev · alllexey-dev · commit 218249069f70 · 2025-12-12T17:25:57.000+03:00
diff --git a/app/src/main/java/dev/alllexey/itmowidgets/data/UtilityStorage.kt b/app/src/main/java/dev/alllexey/itmowidgets/data/UtilityStorage.kt
@@ -15,6 +15,7 @@ class UtilityStorage(val prefs: SharedPreferences, val context: Context) {
         const val QR_WIDGET_STATE_PREFIX = "qr_widget_state_"
         const val LESSON_WIDGET_STYLE_CHANGED_KEY = "lesson_widget_style_changed"
         const val SKIPPED_VERSION_KEY = "skipped_version"
+        const val VERSION_NOTIFIED_AT_KEY = "version_notified_at_key"
         const val ONBOARDING_COMPLETED_KEY = "onboarding_completed"
     }
 
@@ -35,6 +36,10 @@ class UtilityStorage(val prefs: SharedPreferences, val context: Context) {
         return QrWidgetState.valueOf(stateName ?: QrWidgetState.SPOILER.name)
     }
 
+    fun getVersionNotifiedAt(): Long {
+        return prefs.getLong(VERSION_NOTIFIED_AT_KEY, 0L)
+    }
+
     fun getSkippedVersion(): String {
         return prefs.getString(SKIPPED_VERSION_KEY, null) ?: ContextCompat.getString(context, R.string.app_version)
     }
@@ -78,4 +83,10 @@ class UtilityStorage(val prefs: SharedPreferences, val context: Context) {
             putBoolean(ONBOARDING_COMPLETED_KEY, completed)
         }
     }
+
+    fun setVersionNotifiedAd(notifiedAt: Long) {
+        prefs.edit(commit = true) {
+            putLong(VERSION_NOTIFIED_AT_KEY, notifiedAt)
+        }
+    }
 }
diff --git a/app/src/main/java/dev/alllexey/itmowidgets/services/MyFirebaseMessagingService.kt b/app/src/main/java/dev/alllexey/itmowidgets/services/MyFirebaseMessagingService.kt
@@ -8,8 +8,11 @@ import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.google.gson.JsonElement
 import dev.alllexey.itmowidgets.ItmoWidgetsApp
 import dev.alllexey.itmowidgets.R
+import dev.alllexey.itmowidgets.core.model.ApiResponse
+import dev.alllexey.itmowidgets.core.model.QueueEntry
 import dev.alllexey.itmowidgets.core.model.QueueEntryStatus
 import dev.alllexey.itmowidgets.core.model.fcm.FcmJsonWrapper
 import dev.alllexey.itmowidgets.core.model.fcm.impl.SportAutoSignLessonsPayload
@@ -18,88 +21,140 @@ import dev.alllexey.itmowidgets.core.model.fcm.impl.SportNewLessonsPayload
 import dev.alllexey.itmowidgets.ui.main.MainActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
+import kotlin.random.Random
 
 class MyFirebaseMessagingService : FirebaseMessagingService() {
 
+    private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    private val appContainer by lazy { (applicationContext as ItmoWidgetsApp).appContainer }
+    private val gson by lazy { appContainer.gson }
+    private val errorLogRepository by lazy { appContainer.errorLogRepository }
+    private val myItmoApi by lazy { appContainer.myItmo.api() }
+    private val widgetsApi by lazy { appContainer.itmoWidgets.api() }
+
     override fun onNewToken(token: String) {
         Log.d(TAG, "Refreshed token: $token")
         sendTokenToServer(token)
     }
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
-        val appContainer = (applicationContext as ItmoWidgetsApp).appContainer
         Log.d(TAG, "From: ${remoteMessage.from}")
 
         remoteMessage.notification?.let {
             Log.d(TAG, "Message Notification Body: ${it.body}")
             sendNotification(it.title, it.body)
         }
 
-        // todo: remove later (test only)
         remoteMessage.data["data"]?.let { jsonPayload ->
-            val gson = appContainer.gson
+            handleDataMessage(jsonPayload)
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        serviceScope.cancel()
+    }
+
+    private fun handleDataMessage(jsonPayload: String) {
+        try {
+            val wrapper = gson.fromJson(jsonPayload, FcmJsonWrapper::class.java)
+            when (wrapper.type) {
+                SportNewLessonsPayload.TYPE -> handleNewLessons(wrapper.payload)
+                SportFreeSignLessonsPayload.TYPE -> handleFreeSign(wrapper.payload)
+                SportAutoSignLessonsPayload.TYPE -> handleAutoSign(wrapper.payload)
+                else -> Log.w(TAG, "Unknown payload type: ${wrapper.type}")
+            }
+        } catch (e: Exception) {
+            handleError(e)
+        }
+    }
+
+    private fun handleNewLessons(payloadJson: JsonElement) {
+        // unused
+//        val data = gson.fromJson(payloadJson, SportNewLessonsPayload::class.java)
+//        sendNotification("Уведомление фильтра", "${data.sportLessonIds.size} new lessons")
+    }
+
+    private fun handleFreeSign(payloadJson: JsonElement) {
+        val data = gson.fromJson(payloadJson, SportFreeSignLessonsPayload::class.java)
+
+        serviceScope.launch {
+            processLessonSignUp(
+                lessonIds = data.sportLessonIds,
+                notificationTitle = "Автозапись (при освобождении)",
+                fetchEntries = { widgetsApi.mySportFreeSignEntries() },
+                markSatisfied = { id -> widgetsApi.markSportFreeSignEntrySatisfied(id) }
+            )
+        }
+    }
+
+    private fun handleAutoSign(payloadJson: JsonElement) {
+        val data = gson.fromJson(payloadJson, SportFreeSignLessonsPayload::class.java)
+
+        serviceScope.launch {
+            processLessonSignUp(
+                lessonIds = data.sportLessonIds,
+                notificationTitle = "Автозапись (на прогнозируемое занятие)",
+                fetchEntries = { widgetsApi.mySportAutoSignEntries() },
+                markSatisfied = { id -> widgetsApi.markSportAutoSignEntrySatisfied(id) }
+            )
+        }
+    }
+
+    private suspend fun <T : QueueEntry> processLessonSignUp(
+        lessonIds: List<Long>,
+        notificationTitle: String,
+        fetchEntries: suspend () -> ApiResponse<List<T>>,
+        markSatisfied: suspend (Long) -> Unit
+    ) {
+        val entriesResponse = try {
+            fetchEntries()
+        } catch (e: Exception) {
+            errorLogRepository.logThrowable(e, TAG)
+            return
+        }
+
+        lessonIds.forEach { lessonId ->
             try {
-                val wrapper = gson.fromJson(jsonPayload, FcmJsonWrapper::class.java)
-                when (wrapper.type) {
-                    SportNewLessonsPayload.TYPE -> {
-                        val data = gson.fromJson(wrapper.payload, SportNewLessonsPayload::class.java)
-                        sendNotification("SPORT NOTIF", "${data.sportLessonIds.size} new lessons")
-                    }
-                    SportFreeSignLessonsPayload.TYPE -> {
-                        val data = gson.fromJson(wrapper.payload, SportFreeSignLessonsPayload::class.java)
-                        CoroutineScope(Dispatchers.IO).launch {
-                            val freeSignEntries = appContainer.itmoWidgets.api().mySportFreeSignEntries()
-                            data.sportLessonIds.forEach {
-                                try {
-                                    appContainer.myItmo.api().signInLessons(listOf(it)).execute().body()!!.result
-                                    freeSignEntries.data?.firstOrNull { e -> e.status == QueueEntryStatus.NOTIFIED }
-                                        ?.let { e -> appContainer.itmoWidgets.api().markSportFreeSignEntrySatisfied(e.id) }
-                                    sendNotification("Автозапись (при освобождении)", "Вы успешно записаны на занятие!")
-                                } catch (e: Exception) {
-                                    appContainer.errorLogRepository.logThrowable(e,
-                                        MyFirebaseMessagingService::class.java.name)
-                                }
-                            }
-                        }
-                    }
-                    SportAutoSignLessonsPayload.TYPE -> {
-                        val data = gson.fromJson(wrapper.payload, SportFreeSignLessonsPayload::class.java)
-                        CoroutineScope(Dispatchers.IO).launch {
-                            val autoSignEntries = appContainer.itmoWidgets.api().mySportAutoSignEntries()
-                            data.sportLessonIds.forEach {
-                                try {
-                                    appContainer.myItmo.api().signInLessons(listOf(it)).execute().body()!!.result
-                                    autoSignEntries.data?.firstOrNull { e -> e.status == QueueEntryStatus.NOTIFIED }
-                                        ?.let { e -> appContainer.itmoWidgets.api().markSportAutoSignEntrySatisfied(e.id) }
-                                    sendNotification("Автозапись (на прогнозируемое занятие)", "Вы успешно записаны на занятие!")
-                                } catch (e: Exception) {
-                                    appContainer.errorLogRepository.logThrowable(e,
-                                        MyFirebaseMessagingService::class.java.name)
-                                }
-                            }
+                val body = myItmoApi.signInLessons(listOf(lessonId)).execute().body()
+
+                if (body?.result != null) {
+                    entriesResponse.data
+                        ?.firstOrNull { e -> e.status == QueueEntryStatus.NOTIFIED }
+                        ?.let { entry ->
+                            markSatisfied(entry.id)
                         }
-                    }
+
+                    sendNotification(notificationTitle, "Вы успешно записаны на занятие!")
+                } else {
+                    throw RuntimeException("Could not sign in sport lesson: ${body?.errorMessage}")
                 }
             } catch (e: Exception) {
-                try {
-                    sendNotification("FCM", "Ошибка обработки события, посмотрите логи")
-                    appContainer.errorLogRepository.logThrowable(e, MyFirebaseMessagingService::class.java.name)
-                } catch (e: Exception) {
-                    appContainer.errorLogRepository.logThrowable(e, MyFirebaseMessagingService::class.java.name)
-                }
+                errorLogRepository.logThrowable(e, TAG)
             }
         }
     }
 
     private fun sendNotification(title: String?, messageBody: String?) {
-        val intent = Intent(this, MainActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-        val pendingIntent = PendingIntent.getActivity(this, 0, intent,
-            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE)
+        val intent = Intent(this, MainActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        }
+
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            intent,
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
+        )
 
         val channelId = getString(R.string.default_notification_channel_id)
+
+        createNotificationChannel(channelId)
+
         val notificationBuilder = NotificationCompat.Builder(this, channelId)
             .setSmallIcon(R.drawable.ic_notification)
             .setContentTitle(title)
@@ -109,22 +164,41 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
 
         val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
 
-        val channel = NotificationChannel(
-            channelId,
-            "Default Channel",
-            NotificationManager.IMPORTANCE_DEFAULT
-        )
-        notificationManager.createNotificationChannel(channel)
+        val notificationId = (messageBody?.hashCode() ?: Random.nextInt())
+        notificationManager.notify(notificationId, notificationBuilder.build())
+    }
 
-        notificationManager.notify(0, notificationBuilder.build())
+    private fun createNotificationChannel(channelId: String) {
+        val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        if (notificationManager.getNotificationChannel(channelId) == null) {
+            val channel = NotificationChannel(
+                channelId,
+                "Default Channel",
+                NotificationManager.IMPORTANCE_DEFAULT
+            )
+            notificationManager.createNotificationChannel(channel)
+        }
     }
 
     private fun sendTokenToServer(token: String) {
-        val appContainer = (applicationContext as ItmoWidgetsApp).appContainer
-        val itmoWidgets = appContainer.itmoWidgets
         appContainer.storage.utility.setFirebaseToken(token)
         if (appContainer.storage.settings.getCustomServicesState()) {
-            runBlocking { itmoWidgets.sendFirebaseToken(token) }
+            serviceScope.launch {
+                try {
+                    appContainer.itmoWidgets.sendFirebaseToken(token)
+                } catch (e: Exception) {
+                    Log.e(TAG, "Failed to send token", e)
+                }
+            }
+        }
+    }
+
+    private fun handleError(e: Exception) {
+        try {
+            sendNotification("FCM Error", "Ошибка обработки события, посмотрите логи")
+            errorLogRepository.logThrowable(e, TAG)
+        } catch (innerEx: Exception) {
+            Log.e(TAG, "Error handling failed", innerEx)
         }
     }
 
diff --git a/app/src/main/java/dev/alllexey/itmowidgets/ui/main/MainActivity.kt b/app/src/main/java/dev/alllexey/itmowidgets/ui/main/MainActivity.kt
@@ -43,8 +43,7 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val appContainer = (applicationContext as ItmoWidgetsApp).appContainer
-        if (!appContainer.storage.utility.getOnboardingCompleted()) {
+        if (!appContainer().storage.utility.getOnboardingCompleted()) {
             startActivity(Intent(this, OnboardingActivity::class.java))
             finish()
             return
@@ -107,8 +106,8 @@ class MainActivity : AppCompatActivity() {
 
         if (intent.getBooleanExtra("onboarding", false)) {
             MaterialAlertDialogBuilder(this, R.style.AlertDialogTheme_FilledButton)
-                .setTitle("И напоследок...")
-                .setMessage("Крайне советую посмотреть остальные настройки приложения в самой правой вкладке.\nВероятно, там есть что-то интересное для тебя.")
+                .setTitle("А ещё...")
+                .setMessage("Обязательно посмотри остальные настройки приложения в правой вкладке\n\nТам точно есть что-то интересное для тебя \uD83D\uDC40")
                 .setPositiveButton("Хорошо") { dialog, which -> }
                 .show()
         } else {
@@ -117,33 +116,33 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun resendFcmTokens() {
-        val appContainer = applicationContext.appContainer()
-        val firebaseToken = appContainer.storage.utility.getFirebaseToken()
-        if (firebaseToken != null && appContainer.storage.settings.getCustomServicesState()) {
+        val firebaseToken = appContainer().storage.utility.getFirebaseToken()
+        if (firebaseToken != null && appContainer().storage.settings.getCustomServicesState()) {
             CoroutineScope(Dispatchers.IO).launch {
                 try {
-                    appContainer.itmoWidgets.sendFirebaseToken(firebaseToken)
+                    appContainer().itmoWidgets.sendFirebaseToken(firebaseToken)
                 } catch (e: Exception) {
-                    appContainer.errorLogRepository.logThrowable(e, MainActivity::class.java.name + " [FCM]")
+                    appContainer().errorLogRepository.logThrowable(e, MainActivity::class.java.name + " [FCM]")
                 }
             }
         }
     }
 
     fun checkVersion() {
-        val appContainer = applicationContext.appContainer()
         CoroutineScope(Dispatchers.IO).launch {
-            if (!appContainer.storage.settings.getCustomServicesState()) return@launch
+            if (!appContainer().storage.settings.getCustomServicesState()) return@launch
+            val delta = System.currentTimeMillis() - appContainer().storage.utility.getVersionNotifiedAt()
+            if (delta < 1000 * 60 * 60 * 24) return@launch // once every day
             try {
-                val latestVersion = appContainer.itmoWidgets.api().latestAppVersion().data!!
+                val latestVersion = appContainer().itmoWidgets.api().latestAppVersion().data!!
                 val currentVersion = getString(applicationContext, R.string.app_version)
                 withContext(Dispatchers.Main) {
-                    if (latestVersion > currentVersion && latestVersion > appContainer.storage.utility.getSkippedVersion()) {
+                    if (latestVersion > currentVersion && latestVersion > appContainer().storage.utility.getSkippedVersion()) {
                         showVersionPopup(latestVersion, currentVersion)
                     }
                 }
             } catch (e: Exception) {
-                appContainer.errorLogRepository.logThrowable(e, MainActivity::class.java.name + " [VER]")
+                appContainer().errorLogRepository.logThrowable(e, MainActivity::class.java.name + " [VER]")
             }
         }
     }
@@ -153,7 +152,12 @@ class MainActivity : AppCompatActivity() {
             .setTitle("Новая версия \uD83D\uDE80")
             .setMessage("У приложения вышло обновление! Возможно, там будет что-то интересное для тебя \uD83D\uDC40\n${currentVersion} ➜ ${latestVersion} ")
             .setNeutralButton("Напомнить позже") { dialog, which ->
-
+                appContainer().storage.utility.setVersionNotifiedAd(System.currentTimeMillis())
+                Toast.makeText(
+                    applicationContext,
+                    "Хорошо, напомним позже \uD83D\uDC4C",
+                    Toast.LENGTH_SHORT
+                ).show()
             }
             .setNegativeButton("Пропустить версию") { dialog, which ->
                 val appContainer = (applicationContext as ItmoWidgetsApp).appContainer
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-itmoWidgetsCore = "1.1.2"
+itmoWidgetsCore = "1.1.5"
 myItmoApi = "1.4.1"
 agp = "8.12.3"
 androidImageCropper = "4.6.0"

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ class UtilityStorage(val prefs: SharedPreferences, val context: Context) {`
`15`	`15`	`const val QR_WIDGET_STATE_PREFIX = "qr_widget_state_"`
`16`	`16`	`const val LESSON_WIDGET_STYLE_CHANGED_KEY = "lesson_widget_style_changed"`
`17`	`17`	`const val SKIPPED_VERSION_KEY = "skipped_version"`
	`18`	`+ const val VERSION_NOTIFIED_AT_KEY = "version_notified_at_key"`
`18`	`19`	`const val ONBOARDING_COMPLETED_KEY = "onboarding_completed"`
`19`	`20`	`}`
`20`	`21`
`@@ -35,6 +36,10 @@ class UtilityStorage(val prefs: SharedPreferences, val context: Context) {`
`35`	`36`	`return QrWidgetState.valueOf(stateName ?: QrWidgetState.SPOILER.name)`
`36`	`37`	`}`
`37`	`38`
	`39`	`+ fun getVersionNotifiedAt(): Long {`
	`40`	`+ return prefs.getLong(VERSION_NOTIFIED_AT_KEY, 0L)`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`fun getSkippedVersion(): String {`
`39`	`44`	`return prefs.getString(SKIPPED_VERSION_KEY, null) ?: ContextCompat.getString(context, R.string.app_version)`
`40`	`45`	`}`
`@@ -78,4 +83,10 @@ class UtilityStorage(val prefs: SharedPreferences, val context: Context) {`
`78`	`83`	`putBoolean(ONBOARDING_COMPLETED_KEY, completed)`
`79`	`84`	`}`
`80`	`85`	`}`
	`86`	`+`
	`87`	`+ fun setVersionNotifiedAd(notifiedAt: Long) {`
	`88`	`+ prefs.edit(commit = true) {`
	`89`	`+ putLong(VERSION_NOTIFIED_AT_KEY, notifiedAt)`
	`90`	`+ }`
	`91`	`+ }`
`81`	`92`	`}`