From 5a8db157259a1df61b9292e62b82cd43c4d29ec8 Mon Sep 17 00:00:00 2001
From: PabloG02 <tioo23000@gmail.com>
Date: Sun, 19 Feb 2023 19:39:24 +0100
Subject: [PATCH] Move update check to `onStart`

---
 app/src/main/java/emu/skyline/MainActivity.kt | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/emu/skyline/MainActivity.kt b/app/src/main/java/emu/skyline/MainActivity.kt
index 10197c89..77ce4f9e 100644
--- a/app/src/main/java/emu/skyline/MainActivity.kt
+++ b/app/src/main/java/emu/skyline/MainActivity.kt
@@ -151,15 +151,6 @@ class MainActivity : AppCompatActivity() {
                     Snackbar.make(this@MainActivity.findViewById(android.R.id.content), getString(R.string.logs_not_found), Snackbar.LENGTH_SHORT).show()
                 }
             }
-            if (BuildConfig.FLAVOR == "edge") {
-                binding.checkUpdatesIcon.visibility = View.GONE
-            } else {
-                AppUpdater.removeApk()
-                AppUpdater.notifyUpdateBadge(context, binding.checkUpdatesIcon)
-                binding.checkUpdatesIcon.setOnClickListener {
-                    AppUpdater.checkForUpdates(context)
-                }
-            }
             binding.settingsIcon.setOnClickListener { settingsCallback.launch(Intent(context, SettingsActivity::class.java)) }
             binding.refreshIcon.setOnClickListener { loadRoms(false) }
             addTextChangedListener(afterTextChanged = { editable ->
@@ -333,6 +324,18 @@ class MainActivity : AppCompatActivity() {
                 }
             }
         })
+
+        binding.checkUpdatesIcon.apply {
+            if (BuildConfig.FLAVOR == "edge") {
+                visibility = View.GONE
+            } else {
+                AppUpdater.removeApk()
+                AppUpdater.notifyUpdateBadge(context, this)
+                this.setOnClickListener {
+                    AppUpdater.checkForUpdates(context)
+                }
+            }
+        }
     }
 
     override fun onResume() {