Minor extension update cleanup, default to on

app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionController.kt

@@ -36,6 +36,8 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
         FlexibleAdapter.OnItemLongClickListener,
         ExtensionTrustDialog.Listener {
 
+    private val preferences: PreferencesHelper = Injekt.get()
+
     /**
      * Adapter containing the list of manga from the catalogue.
      */
@@ -92,7 +94,6 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
             }
             R.id.action_auto_check -> {
                 item.isChecked = !item.isChecked
-                val preferences: PreferencesHelper = Injekt.get()
                 preferences.automaticExtUpdates().set(item.isChecked)
                 ExtensionUpdateJob.setupTask(activity!!, item.isChecked)
             }
@@ -150,9 +151,7 @@ open class ExtensionController : NucleusController<ExtensionPresenter>(),
         // Fixes problem with the overflow icon showing up in lieu of search
         searchItem.fixExpand(onExpand = { invalidateMenuOnExpand() })
 
-        val autoItem = menu.findItem(R.id.action_auto_check)
-        val preferences: PreferencesHelper = Injekt.get()
-        autoItem.isChecked = preferences.automaticExtUpdates().getOrDefault()
+        menu.findItem(R.id.action_auto_check).isChecked = preferences.automaticExtUpdates().getOrDefault()
     }
 
     override fun onItemClick(view: View, position: Int): Boolean {

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -13,7 +13,6 @@ import com.bluelinelabs.conductor.RouterTransaction
 import eu.kanade.tachiyomi.Migrations
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
 import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
@@ -39,7 +38,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import uy.kohesive.injekt.injectLazy
 
 class MainActivity : BaseActivity() {
 
@@ -152,33 +150,33 @@ class MainActivity : BaseActivity() {
         }
     }
 
-    private fun setExtensionsBadge() {
-        val updates = preferences.extensionUpdatesCount().getOrDefault()
-        if (updates > 0) {
-            val badge = bottom_nav.getOrCreateBadge(R.id.nav_more)
-            badge.number = updates
-        } else {
-            bottom_nav.removeBadge(R.id.nav_more)
-        }
-    }
-
     override fun onResume() {
         super.onResume()
         getExtensionUpdates()
     }
 
+    private fun setExtensionsBadge() {
+        val updates = preferences.extensionUpdatesCount().getOrDefault()
+        if (updates > 0) {
+            bottom_nav.getOrCreateBadge(R.id.nav_more).number = updates
+        } else {
+            bottom_nav.removeBadge(R.id.nav_more)
+        }
+    }
+
     private fun getExtensionUpdates() {
-        if (Date().time >= preferences.lastExtCheck().getOrDefault() +
-            TimeUnit.HOURS.toMillis(2)) {
-            GlobalScope.launch(Dispatchers.IO) {
-                val preferences: PreferencesHelper by injectLazy()
-                try {
-                    val pendingUpdates = ExtensionGithubApi().checkForUpdates(this@MainActivity)
-                    preferences.extensionUpdatesCount().set(pendingUpdates.size)
-                    preferences.lastExtCheck().set(Date().time)
-                } catch (e: java.lang.Exception) {
-                    Timber.e(e)
-                }
+        // Limit checks to once every 2 hours at most
+        val now = Date().time
+        if (now < preferences.lastExtCheck().getOrDefault() + TimeUnit.HOURS.toMillis(2)) {
+            return
+        }
+
+        GlobalScope.launch(Dispatchers.IO) {
+            try {
+                val pendingUpdates = ExtensionGithubApi().checkForUpdates(this@MainActivity)
+                preferences.extensionUpdatesCount().set(pendingUpdates.size)
+            } catch (e: Exception) {
+                Timber.e(e)
             }
         }
     }

app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt

@@ -2,6 +2,8 @@ package eu.kanade.tachiyomi.ui.more
 
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.ui.base.controller.RootController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.download.DownloadController
@@ -9,7 +11,7 @@ import eu.kanade.tachiyomi.ui.extension.ExtensionController
 import eu.kanade.tachiyomi.ui.migration.MigrationController
 import eu.kanade.tachiyomi.ui.setting.SettingsController
 import eu.kanade.tachiyomi.ui.setting.SettingsMainController
-import eu.kanade.tachiyomi.util.preference.extensionPreference
+import eu.kanade.tachiyomi.util.preference.badgePreference
 import eu.kanade.tachiyomi.util.preference.iconRes
 import eu.kanade.tachiyomi.util.preference.iconTint
 import eu.kanade.tachiyomi.util.preference.onClick
@@ -18,6 +20,8 @@ import eu.kanade.tachiyomi.util.preference.preferenceCategory
 import eu.kanade.tachiyomi.util.preference.titleRes
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.system.openInBrowser
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 
 class MoreController : SettingsController(), RootController {
 
@@ -26,10 +30,11 @@ class MoreController : SettingsController(), RootController {
 
         val tintColor = context.getResourceColor(R.attr.colorAccent)
 
-        extensionPreference {
+        badgePreference {
             titleRes = R.string.label_extensions
             iconRes = R.drawable.ic_extension_24dp
             iconTint = tintColor
+            setBadge(Injekt.get<PreferencesHelper>().extensionUpdatesCount().getOrDefault())
             onClick {
                 router.pushController(ExtensionController().withFadeTransaction())
             }