From e17dbb8f9600112e7f2c41d9ed7434d7d47cf768 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Wed, 18 Dec 2024 21:58:13 +0700
Subject: [PATCH] Revert "Offer selfupdate for nightlies"

Doesn't works properly, should be tested before deploying

This reverts commit 279be8af683fd454c85cadc46bdb8e4828e80150.
---
 .../aurora/store/data/work/UpdateWorker.kt    | 52 +++----------------
 .../java/com/aurora/store/util/Preferences.kt |  2 -
 2 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt b/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt
index 7e162be20..fac761fa3 100644
--- a/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt
+++ b/app/src/main/java/com/aurora/store/data/work/UpdateWorker.kt
@@ -29,7 +29,6 @@ import com.aurora.store.util.NotificationUtil
 import com.aurora.store.util.PackageUtil
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_UPDATES_AUTO
-import com.aurora.store.util.save
 import com.google.gson.Gson
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
@@ -156,25 +155,13 @@ class UpdateWorker @AssistedInject constructor(
             val filteredPackages = if (isAuroraOnlyFilterEnabled) {
                 packages.filter { CertUtil.isAuroraStoreApp(appContext, it.packageName) }
             } else {
-                packages.filterNot {
-                    if (isFDroidFilterEnabled)
-                        CertUtil.isFDroidApp(appContext, it.packageName)
-                    else
-                        false
-                }
+                packages.filterNot { if (isFDroidFilterEnabled) CertUtil.isFDroidApp(appContext, it.packageName) else false }
             }
 
-            val updates =
-                appDetailsHelper.getAppByPackageName(filteredPackages.map { it.packageName })
-                    .filter { it.displayName.isNotEmpty() }
-                    .filter {
-                        PackageUtil.isUpdatable(
-                            appContext,
-                            it.packageName,
-                            it.versionCode.toLong()
-                        )
-                    }
-                    .toMutableList()
+            val updates = appDetailsHelper.getAppByPackageName(filteredPackages.map { it.packageName })
+                .filter { it.displayName.isNotEmpty() }
+                .filter { PackageUtil.isUpdatable(appContext, it.packageName, it.versionCode.toLong()) }
+                .toMutableList()
 
             if (canSelfUpdate) getSelfUpdate()?.let { updates.add(it) }
 
@@ -204,30 +191,13 @@ class UpdateWorker @AssistedInject constructor(
                     SelfUpdate::class.java
                 )
 
-                val lastSelfUpdate = gson.fromJson(
-                    Preferences.getString(
-                        appContext,
-                        Preferences.PREFERENCE_SELF_UPDATE,
-                        "{}"
-                    ),
-                    SelfUpdate::class.java
-                )
-
-                if (lastSelfUpdate.versionCode == 0) {
-                    Log.i(TAG, "No old self-updates entry found, saving current!")
-                    saveSelfUpdate(selfUpdate)
-                    return@withContext null
-                }
-
                 val isUpdate = when (BuildType.CURRENT) {
-                    BuildType.NIGHTLY -> selfUpdate.timestamp > lastSelfUpdate.timestamp
+                    BuildType.NIGHTLY,
                     BuildType.RELEASE -> selfUpdate.versionCode > BuildConfig.VERSION_CODE
                     else -> false
                 }
 
                 if (isUpdate) {
-                    saveSelfUpdate(selfUpdate)
-
                     if (CertUtil.isFDroidApp(appContext, BuildConfig.APPLICATION_ID)) {
                         if (selfUpdate.fdroidBuild.isNotEmpty()) {
                             return@withContext SelfUpdate.toApp(selfUpdate, appContext)
@@ -238,9 +208,6 @@ class UpdateWorker @AssistedInject constructor(
                         Log.e(TAG, "Update file is missing!")
                         return@withContext null
                     }
-                } else {
-                    Log.i(TAG, "No self-updates found!")
-                    return@withContext null
                 }
             } catch (exception: Exception) {
                 Log.e(TAG, "Failed to check self-updates", exception)
@@ -252,13 +219,6 @@ class UpdateWorker @AssistedInject constructor(
         }
     }
 
-    private fun saveSelfUpdate(selfUpdate: SelfUpdate) {
-        appContext.save(
-            Preferences.PREFERENCE_SELF_UPDATE,
-            gson.toJson(selfUpdate)
-        )
-    }
-
     private fun notifyUpdates(updates: List<Update>) {
         with(appContext.getSystemService<NotificationManager>()!!) {
             notify(
diff --git a/app/src/main/java/com/aurora/store/util/Preferences.kt b/app/src/main/java/com/aurora/store/util/Preferences.kt
index c00d3ffc8..9d1e79590 100644
--- a/app/src/main/java/com/aurora/store/util/Preferences.kt
+++ b/app/src/main/java/com/aurora/store/util/Preferences.kt
@@ -56,8 +56,6 @@ object Preferences {
     const val PREFERENCE_UPDATES_AUTO = "PREFERENCE_UPDATES_AUTO"
     const val PREFERENCE_UPDATES_CHECK_INTERVAL = "PREFERENCE_UPDATES_CHECK_INTERVAL"
 
-    const val PREFERENCE_SELF_UPDATE = "PREFERENCE_SELF_UPDATE"
-
     const val PREFERENCE_MIGRATION_VERSION = "PREFERENCE_MIGRATION_VERSION"
 
     private var prefs: SharedPreferences? = null