[App] Rework update handling.

szkolny-eu · Oct 22, 2022 · c8e8c17 · c8e8c17
1 parent 0d4dee7
commit c8e8c17
Show file tree

Hide file tree

Showing 15 changed files with 444 additions and 130 deletions.
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
@@ -28,7 +28,11 @@ import com.google.gson.Gson
 import com.hypertrack.hyperlog.HyperLog
 import com.mikepenz.iconics.Iconics
 import im.wangchao.mhttp.MHttp
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import me.leolin.shortcutbadger.ShortcutBadger
 import okhttp3.OkHttpClient
 import org.greenrobot.eventbus.EventBus
@@ -55,7 +59,19 @@ import pl.szczodrzynski.edziennik.utils.PermissionChecker
 import pl.szczodrzynski.edziennik.utils.Themes
 import pl.szczodrzynski.edziennik.utils.Utils
 import pl.szczodrzynski.edziennik.utils.Utils.d
-import pl.szczodrzynski.edziennik.utils.managers.*
+import pl.szczodrzynski.edziennik.utils.managers.AttendanceManager
+import pl.szczodrzynski.edziennik.utils.managers.AvailabilityManager
+import pl.szczodrzynski.edziennik.utils.managers.BuildManager
+import pl.szczodrzynski.edziennik.utils.managers.EventManager
+import pl.szczodrzynski.edziennik.utils.managers.GradesManager
+import pl.szczodrzynski.edziennik.utils.managers.MessageManager
+import pl.szczodrzynski.edziennik.utils.managers.NoteManager
+import pl.szczodrzynski.edziennik.utils.managers.NotificationChannelsManager
+import pl.szczodrzynski.edziennik.utils.managers.PermissionManager
+import pl.szczodrzynski.edziennik.utils.managers.TextStylingManager
+import pl.szczodrzynski.edziennik.utils.managers.TimetableManager
+import pl.szczodrzynski.edziennik.utils.managers.UpdateManager
+import pl.szczodrzynski.edziennik.utils.managers.UserActionManager
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 import kotlin.system.exitProcess
@@ -80,18 +96,19 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
     }
 
     val api by lazy { SzkolnyApi(this) }
-    val notificationChannelsManager by lazy { NotificationChannelsManager(this) }
-    val userActionManager by lazy { UserActionManager(this) }
-    val gradesManager by lazy { GradesManager(this) }
-    val timetableManager by lazy { TimetableManager(this) }
-    val eventManager by lazy { EventManager(this) }
-    val permissionManager by lazy { PermissionManager(this) }
     val attendanceManager by lazy { AttendanceManager(this) }
-    val buildManager by lazy { BuildManager(this) }
     val availabilityManager by lazy { AvailabilityManager(this) }
-    val textStylingManager by lazy { TextStylingManager(this) }
+    val buildManager by lazy { BuildManager(this) }
+    val eventManager by lazy { EventManager(this) }
+    val gradesManager by lazy { GradesManager(this) }
     val messageManager by lazy { MessageManager(this) }
     val noteManager by lazy { NoteManager(this) }
+    val notificationChannelsManager by lazy { NotificationChannelsManager(this) }
+    val permissionManager by lazy { PermissionManager(this) }
+    val textStylingManager by lazy { TextStylingManager(this) }
+    val timetableManager by lazy { TimetableManager(this) }
+    val updateManager by lazy { UpdateManager(this) }
+    val userActionManager by lazy { UserActionManager(this) }
 
     val db
         get() = App.db

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -46,6 +46,7 @@ import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding
 import pl.szczodrzynski.edziennik.ext.*
 import pl.szczodrzynski.edziennik.sync.AppManagerDetectedEvent
 import pl.szczodrzynski.edziennik.sync.SyncWorker
+import pl.szczodrzynski.edziennik.sync.UpdateStateEvent
 import pl.szczodrzynski.edziennik.sync.UpdateWorker
 import pl.szczodrzynski.edziennik.ui.base.MainSnackbar
 import pl.szczodrzynski.edziennik.ui.base.enums.NavTarget
@@ -56,6 +57,7 @@ import pl.szczodrzynski.edziennik.ui.dialogs.sync.RegisterUnavailableDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.sync.ServerMessageDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncViewListDialog
 import pl.szczodrzynski.edziennik.ui.dialogs.sync.UpdateAvailableDialog
+import pl.szczodrzynski.edziennik.ui.dialogs.sync.UpdateProgressDialog
 import pl.szczodrzynski.edziennik.ui.error.ErrorDetailsDialog
 import pl.szczodrzynski.edziennik.ui.error.ErrorSnackbar
 import pl.szczodrzynski.edziennik.ui.event.EventManualDialog
@@ -536,6 +538,14 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         UpdateAvailableDialog(this, event).show()
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    fun onUpdateStateEvent(event: UpdateStateEvent) {
+        if (!event.running)
+            return
+        EventBus.getDefault().removeStickyEvent(event)
+        UpdateProgressDialog(this, event.update ?: return, event.downloadId).show()
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     fun onRegisterAvailabilityEvent(event: RegisterAvailabilityEvent) {
         EventBus.getDefault().removeStickyEvent(event)
@@ -699,6 +709,10 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
 
         if (extras?.containsKey("action") == true) {
             val handled = when (extras.getString("action")) {
+                "updateRequest" -> {
+                    UpdateAvailableDialog(this, app.config.update).show()
+                    true
+                }
                 "serverMessage" -> {
                     ServerMessageDialog(
                         this,

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt
@@ -13,7 +13,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
-import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
 import pl.szczodrzynski.edziennik.data.api.ERROR_API_INVALID_SIGNATURE
 import pl.szczodrzynski.edziennik.data.api.szkolny.adapter.DateAdapter
@@ -128,16 +127,10 @@ class SzkolnyApi(val app: App) : CoroutineScope {
         response: Response<ApiResponse<T>>,
         updateDeviceHash: Boolean = false,
     ): T {
-        app.config.update = response.body()?.update?.let { update ->
-            if (update.versionCode > BuildConfig.VERSION_CODE) {
-                if (update.updateMandatory
-                        && EventBus.getDefault().hasSubscriberForEvent(update::class.java)) {
-                    EventBus.getDefault().postSticky(update)
-                }
-                update
-            }
-            else
-                null
+        response.body()?.update?.let { update ->
+            // do not process "null" update, as it might not mean there's no update
+            // do not notify; silently check and show the home update card
+            app.updateManager.process(update, notify = false)
         }
 
         response.body()?.registerAvailability?.let { registerAvailability ->
@@ -431,8 +424,8 @@ class SzkolnyApi(val app: App) : CoroutineScope {
     }
 
     @Throws(Exception::class)
-    fun getUpdate(channel: String): List<Update> {
-        val response = api.updates(channel).execute()
+    fun getUpdate(channel: Update.Type): List<Update> {
+        val response = api.updates(channel.name.lowercase()).execute()
         return parseResponse(response)
     }
 

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt
@@ -5,12 +5,21 @@
 package pl.szczodrzynski.edziennik.data.api.szkolny.response
 
 data class Update(
-        val versionCode: Int,
-        val versionName: String,
-        val releaseDate: String,
-        val releaseNotes: String?,
-        val releaseType: String,
-        val isOnGooglePlay: Boolean,
-        val downloadUrl: String?,
-        val updateMandatory: Boolean
-)
+    val versionCode: Int,
+    val versionName: String,
+    val releaseDate: String,
+    val releaseNotes: String?,
+    val releaseType: String,
+    val isOnGooglePlay: Boolean,
+    val downloadUrl: String?,
+    val updateMandatory: Boolean,
+) {
+
+    enum class Type {
+        NIGHTLY,
+        DEV,
+        BETA,
+        RC,
+        RELEASE,
+    }
+}
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt
@@ -6,22 +6,30 @@ package pl.szczodrzynski.edziennik.data.firebase
 
 import com.google.gson.JsonParser
 import com.google.gson.reflect.TypeToken
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.data.api.events.FeedbackMessageEvent
 import pl.szczodrzynski.edziennik.data.api.events.RegisterAvailabilityEvent
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.data.api.task.PostNotifications
-import pl.szczodrzynski.edziennik.data.db.entity.*
+import pl.szczodrzynski.edziennik.data.db.entity.Event
+import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage
+import pl.szczodrzynski.edziennik.data.db.entity.Metadata
+import pl.szczodrzynski.edziennik.data.db.entity.Note
+import pl.szczodrzynski.edziennik.data.db.entity.Notification
+import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.enums.MetadataType
 import pl.szczodrzynski.edziennik.data.db.enums.NotificationType
 import pl.szczodrzynski.edziennik.ext.getInt
 import pl.szczodrzynski.edziennik.ext.getLong
 import pl.szczodrzynski.edziennik.ext.getString
 import pl.szczodrzynski.edziennik.ext.resolveString
-import pl.szczodrzynski.edziennik.sync.UpdateWorker
 import pl.szczodrzynski.edziennik.ui.base.enums.NavTarget
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
@@ -64,7 +72,10 @@ class SzkolnyAppFirebase(val app: App, val profiles: List<Profile>, val message:
                         message.data.getString("title") ?: "",
                         message.data.getString("message") ?: ""
                 )
-                "appUpdate" -> launch { UpdateWorker.runNow(app, app.gson.fromJson(message.data.getString("update"), Update::class.java)) }
+                "appUpdate" -> {
+                    val update = app.gson.fromJson(message.data.getString("update"), Update::class.java)
+                    app.updateManager.process(update, notify = true)
+                }
                 "feedbackMessage" -> launch {
                     val message = app.gson.fromJson(message.data.getString("message"), FeedbackMessage::class.java) ?: return@launch
                     feedbackMessage(message)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateStateEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateStateEvent.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2022-10-22.
+ */
+
+package pl.szczodrzynski.edziennik.sync
+
+import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
+
+class UpdateStateEvent(val running: Boolean, val update: Update?, val downloadId: Long)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt
@@ -5,25 +5,14 @@
 package pl.szczodrzynski.edziennik.sync
 
 import android.annotation.SuppressLint
-import android.app.NotificationManager
-import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
-import android.widget.Toast
-import androidx.core.app.NotificationCompat
 import androidx.work.*
 import kotlinx.coroutines.*
-import org.greenrobot.eventbus.EventBus
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi
 import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update
 import pl.szczodrzynski.edziennik.ext.DAY
-import pl.szczodrzynski.edziennik.ext.concat
 import pl.szczodrzynski.edziennik.ext.formatDate
-import pl.szczodrzynski.edziennik.ext.pendingIntentFlag
 import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.html.BetterHtml
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 
@@ -76,63 +65,6 @@ class UpdateWorker(val context: Context, val params: WorkerParameters) : Worker(
             Utils.d(TAG, "Cancelling work by tag $TAG")
             WorkManager.getInstance(app).cancelAllWorkByTag(TAG)
         }
-
-        suspend fun runNow(app: App, overrideUpdate: Update? = null) {
-            try {
-                val update = overrideUpdate
-                        ?: run {
-                            withContext(Dispatchers.Default) {
-                                SzkolnyApi(app).runCatching({
-                                    getUpdate("beta")
-                                }, {
-                                    Toast.makeText(app, app.getString(R.string.notification_cant_check_update), Toast.LENGTH_SHORT).show()
-                                })
-                            } ?: return@run null
-
-                            if (app.config.update == null
-                                    || app.config.update?.versionCode ?: BuildConfig.VERSION_CODE <= BuildConfig.VERSION_CODE) {
-                                app.config.update = null
-                                Toast.makeText(app, app.getString(R.string.notification_no_update), Toast.LENGTH_SHORT).show()
-                                return@run null
-                            }
-                            app.config.update
-                        } ?: return
-
-                if (update.versionCode <= BuildConfig.VERSION_CODE) {
-                    app.config.update = null
-                    return
-                }
-
-                if (EventBus.getDefault().hasSubscriberForEvent(update::class.java)) {
-                    if (!update.updateMandatory) // mandatory updates are posted by the SzkolnyApi
-                        EventBus.getDefault().postSticky(update)
-                    return
-                }
-
-                val notificationIntent = Intent(app, UpdateDownloaderService::class.java)
-                val pendingIntent = PendingIntent.getService(app, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT or pendingIntentFlag())
-                val notification = NotificationCompat.Builder(app, app.notificationChannelsManager.updates.key)
-                        .setContentTitle(app.getString(R.string.notification_updates_title))
-                        .setContentText(app.getString(R.string.notification_updates_text, update.versionName))
-                        .setTicker(app.getString(R.string.notification_updates_summary))
-                        .setSmallIcon(R.drawable.ic_notification)
-                        .setStyle(NotificationCompat.BigTextStyle()
-                                .bigText(listOf(
-                                        app.getString(R.string.notification_updates_text, update.versionName),
-                                        update.releaseNotes?.let { BetterHtml.fromHtml(context = null, it) }
-                                ).concat("\n")))
-                        .setColor(0xff2196f3.toInt())
-                        .setLights(0xFF00FFFF.toInt(), 2000, 2000)
-                        .setPriority(NotificationCompat.PRIORITY_HIGH)
-                        .setDefaults(NotificationCompat.DEFAULT_ALL)
-                        .setGroup(app.notificationChannelsManager.updates.key)
-                        .setContentIntent(pendingIntent)
-                        .setAutoCancel(false)
-                        .build()
-                (app.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).notify(app.notificationChannelsManager.updates.id, notification)
-
-            } catch (ignore: Exception) { }
-        }
     }
 
     private val job = Job()
@@ -146,22 +78,13 @@ class UpdateWorker(val context: Context, val params: WorkerParameters) : Worker(
             return Result.success()
         }
 
-        launch {
-            runNow(app)
-        }
+        val channel = if (App.devMode)
+            Update.Type.BETA
+        else
+            Update.Type.RELEASE
+        app.updateManager.checkNowSync(channel, notify = true)
 
         rescheduleNext(this.context)
         return Result.success()
     }
-
-    class JavaWrapper(app: App) : CoroutineScope {
-        private val job = Job()
-        override val coroutineContext: CoroutineContext
-            get() = job + Dispatchers.Main
-        init {
-            launch {
-                runNow(app)
-            }
-        }
-    }
 }
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateAvailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/UpdateAvailableDialog.kt
@@ -43,11 +43,11 @@ class UpdateAvailableDialog(
     override suspend fun onShow() = Unit
 
     override suspend fun onPositiveClick(): Boolean {
-        if (update == null)
+        if (update == null || update.isOnGooglePlay)
             Utils.openGooglePlay(activity)
         else
             activity.startService(Intent(app, UpdateDownloaderService::class.java))
-        return NO_DISMISS
+        return DISMISS
     }
 
     override suspend fun onBeforeShow(): Boolean {