From 7832e294f9e1b8f464be34481d939543bc7872ca Mon Sep 17 00:00:00 2001
From: Reco1l <geronimoferruccio15@gmail.com>
Date: Tue, 17 Dec 2024 16:59:47 -0300
Subject: [PATCH 01/16] Fix potential crash during game over animation when
 video background is enabled

---
 src/ru/nsu/ccfit/zuev/osu/game/GameScene.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java
index a1b08058b..e890a2742 100644
--- a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java
+++ b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java
@@ -2340,9 +2340,13 @@ public void onUpdate(float pSecondsElapsed) {
                     scene.setTimeMultiplier(decreasedSpeed);
 
                     if (video != null) {
-                        // Aparently MediaPlayer API doesn't support setting playback speed
-                        // below 0.01 causing an IllegalStateException.
-                        video.setPlaybackSpeed(Math.max(0.01f, decreasedSpeed));
+                        // In some devices this can throw an exception, unfortunately there's no
+                        // documentation that explains how to avoid that scenario. Thanks Google.
+                        try {
+                            video.setPlaybackSpeed(decreasedSpeed);
+                        } catch (Exception e) {
+                            Log.e("GameScene", "Failed to change video playback speed during game over animation.", e);
+                        }
                     }
 
                     songService.setFrequencyForcefully(decreasedFrequency);

From 1805adbfe29f050fcffbc2374c2716f9ffc3ccba Mon Sep 17 00:00:00 2001
From: Reco1l <geronimoferruccio15@gmail.com>
Date: Tue, 17 Dec 2024 18:00:13 -0300
Subject: [PATCH 02/16] Rename method to act as a overload

---
 src/ru/nsu/ccfit/zuev/osu/ToastLogger.java          | 2 +-
 src/ru/nsu/ccfit/zuev/osu/game/GameScene.java       | 8 ++++----
 src/ru/nsu/ccfit/zuev/osu/menu/ModMenu.java         | 2 +-
 src/ru/nsu/ccfit/zuev/osu/menu/PauseMenu.java       | 2 +-
 src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java        | 2 +-
 src/ru/nsu/ccfit/zuev/osu/scoring/Replay.java       | 4 ++--
 src/ru/nsu/ccfit/zuev/osu/scoring/ScoringScene.java | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ru/nsu/ccfit/zuev/osu/ToastLogger.java b/src/ru/nsu/ccfit/zuev/osu/ToastLogger.java
index eae8680c6..6e8ea5701 100644
--- a/src/ru/nsu/ccfit/zuev/osu/ToastLogger.java
+++ b/src/ru/nsu/ccfit/zuev/osu/ToastLogger.java
@@ -33,7 +33,7 @@ public static void showText(final String message, final boolean showlong) {
                 showlong ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT).show());
     }
 
-    public static void showTextId(@StringRes final int resID, final boolean showlong) {
+    public static void showText(@StringRes final int resID, final boolean showlong) {
         showText(StringTable.get(resID), showlong);
     }
 
diff --git a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java
index e890a2742..7180f54ba 100644
--- a/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java
+++ b/src/ru/nsu/ccfit/zuev/osu/game/GameScene.java
@@ -379,7 +379,7 @@ private void setBackground() {
 
     private boolean loadGame(final BeatmapInfo beatmapInfo, final String rFile, final CoroutineScope scope) {
         if (!SecurityUtils.verifyFileIntegrity(GlobalManager.getInstance().getMainActivity())) {
-            ToastLogger.showTextId(com.osudroid.resources.R.string.file_integrity_tampered, true);
+            ToastLogger.showText(com.osudroid.resources.R.string.file_integrity_tampered, true);
             return false;
         }
 
@@ -390,7 +390,7 @@ private boolean loadGame(final BeatmapInfo beatmapInfo, final String rFile, fina
                     MD5Calculator.getStringMD5(rFile) + ".odr";
             Debug.i("ReplayFile = " + replayFilePath);
             if (!OnlineFileOperator.downloadFile(rFile, this.replayFilePath)) {
-                ToastLogger.showTextId(com.osudroid.resources.R.string.replay_cantdownload, true);
+                ToastLogger.showText(com.osudroid.resources.R.string.replay_cantdownload, true);
                 return false;
             }
         } else
@@ -421,7 +421,7 @@ private boolean loadGame(final BeatmapInfo beatmapInfo, final String rFile, fina
         }
 
         if (!parsedBeatmap.getMd5().equals(beatmapInfo.getMD5())) {
-            ToastLogger.showTextId(com.osudroid.resources.R.string.file_integrity_tampered, true);
+            ToastLogger.showText(com.osudroid.resources.R.string.file_integrity_tampered, true);
             return false;
         }
 
@@ -567,7 +567,7 @@ private boolean loadGame(final BeatmapInfo beatmapInfo, final String rFile, fina
         if (replayFilePath != null) {
             replaying = replay.load(replayFilePath, true);
             if (!replaying) {
-                ToastLogger.showTextId(com.osudroid.resources.R.string.replay_invalid, true);
+                ToastLogger.showText(com.osudroid.resources.R.string.replay_invalid, true);
                 return false;
             }
             GameHelper.setReplayVersion(replay.replayVersion);
diff --git a/src/ru/nsu/ccfit/zuev/osu/menu/ModMenu.java b/src/ru/nsu/ccfit/zuev/osu/menu/ModMenu.java
index af230278e..159520a20 100644
--- a/src/ru/nsu/ccfit/zuev/osu/menu/ModMenu.java
+++ b/src/ru/nsu/ccfit/zuev/osu/menu/ModMenu.java
@@ -528,7 +528,7 @@ public boolean handleCustomDifficultyStatisticsFlags() {
         }
 
         if (modsRemoved) {
-            ToastLogger.showTextId(com.osudroid.resources.R.string.force_diffstat_mod_unpickable, false);
+            ToastLogger.showText(com.osudroid.resources.R.string.force_diffstat_mod_unpickable, false);
         }
 
         return modsRemoved;
diff --git a/src/ru/nsu/ccfit/zuev/osu/menu/PauseMenu.java b/src/ru/nsu/ccfit/zuev/osu/menu/PauseMenu.java
index 6e3bfdde0..4ac151b27 100644
--- a/src/ru/nsu/ccfit/zuev/osu/menu/PauseMenu.java
+++ b/src/ru/nsu/ccfit/zuev/osu/menu/PauseMenu.java
@@ -99,7 +99,7 @@ public boolean onMenuItemClicked(final MenuScene pMenuScene,
         switch (pMenuItem.getID()) {
             case ITEM_SAVE_REPLAY:
                 if(fail && !replaySaved && !game.getReplaying() && game.saveFailedReplay()){
-                    ToastLogger.showTextId(com.osudroid.resources.R.string.message_save_replay_successful, true);
+                    ToastLogger.showText(com.osudroid.resources.R.string.message_save_replay_successful, true);
                     replaySaved = true;
                 }
                 return true;
diff --git a/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java b/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java
index e11ce73c2..d73f1865d 100644
--- a/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java
+++ b/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java
@@ -1229,7 +1229,7 @@ public void updateScore() {
     public void openScore(final int id, boolean showOnline, final String playerName) {
         if (showOnline) {
             engine.setScene(new LoadingScreen().getScene());
-            ToastLogger.showTextId(com.osudroid.resources.R.string.online_loadrecord, false);
+            ToastLogger.showText(com.osudroid.resources.R.string.online_loadrecord, false);
 
             cancelCalculationJobs();
             cancelMapStatusLoadingJob();
diff --git a/src/ru/nsu/ccfit/zuev/osu/scoring/Replay.java b/src/ru/nsu/ccfit/zuev/osu/scoring/Replay.java
index 037316ace..14c462da7 100644
--- a/src/ru/nsu/ccfit/zuev/osu/scoring/Replay.java
+++ b/src/ru/nsu/ccfit/zuev/osu/scoring/Replay.java
@@ -281,10 +281,10 @@ public boolean load(InputStream inputStream, String replayFilename, boolean with
         } catch (EOFException e) {
             Debug.e("O_o eof...");
             Debug.e(e);
-            ToastLogger.showTextId(com.osudroid.resources.R.string.replay_corrupted, true);
+            ToastLogger.showText(com.osudroid.resources.R.string.replay_corrupted, true);
             return false;
         } catch (Exception e) {
-            ToastLogger.showTextId(com.osudroid.resources.R.string.replay_corrupted, true);
+            ToastLogger.showText(com.osudroid.resources.R.string.replay_corrupted, true);
             Debug.e("Cannot load replay: " + e.getMessage(), e);
             return false;
         }
diff --git a/src/ru/nsu/ccfit/zuev/osu/scoring/ScoringScene.java b/src/ru/nsu/ccfit/zuev/osu/scoring/ScoringScene.java
index db54f2b12..afdad2303 100644
--- a/src/ru/nsu/ccfit/zuev/osu/scoring/ScoringScene.java
+++ b/src/ru/nsu/ccfit/zuev/osu/scoring/ScoringScene.java
@@ -487,7 +487,7 @@ public boolean onAreaTouched(final TouchEvent pSceneTouchEvent,
             // Do not save and submit score if note count does not match, since it indicates a corrupted score
             // (potentially from bugging the gameplay by any unnecessary means).
             if (totalNotes != beatmap.getTotalHitObjectCount()) {
-                ToastLogger.showTextId(com.osudroid.resources.R.string.replay_corrupted, true);
+                ToastLogger.showText(com.osudroid.resources.R.string.replay_corrupted, true);
                 return;
             }
 

From 01d047f64628b21b3f6b0ab816b3a8b8e3032bca Mon Sep 17 00:00:00 2001
From: Reco1l <geronimoferruccio15@gmail.com>
Date: Tue, 17 Dec 2024 18:44:35 -0300
Subject: [PATCH 03/16] Add missing method in Config

---
 src/ru/nsu/ccfit/zuev/osu/Config.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/ru/nsu/ccfit/zuev/osu/Config.java b/src/ru/nsu/ccfit/zuev/osu/Config.java
index b15389526..234f02bc8 100644
--- a/src/ru/nsu/ccfit/zuev/osu/Config.java
+++ b/src/ru/nsu/ccfit/zuev/osu/Config.java
@@ -843,6 +843,14 @@ public static void setInt(String key, int value) {
         sharedPreferences.edit().putInt(key, value).commit();
     }
 
+    public static long getLong(String key, long defaultValue) {
+        return sharedPreferences.getLong(key, defaultValue);
+    }
+
+    public static void setLong(String key, long value) {
+        sharedPreferences.edit().putLong(key, value).commit();
+    }
+
     public static String getString(String key, String defaultValue) {
         return sharedPreferences.getString(key, defaultValue);
     }

From eb64c2b068e02465ce320812697d184d809d0e73 Mon Sep 17 00:00:00 2001
From: Reco1l <geronimoferruccio15@gmail.com>
Date: Tue, 17 Dec 2024 18:46:15 -0300
Subject: [PATCH 04/16] Allow to change dialogs dynamically

---
 src/com/edlplan/ui/fragment/BaseFragment.kt |  15 ++-
 src/com/reco1l/osu/ui/Dialog.kt             | 134 ++++++++++++++------
 src/com/reco1l/osu/ui/ListDialog.kt         |  28 ++--
 3 files changed, 123 insertions(+), 54 deletions(-)

diff --git a/src/com/edlplan/ui/fragment/BaseFragment.kt b/src/com/edlplan/ui/fragment/BaseFragment.kt
index 877633dba..c1c9d7b3b 100644
--- a/src/com/edlplan/ui/fragment/BaseFragment.kt
+++ b/src/com/edlplan/ui/fragment/BaseFragment.kt
@@ -10,27 +10,32 @@ import androidx.fragment.app.Fragment
 import com.edlplan.framework.easing.Easing
 import com.edlplan.ui.ActivityOverlay
 import com.edlplan.ui.EasingHelper
-import com.reco1l.osu.*
 import ru.nsu.ccfit.zuev.osuplus.R
 
 abstract class BaseFragment : Fragment(), BackPressListener {
     var root: View? = null
         private set
-    private var background: View? = null
     var onDismissListener: OnDismissListener? = null
     var isDismissOnBackgroundClick = false
-    var isCreated = false
-        private set
     var isDismissOnBackPress = true
 
+    /**
+     * Whether the fragment is created. This is set to true after [onCreateView] is called.
+     */
+    var isCreated = false
+        private set
 
     /**
      * If true, the fragment will intercept back press event when it's received.
      */
     var interceptBackPress = true
 
+    /**
+     * Whether the fragment is loaded. This is set to true after [onLoadView] is called.
+     */
+    var isLoaded = false
+        private set
 
-    private var isLoaded = false
 
     private var isDismissCalled = false
 
diff --git a/src/com/reco1l/osu/ui/Dialog.kt b/src/com/reco1l/osu/ui/Dialog.kt
index b86ed31e1..fa0c8e7a1 100644
--- a/src/com/reco1l/osu/ui/Dialog.kt
+++ b/src/com/reco1l/osu/ui/Dialog.kt
@@ -1,8 +1,8 @@
 package com.reco1l.osu.ui
 
 import android.graphics.Color
-import android.text.Html
 import android.text.method.LinkMovementMethod
+import android.util.Log
 import android.view.ContextThemeWrapper
 import android.view.Gravity.*
 import android.view.View
@@ -11,6 +11,7 @@ import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.text.HtmlCompat
+import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import com.edlplan.framework.easing.Easing
@@ -38,54 +39,95 @@ open class MessageDialog : BaseFragment() {
     override val layoutID = R.layout.dialog_message_fragment
 
 
-    protected var title: CharSequence = "Alert"
+    /**
+     * The title to be displayed in the dialog.
+     */
+    var title: CharSequence = "Alert"
+        set(value) {
+            field = value
+            if (isCreated) {
+                findViewById<TextView>(R.id.title)?.text = value
+            }
+        }
 
-    protected var message: CharSequence = ""
+    /**
+     * The message to be displayed in the dialog.
+     */
+    var message: CharSequence = ""
+        set(value) {
+            field = value
+            if (isCreated) {
+                findViewById<TextView>(R.id.message)?.text = (
+                    if (isHTMLMessage) HtmlCompat.fromHtml(value.toString(), FROM_HTML_MODE_LEGACY)
+                    else value
+                )
+            }
+        }
 
-    protected var isHTMLMessage = false
+    /**
+     * Whether the message is HTML formatted or not.
+     */
+    var isHTMLMessage = false
+        set(value) {
+            field = value
+            if (isCreated) {
+                message = message
+            }
+        }
+
+    /**
+     * The buttons to be displayed in the dialog.
+     */
+    var buttons = mutableListOf<DialogButton>()
+        set(value) {
+            field = value
+            if (isCreated) {
+
+                val layout = findViewById<LinearLayout>(R.id.button_layout)
+                if (layout == null) {
+                    Log.e("MessageDialog", "Buttons layout not found.")
+                    return
+                }
+
+                layout.removeAllViews()
+
+                for (button in value) {
+
+                    val buttonView = Button(ContextThemeWrapper(context, R.style.button_borderless))
+                    buttonView.minWidth = 300.dp
+                    buttonView.minHeight = 56.dp
+                    buttonView.gravity = CENTER
+                    buttonView.background = requireContext().getDrawable(R.drawable.ripple)
+                    buttonView.text = button.text
+                    buttonView.fontColor = button.tint
+                    buttonView.compoundDrawablePadding = 0
+                    buttonView.setOnClickListener { button.clickListener(this@MessageDialog) }
+
+                    layout.addView(buttonView)
+                }
+            }
+        }
 
     protected var allowDismiss = true
 
     protected var onDismiss: (() -> Unit)? = null
 
-    protected var buttons = mutableListOf<DialogButton>()
-
 
     override fun onLoadView() {
 
-        findViewById<TextView>(R.id.title)?.text = title
+        title = title
+        message = message
+        buttons = buttons
 
-        if (isHTMLMessage) {
-            findViewById<TextView>(R.id.message)?.apply {
-                text = HtmlCompat.fromHtml(message.toString(), HtmlCompat.FROM_HTML_MODE_LEGACY)
-                isClickable = true
-                movementMethod = LinkMovementMethod.getInstance()
-            }
-        } else {
-            findViewById<TextView>(R.id.message)?.text = message
+        findViewById<TextView>(R.id.message)?.apply {
+            isClickable = true
+            movementMethod = LinkMovementMethod.getInstance()
         }
 
-        findViewById<LinearLayout>(R.id.button_layout)?.also { buttonLayout ->
-
-            for (button in buttons) {
-                buttonLayout.addView(Button(ContextThemeWrapper(context, R.style.button_borderless)).apply {
-
-                    minWidth = 300.dp
-                    minHeight = 56.dp
-                    gravity = CENTER
-                    background = context.getDrawable(R.drawable.ripple)
-                    text = button.text
-                    fontColor = button.tint
-                    compoundDrawablePadding = 0
-
-                    setOnClickListener { button.clickListener(this@MessageDialog) }
-                })
-            }
-        }
 
         val background = findViewById<View>(R.id.frg_background)!!
-        background.setOnClickListener { callDismissOnBackPress() }
 
+        background.setOnClickListener { callDismissOnBackPress() }
         background.cancelAnimators()
             .toAlpha(0f)
             .toAlpha(1f, 200, ease = EasingHelper.asInterpolator(Easing.Out))
@@ -167,10 +209,28 @@ open class PromptDialog : MessageDialog() {
      * The text input by user.
      */
     var input: String? = null
-        protected set
+        set(value) {
+            field = value
+            if (isCreated) {
+                findViewById<EditText>(R.id.input)?.apply {
+                    if (text.toString() != value) {
+                        setText(value)
+                    }
+                }
+            }
+        }
 
+    /**
+     * The text to be show displayed in the input hint.
+     */
+    var hint: String? = null
+        set(value) {
+            field = value
+            if (isCreated) {
+                findViewById<EditText>(R.id.input)?.hint = value
+            }
+        }
 
-    private var hint: String? = null
 
     private var onTextChanged: ((PromptDialog) -> Unit)? = null
 
@@ -197,7 +257,9 @@ open class PromptDialog : MessageDialog() {
     }
 
 
-
+    /**
+     * The text input by user.
+     */
     fun setInput(text: String?): PromptDialog {
         input = text
         return this
diff --git a/src/com/reco1l/osu/ui/ListDialog.kt b/src/com/reco1l/osu/ui/ListDialog.kt
index 1e4cc917c..5bacff02f 100644
--- a/src/com/reco1l/osu/ui/ListDialog.kt
+++ b/src/com/reco1l/osu/ui/ListDialog.kt
@@ -56,29 +56,29 @@ open class SelectDialog : MessageDialog() {
 
             field = value
 
-            if (::recyclerView.isInitialized) {
-                recyclerView.adapter!!.notifyDataSetChanged()
+            if (isLoaded) {
+                findViewById<RecyclerView>(R.id.list)!!.adapter!!.notifyDataSetChanged()
             }
         }
 
 
     protected var selected: Any? = null
+        set(value) {
+            field = value
+            if (isLoaded) {
+                findViewById<RecyclerView>(R.id.list)!!.adapter!!.notifyDataSetChanged()
+            }
+        }
 
     protected var onSelect: ((Any?) -> Unit)? = null
 
 
-    private lateinit var recyclerView: RecyclerView
-
-
     override fun onLoadView() {
         super.onLoadView()
 
-        recyclerView = findViewById<RecyclerView>(R.id.list)!!.apply {
-
-            layoutManager = LinearLayoutManager(context)
-            adapter = Adapter()
-
-        }
+        val recyclerView = findViewById<RecyclerView>(R.id.list)!!
+        recyclerView.layoutManager = LinearLayoutManager(context)
+        recyclerView.adapter = Adapter()
     }
 
 
@@ -88,7 +88,7 @@ open class SelectDialog : MessageDialog() {
      * @param replace If true, the current options will be replaced with the new ones.
      */
     @JvmOverloads
-    fun setOptions(options: List<Option>, replace: Boolean = false): SelectDialog {
+    fun setOptions(options: List<Option>, replace: Boolean = true): SelectDialog {
         if (replace) {
             this.options = options.toMutableList()
         } else {
@@ -123,7 +123,9 @@ open class SelectDialog : MessageDialog() {
 
 
     private fun unselectAll() {
-        recyclerView.forEach { (recyclerView.getChildViewHolder(it) as ViewHolder).unselect() }
+        findViewById<RecyclerView>(R.id.list)!!.apply {
+            forEach { (getChildViewHolder(it) as ViewHolder).unselect() }
+        }
     }
 
 

From 4d26bc146fd3d81400c54248542caf618311af32 Mon Sep 17 00:00:00 2001
From: Reco1l <geronimoferruccio15@gmail.com>
Date: Tue, 17 Dec 2024 19:10:42 -0300
Subject: [PATCH 05/16] More corrections related to dialogs

---
 .../osu/beatmaplisting/BeatmapListing.kt      |   8 +-
 .../reco1l/osu/multiplayer/LobbyRoomList.kt   |   5 +-
 src/com/reco1l/osu/ui/Dialog.kt               | 101 +--------------
 src/com/reco1l/osu/ui/ListDialog.kt           |  47 +++----
 src/com/reco1l/osu/ui/PromptDialog.kt         | 120 ++++++++++++++++++
 5 files changed, 153 insertions(+), 128 deletions(-)
 create mode 100644 src/com/reco1l/osu/ui/PromptDialog.kt

diff --git a/src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt b/src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt
index f4e9efe9f..ef72e9edf 100644
--- a/src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt
+++ b/src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt
@@ -796,9 +796,13 @@ class BeatmapListingFiltersFragment(private val beatmapListing: BeatmapListing)
 
             statusButton.setOnClickListener {
 
+                val options = RankedStatus.entries.map { status ->
+                    Option(requireContext().getString(status.stringId), status)
+                }.toMutableList()
+                options.add(0, Option("All", null))
+
                 SelectDropdown(statusButton)
-                    .addOption(Option("All", null))
-                    .setOptions(RankedStatus.entries.map { status -> Option(requireContext().getString(status.stringId), status) }, false)
+                    .setOptions(options)
                     .setSelected(rankedStatus)
                     .setOnSelectListener {
                         it as RankedStatus?
diff --git a/src/com/reco1l/osu/multiplayer/LobbyRoomList.kt b/src/com/reco1l/osu/multiplayer/LobbyRoomList.kt
index 9eb59c8da..e6a4aa872 100644
--- a/src/com/reco1l/osu/multiplayer/LobbyRoomList.kt
+++ b/src/com/reco1l/osu/multiplayer/LobbyRoomList.kt
@@ -43,10 +43,7 @@ class LobbyRoomList : ScrollableList() {
             setTitle(room.name)
             setMessage("Please enter the room password:")
             setAllowDismiss(false)
-
-            setOnTextInputBind {
-                it.inputType = EditorInfo.TYPE_TEXT_VARIATION_PASSWORD
-            }
+            setInputType(EditorInfo.TYPE_TEXT_VARIATION_PASSWORD)
 
             addButton("Join") {
                 val password = (it as PromptDialog).input
diff --git a/src/com/reco1l/osu/ui/Dialog.kt b/src/com/reco1l/osu/ui/Dialog.kt
index fa0c8e7a1..3295cc6b4 100644
--- a/src/com/reco1l/osu/ui/Dialog.kt
+++ b/src/com/reco1l/osu/ui/Dialog.kt
@@ -7,13 +7,10 @@ import android.view.ContextThemeWrapper
 import android.view.Gravity.*
 import android.view.View
 import android.widget.Button
-import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.text.HtmlCompat
 import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY
-import androidx.core.view.isVisible
-import androidx.core.widget.doOnTextChanged
 import com.edlplan.framework.easing.Easing
 import com.edlplan.ui.EasingHelper
 import com.edlplan.ui.fragment.BaseFragment
@@ -53,7 +50,7 @@ open class MessageDialog : BaseFragment() {
     /**
      * The message to be displayed in the dialog.
      */
-    var message: CharSequence = ""
+    open var message: CharSequence = ""
         set(value) {
             field = value
             if (isCreated) {
@@ -183,6 +180,7 @@ open class MessageDialog : BaseFragment() {
     @JvmOverloads
     open fun addButton(text: String, tint: Int = Color.WHITE, clickListener: (MessageDialog) -> Unit): MessageDialog {
         buttons.add(DialogButton(text, tint, clickListener))
+        buttons = buttons
         return this
     }
 
@@ -200,99 +198,4 @@ open class MessageDialog : BaseFragment() {
 }
 
 
-open class PromptDialog : MessageDialog() {
-
-    override val layoutID = R.layout.dialog_input_fragment
-
-
-    /**
-     * The text input by user.
-     */
-    var input: String? = null
-        set(value) {
-            field = value
-            if (isCreated) {
-                findViewById<EditText>(R.id.input)?.apply {
-                    if (text.toString() != value) {
-                        setText(value)
-                    }
-                }
-            }
-        }
-
-    /**
-     * The text to be show displayed in the input hint.
-     */
-    var hint: String? = null
-        set(value) {
-            field = value
-            if (isCreated) {
-                findViewById<EditText>(R.id.input)?.hint = value
-            }
-        }
-
-
-    private var onTextChanged: ((PromptDialog) -> Unit)? = null
-
-    private var onTextInputBind: ((EditText) -> Unit)? = null
-
-
-    override fun onLoadView() {
-
-        super.onLoadView()
-
-        findViewById<TextView>(R.id.message)!!.isVisible = message.isNotBlank()
-        findViewById<EditText>(R.id.input)!!.apply {
-
-            setText(input)
-
-            doOnTextChanged { text, _, _, _ ->
-                input = text.toString()
-                onTextChanged?.invoke(this@PromptDialog)
-            }
-
-            onTextInputBind?.invoke(this)
-        }
-
-    }
-
-
-    /**
-     * The text input by user.
-     */
-    fun setInput(text: String?): PromptDialog {
-        input = text
-        return this
-    }
-
-    /**
-     * The text to be show displayed in the input hint.
-     */
-    fun setHint(text: String): PromptDialog {
-        hint = text
-        return this
-    }
-
-    /**
-     * The function to be called when the text input is changed.
-     */
-    fun setOnTextChanged(action: (PromptDialog) -> Unit): PromptDialog {
-        onTextChanged = action
-        return this
-    }
-
-    /**
-     * The function to be called when the EditText is created.
-     */
-    fun setOnTextInputBind(action: (EditText) -> Unit): PromptDialog {
-        onTextInputBind = action
-        return this
-    }
-
-
-    override fun addButton(text: String, tint: Int, clickListener: (MessageDialog) -> Unit) = super.addButton(text, tint, clickListener) as PromptDialog
-
-}
-
-
 
diff --git a/src/com/reco1l/osu/ui/ListDialog.kt b/src/com/reco1l/osu/ui/ListDialog.kt
index 5bacff02f..675c52ab0 100644
--- a/src/com/reco1l/osu/ui/ListDialog.kt
+++ b/src/com/reco1l/osu/ui/ListDialog.kt
@@ -47,6 +47,9 @@ open class SelectDialog : MessageDialog() {
     override val layoutID = R.layout.dialog_select_fragment
 
 
+    /**
+     * The options to be displayed in the dialog.
+     */
     var options = mutableListOf<Option>()
         protected set(value) {
 
@@ -61,8 +64,10 @@ open class SelectDialog : MessageDialog() {
             }
         }
 
-
-    protected var selected: Any? = null
+    /**
+     * The selected value.
+     */
+    var selected: Any? = null
         set(value) {
             field = value
             if (isLoaded) {
@@ -70,7 +75,10 @@ open class SelectDialog : MessageDialog() {
             }
         }
 
-    protected var onSelect: ((Any?) -> Unit)? = null
+    /**
+     * The function to be called when an option is selected.
+     */
+    var onSelect: ((Any?) -> Unit)? = null
 
 
     override fun onLoadView() {
@@ -84,16 +92,9 @@ open class SelectDialog : MessageDialog() {
 
     /**
      * Set the options to be displayed in the dialog.
-     *
-     * @param replace If true, the current options will be replaced with the new ones.
      */
-    @JvmOverloads
-    fun setOptions(options: List<Option>, replace: Boolean = true): SelectDialog {
-        if (replace) {
-            this.options = options.toMutableList()
-        } else {
-            this.options.addAll(options)
-        }
+    fun setOptions(value: List<Option>): SelectDialog {
+        options = value.toMutableList()
         return this
     }
 
@@ -122,13 +123,6 @@ open class SelectDialog : MessageDialog() {
     }
 
 
-    private fun unselectAll() {
-        findViewById<RecyclerView>(R.id.list)!!.apply {
-            forEach { (getChildViewHolder(it) as ViewHolder).unselect() }
-        }
-    }
-
-
     private inner class Adapter : RecyclerView.Adapter<ViewHolder>() {
 
 
@@ -146,10 +140,13 @@ open class SelectDialog : MessageDialog() {
             holder.bind(options[position])
         }
 
+        override fun getItemCount(): Int {
+            return options.size
+        }
 
-        override fun getItemCount() = options.size
-
-        override fun getItemId(position: Int) = position.toLong()
+        override fun getItemId(position: Int): Long {
+            return position.toLong()
+        }
 
     }
 
@@ -162,7 +159,11 @@ open class SelectDialog : MessageDialog() {
 
             text.setOnClickListener {
 
-                unselectAll()
+                findViewById<RecyclerView>(R.id.list)!!.apply {
+                    forEach {
+                        (getChildViewHolder(it) as ViewHolder).unselect()
+                    }
+                }
 
                 selected = option.value
                 select()
diff --git a/src/com/reco1l/osu/ui/PromptDialog.kt b/src/com/reco1l/osu/ui/PromptDialog.kt
new file mode 100644
index 000000000..bc7f5a415
--- /dev/null
+++ b/src/com/reco1l/osu/ui/PromptDialog.kt
@@ -0,0 +1,120 @@
+package com.reco1l.osu.ui
+
+import android.text.InputType
+import android.widget.EditText
+import android.widget.TextView
+import androidx.core.view.isVisible
+import androidx.core.widget.doOnTextChanged
+import ru.nsu.ccfit.zuev.osuplus.R
+
+open class PromptDialog : MessageDialog() {
+
+
+    override val layoutID = R.layout.dialog_input_fragment
+
+
+    override var message: CharSequence = ""
+        set(value) {
+            field = value
+            super.message = value
+            if (isCreated) {
+                findViewById<TextView>(R.id.message)!!.isVisible = value.isNotBlank()
+            }
+        }
+
+
+    /**
+     * The text input by user.
+     */
+    var input: String? = null
+        set(value) {
+            field = value
+            if (isCreated) {
+                val inputView = findViewById<EditText>(R.id.input)!!
+                if (inputView.text.toString() != value) {
+                    inputView.setText(value)
+                }
+            }
+        }
+
+    /**
+     * The text to be show displayed in the input hint.
+     */
+    var hint: String? = null
+        set(value) {
+            field = value
+            if (isCreated) {
+                findViewById<EditText>(R.id.input)?.hint = value
+            }
+        }
+
+    /**
+     * The function to be called when the text input is changed.
+     */
+    var onTextChanged: ((PromptDialog) -> Unit)? = null
+
+    /**
+     * The input type of the EditText.
+     */
+    var inputType: Int = InputType.TYPE_NULL
+        set(value) {
+            field = value
+            if (isCreated) {
+                findViewById<EditText>(R.id.input)?.inputType = value
+            }
+        }
+
+
+    override fun onLoadView() {
+        super.onLoadView()
+
+        hint = hint
+        input = input
+        message = message
+        inputType = inputType
+
+        findViewById<EditText>(R.id.input)!!.doOnTextChanged { text, _, _, _ ->
+            input = text.toString()
+            onTextChanged?.invoke(this@PromptDialog)
+        }
+    }
+
+
+    /**
+     * The text input by user.
+     */
+    fun setInput(text: String?): PromptDialog {
+        input = text
+        return this
+    }
+
+    /**
+     * The text to be show displayed in the input hint.
+     */
+    fun setHint(text: String): PromptDialog {
+        hint = text
+        return this
+    }
+
+    /**
+     * The function to be called when the text input is changed.
+     */
+    fun setOnTextChanged(action: (PromptDialog) -> Unit): PromptDialog {
+        onTextChanged = action
+        return this
+    }
+
+    /**
+     * The input type of the EditText.
+     */
+    fun setInputType(type: Int): PromptDialog {
+        inputType = type
+        return this
+    }
+
+
+    override fun addButton(text: String, tint: Int, clickListener: (MessageDialog) -> Unit): PromptDialog {
+        return super.addButton(text, tint, clickListener) as PromptDialog
+    }
+
+}
\ No newline at end of file

From d7d67c2a7909818d4a6743a9f73f4aa8fb08560e Mon Sep 17 00:00:00 2001
From: Reco1l <geronimoferruccio15@gmail.com>
Date: Tue, 17 Dec 2024 19:10:54 -0300
Subject: [PATCH 06/16] Introduce ProgressDialog

---
 res/layout/dialog_progress.xml          | 64 ++++++++++++++++++++
 src/com/reco1l/osu/ui/ProgressDialog.kt | 80 +++++++++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 res/layout/dialog_progress.xml
 create mode 100644 src/com/reco1l/osu/ui/ProgressDialog.kt

diff --git a/res/layout/dialog_progress.xml b/res/layout/dialog_progress.xml
new file mode 100644
index 000000000..e04febd5c
--- /dev/null
+++ b/res/layout/dialog_progress.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/frg_background"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#80000000"
+    android:elevation="1dp">
+
+    <LinearLayout
+        android:id="@+id/frg_body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:background="@drawable/rounded_rect"
+        android:backgroundTint="#1E1E2E"
+        android:divider="@drawable/divider"
+        android:gravity="center"
+        android:minWidth="200dp"
+        android:orientation="vertical"
+        android:showDividers="middle">
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/settings_tab_divider"
+            android:paddingVertical="12dp"
+            android:text="Title" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="12dp">
+
+            <com.google.android.material.progressindicator.CircularProgressIndicator
+                android:id="@+id/progress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                android:padding="10dp"
+                app:indicatorColor="@color/colorAccent"
+                app:indicatorDirectionCircular="counterclockwise"
+                app:trackCornerRadius="12dp"
+                tools:indeterminate="false"
+                tools:progress="50" />
+
+            <TextView
+                android:id="@+id/message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="12dp"
+                android:maxWidth="400dp"
+                android:textColor="#FFF"
+                tools:text="Message" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/com/reco1l/osu/ui/ProgressDialog.kt b/src/com/reco1l/osu/ui/ProgressDialog.kt
new file mode 100644
index 000000000..8345beefa
--- /dev/null
+++ b/src/com/reco1l/osu/ui/ProgressDialog.kt
@@ -0,0 +1,80 @@
+package com.reco1l.osu.ui
+
+import com.google.android.material.progressindicator.CircularProgressIndicator
+import ru.nsu.ccfit.zuev.osuplus.R
+
+
+class ProgressDialog : MessageDialog() {
+
+
+    override val layoutID = R.layout.dialog_progress
+
+
+    /**
+     * The progress of the dialog.
+     */
+    var progress: Int = 0
+        set(value) {
+            field = value
+            if (isCreated) {
+                findViewById<CircularProgressIndicator>(R.id.progress)!!.progress = value
+            }
+        }
+
+    /**
+     * Whether the progress is indeterminate or not.
+     */
+    var indeterminate: Boolean = false
+        set(value) {
+            field = value
+            if (isCreated) {
+                findViewById<CircularProgressIndicator>(R.id.progress)!!.isIndeterminate = value
+            }
+        }
+
+    /**
+     * The maximum value of the progress.
+     */
+    var max: Int = 0
+        set(value) {
+            field = value
+            if (isCreated) {
+                findViewById<CircularProgressIndicator>(R.id.progress)!!.max = value
+            }
+        }
+
+
+    override fun onLoadView() {
+        super.onLoadView()
+
+        max = max
+        progress = progress
+        indeterminate = indeterminate
+    }
+
+
+    /**
+     * Sets the progress of the dialog.
+     */
+    fun setProgress(value: Int): ProgressDialog {
+        progress = value
+        return this
+    }
+
+    /**
+     * Sets whether the progress is indeterminate or not.
+     */
+    fun setIndeterminate(value: Boolean): ProgressDialog {
+        indeterminate = value
+        return this
+    }
+
+    /**
+     * Sets the maximum value of the progress.
+     */
+    fun setMax(value: Int): ProgressDialog {
+        max = value
+        return this
+    }
+
+}
\ No newline at end of file

From 9d8b0ef5e9a5c97a4305c432de5ee775cbe7cf76 Mon Sep 17 00:00:00 2001
From: Reco1l <geronimoferruccio15@gmail.com>
Date: Tue, 17 Dec 2024 19:20:27 -0300
Subject: [PATCH 07/16] Revamp update manager

---
 src/com/reco1l/osu/UpdateManager.kt         | 292 +++++++-------------
 src/ru/nsu/ccfit/zuev/osu/MainActivity.java |   2 +-
 2 files changed, 107 insertions(+), 187 deletions(-)

diff --git a/src/com/reco1l/osu/UpdateManager.kt b/src/com/reco1l/osu/UpdateManager.kt
index 408e8b9c4..6d67efaec 100644
--- a/src/com/reco1l/osu/UpdateManager.kt
+++ b/src/com/reco1l/osu/UpdateManager.kt
@@ -2,21 +2,20 @@ package com.reco1l.osu
 
 import android.content.Intent
 import android.content.Intent.*
+import android.util.Log
 import androidx.core.content.FileProvider
-import androidx.preference.PreferenceManager
 import com.osudroid.resources.R
 import com.edlplan.ui.fragment.MarkdownFragment
-import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_INDEFINITE
-import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_SHORT
-import com.google.android.material.snackbar.Snackbar
 import com.reco1l.framework.net.FileRequest
 import com.reco1l.framework.net.IDownloaderObserver
-import okhttp3.Request
-import org.json.JSONObject
+import com.reco1l.framework.net.JsonObjectRequest
+import com.reco1l.osu.ui.MessageDialog
+import com.reco1l.osu.ui.ProgressDialog
+import ru.nsu.ccfit.zuev.osu.Config
 import ru.nsu.ccfit.zuev.osu.GlobalManager
+import ru.nsu.ccfit.zuev.osu.MainActivity
+import ru.nsu.ccfit.zuev.osu.ToastLogger
 import ru.nsu.ccfit.zuev.osu.helper.StringTable
-import ru.nsu.ccfit.zuev.osu.online.OnlineManager
-import ru.nsu.ccfit.zuev.osu.online.OnlineManager.updateEndpoint
 import ru.nsu.ccfit.zuev.osuplus.BuildConfig.APPLICATION_ID
 import java.io.File
 
@@ -24,97 +23,82 @@ import java.io.File
 object UpdateManager: IDownloaderObserver
 {
 
-    private val mainActivity = GlobalManager.getInstance().mainActivity
+    private val updatesDirectory = File(Config.getCachePath(), "updates").apply(File::mkdirs)
 
-    private val preferences
-        get() = PreferenceManager.getDefaultSharedPreferences(mainActivity)
 
-    private val cacheDirectory = File(mainActivity.cacheDir, "updates").apply { mkdirs() }
-
-    private val snackBar = Snackbar.make(mainActivity.window.decorView, "", LENGTH_INDEFINITE)
-
-    
     private var downloadURL: String? = null
     
-    private var newVersionCode: Long = mainActivity.versionCode
-    
+    private var newVersionCode: Long = GlobalManager.getInstance().mainActivity.versionCode
+
+    private var progressDialog: ProgressDialog? = null
+
+
+    @JvmStatic
+    fun onActivityStart(activity: MainActivity) = mainThread {
 
-    fun onActivityStart() = mainThread {
         // Finding if there's a "pending changelog". This means the game was previously updated, we're
         // showing the changelog after update with a prompt asking user to show.
-        preferences.apply {
 
-            val latestUpdate = getLong("latestVersionCode", mainActivity.versionCode)
-            val pendingChangelog = getString("pendingChangelog", null)
+        val latestUpdate = Config.getLong("latestVersionCode", activity.versionCode)
+        val pendingChangelog = Config.getString("pendingChangelog", null)
 
-            if (!pendingChangelog.isNullOrEmpty()) {
-                if (latestUpdate > mainActivity.versionCode) {
-                    snackBar.apply {
+        if (!pendingChangelog.isNullOrEmpty()) {
 
-                        // Will only dismiss if user wants.
-                        duration = LENGTH_INDEFINITE
+            if (latestUpdate > activity.versionCode) {
 
-                        // Show changelog button.
-                        setAction(R.string.changelog_title) {
+                MessageDialog()
+                    .setTitle(activity.getString(R.string.update_info_updated))
+                    .setMessage("Game was updated to a newer version. Do you want to see the changelog?")
+                    .addButton("Yes") {
+                        MarkdownFragment()
+                            .setTitle(R.string.changelog_title)
+                            .setMarkdown(pendingChangelog)
+                            .show()
 
-                            MarkdownFragment().apply {
-                                setTitle(R.string.changelog_title)
-                                setMarkdown(pendingChangelog)
-                                show()
-                            }
-                        }
-                        setText(R.string.update_info_updated)
-                        show()
+                        it.dismiss()
                     }
-                }
-                // Now we're removing the cached changelog.
-                edit().putString("pendingChangelog", null).apply()
+                    .addButton("No") { it.dismiss() }
+                    .setOnDismiss { Config.setString("pendingChangelog", null) }
+                    .show()
             }
         }
 
         checkNewUpdates(true)
     }
 
-
     /**
      * Check for new game updates.
      * 
      * @param silently If `true` no prompt will be shown unless there's new updates.
      */
-    fun checkNewUpdates(silently: Boolean)
-    {
-        if (!silently) {
-            snackBar.apply {
+    @JvmStatic
+    fun checkNewUpdates(silently: Boolean) {
 
-                duration = LENGTH_INDEFINITE
+        val mainActivity = GlobalManager.getInstance().mainActivity
 
-                setText(R.string.update_info_checking)
-                setAction(null, null)
-                show()
-            }
+        if (!silently) {
+            ToastLogger.showText(R.string.update_info_checking, false)
         }
 
         async {
-            // Cleaning update directory first, checking if there's a newer package downloaded and
-            // then installing it.
-            cacheDirectory.listFiles()?.also { list ->
 
-                var newestVersionDownloaded: Long = mainActivity.versionCode
+            // Cleaning update directory first, checking if there's a newer package downloaded already.
+            updatesDirectory.listFiles()?.also { list ->
+
+                var newestVersionDownloaded = mainActivity.versionCode
 
                 list.forEach {
 
                     val version = it.nameWithoutExtension.toLongOrNull() ?: return@forEach
-
-                    // Deleting the file corresponding to this version if still present.
-                    if (version == mainActivity.versionCode)
+                    if (version == mainActivity.versionCode) {
                         it.delete()
+                    }
 
-                    // Finding the newest package.
-                    if (version > newestVersionDownloaded)
+                    if (version > newestVersionDownloaded) {
                         newestVersionDownloaded = version
+                    }
                 }
 
-                // Directly navigate to installation if there's already a newer package.
                 if (newestVersionDownloaded > mainActivity.versionCode) {
                     newVersionCode = newestVersionDownloaded
                     onFoundNewUpdate(silently)
@@ -122,195 +106,131 @@ object UpdateManager: IDownloaderObserver
                 }
             }
                 
-            // Requesting to server asking for new updates.
             try {
                 
-                // Avoid new request if one was already done.
+                // Avoid new request if it was already done.
                 if (downloadURL != null) {
                     onFoundNewUpdate(silently)
                     return@async
                 }
-                
-                val request = Request.Builder()
-                    .url(updateEndpoint + mainActivity.resources.configuration.locale.language)
-                    .build()
 
-                OnlineManager.client.newCall(request).execute().use {
+                JsonObjectRequest(/*updateEndpoint*/ "http://localhost:80/update.php").use { request ->
+
+                    request.buildRequest { header("User-Agent", "Chrome/Android") }
 
-                    val response = JSONObject(it.body!!.string())
-                    val changelogUrl = response.getString("changelog")
+                    val response = request.execute().json
+                    val changelog = response.getString("changelog")
 
                     downloadURL = response.getString("link")
                     newVersionCode = response.getLong("version_code")
 
-                    // Previous implementation has this check, server returning an older version 
-                    // shouldn't happen.
+                    // Previous implementation has this check, server returning an older version shouldn't happen.
                     if (newVersionCode <= mainActivity.versionCode) {
-                        onAlreadyLatestVersion(silently)
+                        ToastLogger.showText(R.string.update_info_latest, false)
                         return@async
                     }
 
-                    // Storing change log link to show once the user update to next version.
-                    preferences.apply {
-                        edit().putString("pendingChangelog", changelogUrl).apply()
-                    }
-
+                    Config.setString("pendingChangelog", changelog)
                     onFoundNewUpdate(silently)
                 }
-            } catch (exception: Exception) {
 
-                exception.printStackTrace()
+            } catch (e: Exception) {
+                Log.e("UpdateManager", "Failed to check for updates.", e)
 
-                onUpdateCheckFailed(silently)
+                if (!silently) {
+                    ToastLogger.showText(R.string.update_info_check_failed, false)
+                }
             }
         }
     }
-    
-    
-    private fun onInstallNewUpdate(file: File) {
-
-        val intent = Intent(ACTION_VIEW).apply {
-
-            val uri = FileProvider.getUriForFile(mainActivity, "$APPLICATION_ID.fileProvider", file)
-
-            setDataAndType(uri, "application/vnd.android.package-archive")
-            addFlags(FLAG_GRANT_READ_URI_PERMISSION)
-        }
-        mainActivity.startActivity(intent)
-    }
-    
-    private fun onDownloadNewUpdate(file: File) {
-
-        // Empty string: At this point download URL shouldn't be null but if it is the case (which is weird) we set an
-        // empty string so the downloader invokes onDownloadFail() and a prompt is shown to user rather than nothing.
-        val url = downloadURL ?: ""
-        
-        val downloader = FileRequest(file, url)
-        downloader.observer = this
 
-        async {
-            downloader.execute()
 
-            mainThread {
-                snackBar.apply {
+    private fun onFoundNewUpdate(silently: Boolean) = mainThread {
 
-                    duration = LENGTH_INDEFINITE
+        val activity = GlobalManager.getInstance().mainActivity
 
-                    setText(StringTable.format(R.string.update_info_downloading, 0))
-                    setAction(R.string.beatmap_downloader_cancel) { downloader.cancel() }
-                    show()
-                }
+        if (newVersionCode <= activity.versionCode) {
+            if (!silently) {
+                ToastLogger.showText(R.string.update_info_latest, false)
             }
-        }
-
-    }
-    
-    
-    private fun onFoundNewUpdate(silently: Boolean) = mainThread {
-
-        if (newVersionCode <= mainActivity.versionCode) {
-            onAlreadyLatestVersion(silently)
             return@mainThread
         }
 
-        preferences.apply {
-            edit().putLong("latestVersionCode", newVersionCode).apply()
-        }
-
-        snackBar.apply {
+        Config.setLong("latestVersionCode", newVersionCode)
 
-            duration = 5000
+        MessageDialog()
+            .setTitle("New update available!")
+            .setMessage(activity.getString(R.string.update_dialog_message))
+            .addButton(activity.getString(R.string.update_dialog_button_update)) {
 
-            setText(R.string.update_dialog_message)
-            setAction(R.string.update_dialog_button_update) {
+                val file = File(updatesDirectory, "$newVersionCode.apk")
 
-                val file = File(cacheDirectory, "$newVersionCode.apk")
-                
                 // Files is already downloaded, navigating to installation.
                 if (file.exists()) {
-                    onInstallNewUpdate(file)
-                    return@setAction
-                }                 
+                    installAPK(file)
+                    return@addButton
+                }
 
                 file.createNewFile()
-                onDownloadNewUpdate(file)
+                downloadAPK(file)
             }
-            show()
-        }
+            .addButton("Update later") { it.dismiss() }
+            .show()
     }
 
-    private fun onUpdateCheckFailed(silently: Boolean) = mainThread {
-        if (silently) {
-            snackBar.dismiss()
-            return@mainThread
-        }
 
-        snackBar.apply {
+    private fun installAPK(file: File) {
 
-            duration = LENGTH_SHORT
-
-            setText(R.string.update_info_check_failed)
-            setAction(null, null)
-            show()
-        }
-    }
+        val uri = FileProvider.getUriForFile(GlobalManager.getInstance().mainActivity, "$APPLICATION_ID.fileProvider", file)
 
-    private fun onAlreadyLatestVersion(silently: Boolean) = mainThread {
+        val intent = Intent(ACTION_VIEW)
+        intent.setDataAndType(uri, "application/vnd.android.package-archive")
+        intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION)
 
-        if (silently) {
-            snackBar.dismiss()
-            return@mainThread
-        }
+        GlobalManager.getInstance().mainActivity.startActivity(intent)
+    }
+    
+    private fun downloadAPK(file: File) {
 
-        snackBar.apply {
+        // Empty string: At this point download URL shouldn't be null but if it is the case (which is weird) we set an
+        // empty string so the downloader invokes onDownloadFail() and a prompt is shown to user rather than nothing.
+        val url = downloadURL ?: ""
 
-            duration = LENGTH_SHORT
+        async {
+            val downloader = FileRequest(file, url)
+            downloader.observer = this@UpdateManager
+            downloader.execute()
 
-            setText(R.string.update_info_latest)
-            setAction(null, null)
-            show()
+            mainThread {
+                progressDialog = ProgressDialog().apply {
+                    setIndeterminate(true)
+                    setTitle("Downloading update")
+                    setMessage(StringTable.format(R.string.update_info_downloading, 0))
+                    show()
+                }
+            }
         }
     }
 
 
     override fun onDownloadUpdate(downloader: FileRequest) = mainThread {
-
-        snackBar.setText(StringTable.format(R.string.update_info_downloading, downloader.progress.toInt()))
+        progressDialog?.progress = downloader.progress.toInt()
+        progressDialog?.setMessage(StringTable.format(R.string.update_info_downloading, downloader.progress.toInt()))
     }
 
     override fun onDownloadEnd(downloader: FileRequest) {
-        mainThread(snackBar::dismiss)
-        onInstallNewUpdate(downloader.file)
+        progressDialog?.dismiss()
+        installAPK(downloader.file)
     }
 
     override fun onDownloadFail(downloader: FileRequest, exception: Exception) {
-
-        exception.printStackTrace()
-
-        mainThread {
-            snackBar.apply {
-
-                duration = LENGTH_SHORT
-
-                setText(R.string.update_info_download_failed)
-                setAction(null, null)
-                show()
-            }
-        }
+        Log.e("UpdateManager", "Failed to download update.", exception)
+        ToastLogger.showText(R.string.update_info_download_failed, false)
         downloader.file.delete()
     }
 
     override fun onDownloadCancel(downloader: FileRequest) {
-        mainThread {
-            snackBar.apply {
-
-                duration = LENGTH_SHORT
-
-                setText(R.string.update_info_download_canceled)
-                setAction(null, null)
-                show()
-            }
-        }
+        ToastLogger.showText(R.string.update_info_download_canceled, false)
         downloader.file.delete()
     }
 }
\ No newline at end of file
diff --git a/src/ru/nsu/ccfit/zuev/osu/MainActivity.java b/src/ru/nsu/ccfit/zuev/osu/MainActivity.java
index 7b8b1ea8f..0d3c85b9a 100644
--- a/src/ru/nsu/ccfit/zuev/osu/MainActivity.java
+++ b/src/ru/nsu/ccfit/zuev/osu/MainActivity.java
@@ -304,7 +304,7 @@ public void onLoadComplete() {
 
             Execution.delayed(2500, () -> {
 
-                UpdateManager.INSTANCE.onActivityStart();
+                UpdateManager.onActivityStart(this);
                 GlobalManager.getInstance().setInfo("");
                 GlobalManager.getInstance().setLoadingProgress(100);
                 ResourceManager.getInstance().loadFont("font", null, 28, Color.WHITE);

From 248d0ddbc859ff4c2c125e3cebb65535d4063582 Mon Sep 17 00:00:00 2001
From: Geronimo Ferruccio <geronimoferruccio15@gmail.com>
Date: Tue, 17 Dec 2024 22:38:43 -0300
Subject: [PATCH 08/16] Add documentation

---
 src/com/reco1l/osu/ui/Dialog.kt         | 18 ++++++++++++++++++
 src/com/reco1l/osu/ui/ListDialog.kt     |  4 +++-
 src/com/reco1l/osu/ui/ProgressDialog.kt |  3 +++
 src/com/reco1l/osu/ui/PromptDialog.kt   |  3 +++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/com/reco1l/osu/ui/Dialog.kt b/src/com/reco1l/osu/ui/Dialog.kt
index 3295cc6b4..74207fcba 100644
--- a/src/com/reco1l/osu/ui/Dialog.kt
+++ b/src/com/reco1l/osu/ui/Dialog.kt
@@ -24,12 +24,30 @@ import com.reco1l.toolkt.animation.toScaleY
 import ru.nsu.ccfit.zuev.osuplus.R
 
 
+/**
+ * A button to be displayed in a dialog.
+ */
 data class DialogButton(
+
+    /**
+     * The text to be displayed in the button.
+     */
     val text: String,
+
+    /**
+     * The color of the button text and icon.
+     */
     val tint: Int = Color.WHITE,
+
+    /**
+     * The function to be called when the button is clicked.
+     */
     val clickListener: (MessageDialog) -> Unit
 )
 
+/**
+ * A dialog that displays a message to the user.
+ */
 open class MessageDialog : BaseFragment() {
 
 
diff --git a/src/com/reco1l/osu/ui/ListDialog.kt b/src/com/reco1l/osu/ui/ListDialog.kt
index 675c52ab0..ce9bce8fb 100644
--- a/src/com/reco1l/osu/ui/ListDialog.kt
+++ b/src/com/reco1l/osu/ui/ListDialog.kt
@@ -40,7 +40,9 @@ data class Option(
     val icon: Drawable? = null
 )
 
-
+/**
+ * A dialog that allows the user to select an option.
+ */
 open class SelectDialog : MessageDialog() {
 
 
diff --git a/src/com/reco1l/osu/ui/ProgressDialog.kt b/src/com/reco1l/osu/ui/ProgressDialog.kt
index 8345beefa..41277a81c 100644
--- a/src/com/reco1l/osu/ui/ProgressDialog.kt
+++ b/src/com/reco1l/osu/ui/ProgressDialog.kt
@@ -4,6 +4,9 @@ import com.google.android.material.progressindicator.CircularProgressIndicator
 import ru.nsu.ccfit.zuev.osuplus.R
 
 
+/**
+ * A dialog that shows a progress bar.
+ */
 class ProgressDialog : MessageDialog() {
 
 
diff --git a/src/com/reco1l/osu/ui/PromptDialog.kt b/src/com/reco1l/osu/ui/PromptDialog.kt
index bc7f5a415..d7b702cbd 100644
--- a/src/com/reco1l/osu/ui/PromptDialog.kt
+++ b/src/com/reco1l/osu/ui/PromptDialog.kt
@@ -7,6 +7,9 @@ import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import ru.nsu.ccfit.zuev.osuplus.R
 
+/**
+ * A dialog that prompts the user for input.
+ */
 open class PromptDialog : MessageDialog() {
 
 

From c3c28e99142a73b15b19548b2d328f23cbb6d6c1 Mon Sep 17 00:00:00 2001
From: Geronimo Ferruccio <geronimoferruccio15@gmail.com>
Date: Tue, 17 Dec 2024 23:54:47 -0300
Subject: [PATCH 09/16] Rename IDownloaderObserver to IFileRequestObserver

---
 src/com/reco1l/framework/net/FileRequest.kt      | 16 ++++++----------
 .../osu/beatmaplisting/BeatmapDownloader.kt      |  4 ++--
 .../reco1l/osu/beatmaplisting/BeatmapListing.kt  |  6 ++----
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/com/reco1l/framework/net/FileRequest.kt b/src/com/reco1l/framework/net/FileRequest.kt
index fb91dfd7b..a25eb6b2c 100644
--- a/src/com/reco1l/framework/net/FileRequest.kt
+++ b/src/com/reco1l/framework/net/FileRequest.kt
@@ -13,7 +13,7 @@ class FileRequest(val file: File, url: HttpUrl): WebRequest(url) {
     /**
      * The download observer.
      */
-    var observer: IDownloaderObserver? = null
+    var observer: IFileRequestObserver? = null
 
     /**
      * Whether the download is in progress, this is set to true once [execute] is called.
@@ -116,13 +116,9 @@ class FileRequest(val file: File, url: HttpUrl): WebRequest(url) {
 }
 
 
-interface IDownloaderObserver
-{
-    fun onDownloadEnd(downloader: FileRequest) = Unit
-
-    fun onDownloadCancel(downloader: FileRequest) = Unit
-
-    fun onDownloadUpdate(downloader: FileRequest) = Unit
-
-    fun onDownloadFail(downloader: FileRequest, exception: Exception) = Unit
+interface IFileRequestObserver {
+    fun onDownloadEnd(request: FileRequest) = Unit
+    fun onDownloadCancel(request: FileRequest) = Unit
+    fun onDownloadUpdate(request: FileRequest) = Unit
+    fun onDownloadFail(request: FileRequest, exception: Exception) = Unit
 }
diff --git a/src/com/reco1l/osu/beatmaplisting/BeatmapDownloader.kt b/src/com/reco1l/osu/beatmaplisting/BeatmapDownloader.kt
index bac5f4d47..e0def6a0e 100644
--- a/src/com/reco1l/osu/beatmaplisting/BeatmapDownloader.kt
+++ b/src/com/reco1l/osu/beatmaplisting/BeatmapDownloader.kt
@@ -4,7 +4,7 @@ import android.os.Environment.DIRECTORY_DOWNLOADS
 import android.view.View
 import com.osudroid.resources.R.*
 import com.reco1l.framework.net.FileRequest
-import com.reco1l.framework.net.IDownloaderObserver
+import com.reco1l.framework.net.IFileRequestObserver
 import com.reco1l.osu.mainThread
 import com.reco1l.osu.multiplayer.Multiplayer
 import com.reco1l.osu.multiplayer.RoomScene
@@ -18,7 +18,7 @@ import ru.nsu.ccfit.zuev.osu.helper.FileUtils
 import ru.nsu.ccfit.zuev.osu.helper.StringTable
 import java.io.IOException
 
-object BeatmapDownloader : IDownloaderObserver {
+object BeatmapDownloader : IFileRequestObserver {
 
 
     private lateinit var fragment: DownloadFragment
diff --git a/src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt b/src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt
index ef72e9edf..0e4986b11 100644
--- a/src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt
+++ b/src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt
@@ -2,7 +2,6 @@ package com.reco1l.osu.beatmaplisting
 
 import android.graphics.BitmapFactory
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.util.Log
 import android.view.Choreographer
 import android.view.Choreographer.FrameCallback
@@ -34,7 +33,7 @@ import com.edlplan.ui.fragment.BaseFragment
 import com.google.android.material.progressindicator.CircularProgressIndicator
 import com.reco1l.*
 import com.reco1l.framework.bass.URLBassStream
-import com.reco1l.framework.net.IDownloaderObserver
+import com.reco1l.framework.net.IFileRequestObserver
 import com.reco1l.framework.net.JsonArrayRequest
 import com.reco1l.osu.*
 import com.reco1l.osu.beatmaplisting.BeatmapMirrorSearchRequestModel.OrderType
@@ -42,7 +41,6 @@ import com.reco1l.osu.beatmaplisting.BeatmapMirrorSearchRequestModel.SortType
 import com.reco1l.osu.ui.Option
 import com.reco1l.osu.ui.SelectDialog
 import com.reco1l.osu.ui.SelectDropdown
-import com.reco1l.toolkt.android.backgroundColor
 import com.reco1l.toolkt.android.cornerRadius
 import com.reco1l.toolkt.android.dp
 import com.reco1l.toolkt.android.drawableLeft
@@ -67,7 +65,7 @@ import ru.nsu.ccfit.zuev.osu.RankedStatus
 
 
 class BeatmapListing : BaseFragment(),
-    IDownloaderObserver,
+    IFileRequestObserver,
     OnEditorActionListener,
     OnKeyListener,
     FrameCallback {

From 68db238d0a439a7a1eb7b2bc5607a2df44d7544c Mon Sep 17 00:00:00 2001
From: Geronimo Ferruccio <geronimoferruccio15@gmail.com>
Date: Wed, 18 Dec 2024 00:39:04 -0300
Subject: [PATCH 10/16] Use white background in markdown

---
 .../src/main/java/club/andnext/markdown/MarkdownWebView.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/andnext_markdown/src/main/java/club/andnext/markdown/MarkdownWebView.java b/andnext_markdown/src/main/java/club/andnext/markdown/MarkdownWebView.java
index 7058af4d2..f4914e979 100644
--- a/andnext_markdown/src/main/java/club/andnext/markdown/MarkdownWebView.java
+++ b/andnext_markdown/src/main/java/club/andnext/markdown/MarkdownWebView.java
@@ -47,7 +47,7 @@ public MarkdownWebView(Context context, AttributeSet attrs, int defStyleAttr, in
 
     @SuppressLint("SetJavaScriptEnabled")
     void init(Context context) {
-        this.setBackgroundColor(Color.TRANSPARENT);
+        this.setBackgroundColor(Color.WHITE);
 
         this.getSettings().setBlockNetworkLoads(true);
         this.getSettings().setLoadWithOverviewMode(true);

From 18a9dfa228edcd98b9df202ef2934d4cff4afecb Mon Sep 17 00:00:00 2001
From: Geronimo Ferruccio <geronimoferruccio15@gmail.com>
Date: Wed, 18 Dec 2024 00:39:29 -0300
Subject: [PATCH 11/16] Fix NPE when opening markdown fragment

---
 src/com/edlplan/ui/fragment/MarkdownFragment.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/edlplan/ui/fragment/MarkdownFragment.java b/src/com/edlplan/ui/fragment/MarkdownFragment.java
index f5a669d95..96ccc5a4d 100644
--- a/src/com/edlplan/ui/fragment/MarkdownFragment.java
+++ b/src/com/edlplan/ui/fragment/MarkdownFragment.java
@@ -64,7 +64,7 @@ public MarkdownFragment setTitle(@StringRes int title) {
     }
 
     protected void playOnLoadAnim() {
-        View body = findViewById(R.id.frg_body);
+        View body = findViewById(R.id.fullLayout);
         body.setTranslationY(500);
         body.animate().cancel();
         body.animate()
@@ -76,7 +76,7 @@ protected void playOnLoadAnim() {
     }
 
     protected void playOnDismissAnim(Runnable runnable) {
-        View body = findViewById(R.id.frg_body);
+        View body = findViewById(R.id.fullLayout);
         body.animate().cancel();
         body.animate()
                 .translationY(500)

From db820e164477528edcb24ae88f2531cf35128698 Mon Sep 17 00:00:00 2001
From: Geronimo Ferruccio <geronimoferruccio15@gmail.com>
Date: Wed, 18 Dec 2024 00:49:57 -0300
Subject: [PATCH 12/16] Disable Android 12 splash screen

---
 res/values/styles.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 16bd5829b..f187a4d87 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -13,6 +13,7 @@
         <item name="windowNoTitle">true</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowBackground">#000</item>
+        <item name="android:windowIsTranslucent">true</item>
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
 
         <item name="checkboxStyle">@style/checkbox</item>

From af7b5d406003cdd0d869d2c5e96e8c864cbbea94 Mon Sep 17 00:00:00 2001
From: Geronimo Ferruccio <geronimoferruccio15@gmail.com>
Date: Wed, 18 Dec 2024 01:17:44 -0300
Subject: [PATCH 13/16] Revert Android splash screen removal

---
 res/values/styles.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index f187a4d87..16bd5829b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -13,7 +13,6 @@
         <item name="windowNoTitle">true</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowBackground">#000</item>
-        <item name="android:windowIsTranslucent">true</item>
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
 
         <item name="checkboxStyle">@style/checkbox</item>

From decc79b504deb2731aabb0d8809a001fb371b8a9 Mon Sep 17 00:00:00 2001
From: Geronimo Ferruccio <geronimoferruccio15@gmail.com>
Date: Wed, 18 Dec 2024 01:50:58 -0300
Subject: [PATCH 14/16] Make dialog properties public

---
 src/com/reco1l/osu/ui/Dialog.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/com/reco1l/osu/ui/Dialog.kt b/src/com/reco1l/osu/ui/Dialog.kt
index 74207fcba..ae5be65f9 100644
--- a/src/com/reco1l/osu/ui/Dialog.kt
+++ b/src/com/reco1l/osu/ui/Dialog.kt
@@ -123,9 +123,15 @@ open class MessageDialog : BaseFragment() {
             }
         }
 
-    protected var allowDismiss = true
+    /**
+     * Whether the dialog is cancelable or not.
+     */
+    var allowDismiss = true
 
-    protected var onDismiss: (() -> Unit)? = null
+    /**
+     * The function to be called when the dialog is dismissed.
+     */
+    var onDismiss: (() -> Unit)? = null
 
 
     override fun onLoadView() {

From 82b61f367e3eff80d489968f7d9eb292f8fbfd8c Mon Sep 17 00:00:00 2001
From: Geronimo Ferruccio <geronimoferruccio15@gmail.com>
Date: Wed, 18 Dec 2024 01:52:36 -0300
Subject: [PATCH 15/16] Simplify `UpdateManager`

---
 src/com/reco1l/osu/UpdateManager.kt         | 229 +++++++-------------
 src/ru/nsu/ccfit/zuev/osu/MainActivity.java |  10 +-
 2 files changed, 85 insertions(+), 154 deletions(-)

diff --git a/src/com/reco1l/osu/UpdateManager.kt b/src/com/reco1l/osu/UpdateManager.kt
index 6d67efaec..646b74cdd 100644
--- a/src/com/reco1l/osu/UpdateManager.kt
+++ b/src/com/reco1l/osu/UpdateManager.kt
@@ -7,60 +7,53 @@ import androidx.core.content.FileProvider
 import com.osudroid.resources.R
 import com.edlplan.ui.fragment.MarkdownFragment
 import com.reco1l.framework.net.FileRequest
-import com.reco1l.framework.net.IDownloaderObserver
+import com.reco1l.framework.net.IFileRequestObserver
 import com.reco1l.framework.net.JsonObjectRequest
 import com.reco1l.osu.ui.MessageDialog
 import com.reco1l.osu.ui.ProgressDialog
 import ru.nsu.ccfit.zuev.osu.Config
 import ru.nsu.ccfit.zuev.osu.GlobalManager
-import ru.nsu.ccfit.zuev.osu.MainActivity
 import ru.nsu.ccfit.zuev.osu.ToastLogger
 import ru.nsu.ccfit.zuev.osu.helper.StringTable
+import ru.nsu.ccfit.zuev.osu.online.OnlineManager.updateEndpoint
+import ru.nsu.ccfit.zuev.osuplus.BuildConfig
 import ru.nsu.ccfit.zuev.osuplus.BuildConfig.APPLICATION_ID
 import java.io.File
 
 
-object UpdateManager: IDownloaderObserver
+object UpdateManager: IFileRequestObserver
 {
 
-    private val updatesDirectory = File(Config.getCachePath(), "updates").apply(File::mkdirs)
+    private val apksDirectory = File(Config.getCachePath(), "updates").apply(File::mkdirs)
 
 
-    private var downloadURL: String? = null
-    
-    private var newVersionCode: Long = GlobalManager.getInstance().mainActivity.versionCode
-
     private var progressDialog: ProgressDialog? = null
 
 
     @JvmStatic
-    fun onActivityStart(activity: MainActivity) = mainThread {
-
-        // Finding if there's a "pending changelog". This means the game was previously updated, we're
-        // showing the changelog after update with a prompt asking user to show.
+    fun onActivityStart() = mainThread {
 
-        val latestUpdate = Config.getLong("latestVersionCode", activity.versionCode)
-        val pendingChangelog = Config.getString("pendingChangelog", null)
+        val activity = GlobalManager.getInstance().mainActivity
+        val version = Config.getLong("version", activity.versionCode)
 
-        if (!pendingChangelog.isNullOrEmpty()) {
+        // Ignoring debug because otherwise every compiled build will show the dialog.
+        if (!BuildConfig.DEBUG && version < activity.versionCode) {
 
-            if (latestUpdate > activity.versionCode) {
+            MessageDialog()
+                .setTitle(StringTable.get(R.string.update_info_updated))
+                .setMessage("Game was updated to a newer version.\nDo you want to see the changelog?")
+                .addButton("Yes") {
+                    it.dismiss()
 
-                MessageDialog()
-                    .setTitle(activity.getString(R.string.update_info_updated))
-                    .setMessage("Game was updated to a newer version. Do you want to see the changelog?")
-                    .addButton("Yes") {
-                        MarkdownFragment()
-                            .setTitle(R.string.changelog_title)
-                            .setMarkdown(pendingChangelog)
-                            .show()
+                    MarkdownFragment()
+                        .setTitle(R.string.changelog_title)
+                        .setMarkdown(activity.assets.open("app/changelog.md").reader().readText())
+                        .show()
+                }
+                .addButton("No", clickListener = MessageDialog::dismiss)
+                .show()
 
-                        it.dismiss()
-                    }
-                    .addButton("No") { it.dismiss() }
-                    .setOnDismiss { Config.setString("pendingChangelog", null) }
-                    .show()
-            }
+            Config.setLong("version", activity.versionCode)
         }
 
         checkNewUpdates(true)
@@ -69,69 +62,64 @@ object UpdateManager: IDownloaderObserver
     /**
      * Check for new game updates.
      * 
-     * @param silently If `true` no prompt will be shown unless there's new updates.
+     * @param silently If `true` no announce will be shown unless there's new updates.
      */
     @JvmStatic
     fun checkNewUpdates(silently: Boolean) {
 
-        val mainActivity = GlobalManager.getInstance().mainActivity
-
         if (!silently) {
             ToastLogger.showText(R.string.update_info_checking, false)
         }
 
         async {
+            // Cleaning up old updates.
+            apksDirectory.listFiles()?.forEach { it.delete() }
 
-            // Cleaning update directory first, checking if there's a newer package downloaded already.
-            updatesDirectory.listFiles()?.also { list ->
-
-                var newestVersionDownloaded = mainActivity.versionCode
-
-                list.forEach {
-
-                    val version = it.nameWithoutExtension.toLongOrNull() ?: return@forEach
-                    if (version == mainActivity.versionCode) {
-                        it.delete()
-                    }
-
-                    if (version > newestVersionDownloaded) {
-                        newestVersionDownloaded = version
-                    }
-                }
-
-                if (newestVersionDownloaded > mainActivity.versionCode) {
-                    newVersionCode = newestVersionDownloaded
-                    onFoundNewUpdate(silently)
-                    return@async
-                }
-            }
-                
             try {
-                
-                // Avoid new request if it was already done.
-                if (downloadURL != null) {
-                    onFoundNewUpdate(silently)
-                    return@async
-                }
-
-                JsonObjectRequest(/*updateEndpoint*/ "http://localhost:80/update.php").use { request ->
-
-                    request.buildRequest { header("User-Agent", "Chrome/Android") }
+                JsonObjectRequest(updateEndpoint).use { request ->
 
                     val response = request.execute().json
-                    val changelog = response.getString("changelog")
 
-                    downloadURL = response.getString("link")
-                    newVersionCode = response.getLong("version_code")
+                    val newVersion = response.getLong("version_code")
+                    val link = response.getString("link")
 
-                    // Previous implementation has this check, server returning an older version shouldn't happen.
-                    if (newVersionCode <= mainActivity.versionCode) {
-                        ToastLogger.showText(R.string.update_info_latest, false)
-                        return@async
+                    if (newVersion <= GlobalManager.getInstance().mainActivity.versionCode) {
+                        if (!silently) {
+                            ToastLogger.showText(R.string.update_info_latest, false)
+                        }
+                        return@use
                     }
 
-                    Config.setString("pendingChangelog", changelog)
-                    onFoundNewUpdate(silently)
+                    MessageDialog()
+                        .setTitle("New update available!")
+                        .setMessage(StringTable.get(R.string.update_dialog_message))
+                        .addButton(StringTable.get(R.string.update_dialog_button_update)) { dialog ->
+
+                            dialog.dismiss()
+
+                            progressDialog = ProgressDialog().apply {
+                                indeterminate = true
+                                allowDismiss = false
+                                max = 100
+                                title = "Downloading update"
+                                message = StringTable.format(R.string.update_info_downloading, 0)
+                                show()
+                            }
+
+                            async {
+                                val file = File(apksDirectory, "${newVersion}.apk")
+                                if (file.exists()) {
+                                    file.delete()
+                                }
+                                file.createNewFile()
+
+                                val fileRequest = FileRequest(file, link)
+                                fileRequest.observer = this@UpdateManager
+                                fileRequest.execute()
+                            }
+                        }
+                        .addButton("Update later") { it.dismiss() }
+                        .show()
                 }
 
             } catch (e: Exception) {
@@ -145,92 +133,39 @@ object UpdateManager: IDownloaderObserver
     }
 
 
-    private fun onFoundNewUpdate(silently: Boolean) = mainThread {
-
-        val activity = GlobalManager.getInstance().mainActivity
+    override fun onDownloadUpdate(request: FileRequest) = mainThread {
+        val progress = request.progress.toInt()
 
-        if (newVersionCode <= activity.versionCode) {
-            if (!silently) {
-                ToastLogger.showText(R.string.update_info_latest, false)
-            }
-            return@mainThread
-        }
-
-        Config.setLong("latestVersionCode", newVersionCode)
-
-        MessageDialog()
-            .setTitle("New update available!")
-            .setMessage(activity.getString(R.string.update_dialog_message))
-            .addButton(activity.getString(R.string.update_dialog_button_update)) {
-
-                val file = File(updatesDirectory, "$newVersionCode.apk")
-
-                // Files is already downloaded, navigating to installation.
-                if (file.exists()) {
-                    installAPK(file)
-                    return@addButton
-                }
-
-                file.createNewFile()
-                downloadAPK(file)
-            }
-            .addButton("Update later") { it.dismiss() }
-            .show()
+        progressDialog?.indeterminate = false
+        progressDialog?.progress = progress
+        progressDialog?.setMessage(StringTable.format(R.string.update_info_downloading, progress))
     }
 
+    override fun onDownloadEnd(request: FileRequest) {
+        mainThread { progressDialog?.dismiss() }
 
-    private fun installAPK(file: File) {
-
-        val uri = FileProvider.getUriForFile(GlobalManager.getInstance().mainActivity, "$APPLICATION_ID.fileProvider", file)
+        val activity = GlobalManager.getInstance().mainActivity
+        val uri = FileProvider.getUriForFile(activity, "$APPLICATION_ID.fileProvider", request.file)
 
         val intent = Intent(ACTION_VIEW)
         intent.setDataAndType(uri, "application/vnd.android.package-archive")
         intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION)
 
-        GlobalManager.getInstance().mainActivity.startActivity(intent)
+        activity.startActivity(intent)
     }
-    
-    private fun downloadAPK(file: File) {
 
-        // Empty string: At this point download URL shouldn't be null but if it is the case (which is weird) we set an
-        // empty string so the downloader invokes onDownloadFail() and a prompt is shown to user rather than nothing.
-        val url = downloadURL ?: ""
-
-        async {
-            val downloader = FileRequest(file, url)
-            downloader.observer = this@UpdateManager
-            downloader.execute()
-
-            mainThread {
-                progressDialog = ProgressDialog().apply {
-                    setIndeterminate(true)
-                    setTitle("Downloading update")
-                    setMessage(StringTable.format(R.string.update_info_downloading, 0))
-                    show()
-                }
-            }
-        }
-    }
-
-
-    override fun onDownloadUpdate(downloader: FileRequest) = mainThread {
-        progressDialog?.progress = downloader.progress.toInt()
-        progressDialog?.setMessage(StringTable.format(R.string.update_info_downloading, downloader.progress.toInt()))
-    }
-
-    override fun onDownloadEnd(downloader: FileRequest) {
-        progressDialog?.dismiss()
-        installAPK(downloader.file)
-    }
-
-    override fun onDownloadFail(downloader: FileRequest, exception: Exception) {
+    override fun onDownloadFail(request: FileRequest, exception: Exception) {
         Log.e("UpdateManager", "Failed to download update.", exception)
         ToastLogger.showText(R.string.update_info_download_failed, false)
-        downloader.file.delete()
+
+        mainThread { progressDialog?.dismiss() }
+        request.file.delete()
     }
 
-    override fun onDownloadCancel(downloader: FileRequest) {
+    override fun onDownloadCancel(request: FileRequest) {
         ToastLogger.showText(R.string.update_info_download_canceled, false)
-        downloader.file.delete()
+
+        mainThread { progressDialog?.dismiss() }
+        request.file.delete()
     }
 }
\ No newline at end of file
diff --git a/src/ru/nsu/ccfit/zuev/osu/MainActivity.java b/src/ru/nsu/ccfit/zuev/osu/MainActivity.java
index 0d3c85b9a..70feee167 100644
--- a/src/ru/nsu/ccfit/zuev/osu/MainActivity.java
+++ b/src/ru/nsu/ccfit/zuev/osu/MainActivity.java
@@ -304,7 +304,7 @@ public void onLoadComplete() {
 
             Execution.delayed(2500, () -> {
 
-                UpdateManager.onActivityStart(this);
+                UpdateManager.onActivityStart();
                 GlobalManager.getInstance().setInfo("");
                 GlobalManager.getInstance().setLoadingProgress(100);
                 ResourceManager.getInstance().loadFont("font", null, 28, Color.WHITE);
@@ -368,7 +368,7 @@ protected void onSetContentView() {
         this.mRenderSurfaceView.setRenderer(this.mEngine);
 
         RelativeLayout layout = new RelativeLayout(this);
-        layout.setBackgroundColor(Color.argb(255, 0, 0, 0));
+        layout.setBackgroundColor(Color.BLACK);
         layout.addView(
                 mRenderSurfaceView,
                 new RelativeLayout.LayoutParams(
@@ -378,13 +378,9 @@ protected void onSetContentView() {
                 }});
 
         FrameLayout frameLayout = new FrameLayout(this);
-        frameLayout.setId(0x28371);
+        frameLayout.setId(View.generateViewId());
         layout.addView(frameLayout, new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 
-        View c = new View(this);
-        c.setBackgroundColor(Color.argb(0, 0, 0, 0));
-        layout.addView(c, new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-
         this.setContentView(
                 layout,
                 new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT) {{

From 4d1776d2ce4c5a48f39efe06963dd7d0ebb59776 Mon Sep 17 00:00:00 2001
From: Rian8337 <52914632+Rian8337@users.noreply.github.com>
Date: Thu, 26 Dec 2024 22:09:11 +0800
Subject: [PATCH 16/16] Reword some KDocs

---
 src/com/reco1l/osu/UpdateManager.kt   | 2 +-
 src/com/reco1l/osu/ui/PromptDialog.kt | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/reco1l/osu/UpdateManager.kt b/src/com/reco1l/osu/UpdateManager.kt
index 646b74cdd..60ece52a0 100644
--- a/src/com/reco1l/osu/UpdateManager.kt
+++ b/src/com/reco1l/osu/UpdateManager.kt
@@ -62,7 +62,7 @@ object UpdateManager: IFileRequestObserver
     /**
      * Check for new game updates.
      * 
-     * @param silently If `true` no announce will be shown unless there's new updates.
+     * @param silently If `true`, no prompts will be shown unless there's new updates.
      */
     @JvmStatic
     fun checkNewUpdates(silently: Boolean) {
diff --git a/src/com/reco1l/osu/ui/PromptDialog.kt b/src/com/reco1l/osu/ui/PromptDialog.kt
index d7b702cbd..f24229b4d 100644
--- a/src/com/reco1l/osu/ui/PromptDialog.kt
+++ b/src/com/reco1l/osu/ui/PromptDialog.kt
@@ -41,7 +41,7 @@ open class PromptDialog : MessageDialog() {
         }
 
     /**
-     * The text to be show displayed in the input hint.
+     * The text to display in the input hint.
      */
     var hint: String? = null
         set(value) {
@@ -52,7 +52,7 @@ open class PromptDialog : MessageDialog() {
         }
 
     /**
-     * The function to be called when the text input is changed.
+     * The function to call when the text input is changed.
      */
     var onTextChanged: ((PromptDialog) -> Unit)? = null
 
@@ -92,7 +92,7 @@ open class PromptDialog : MessageDialog() {
     }
 
     /**
-     * The text to be show displayed in the input hint.
+     * The text to display in the input hint.
      */
     fun setHint(text: String): PromptDialog {
         hint = text
@@ -100,7 +100,7 @@ open class PromptDialog : MessageDialog() {
     }
 
     /**
-     * The function to be called when the text input is changed.
+     * The function to call when the text input is changed.
      */
     fun setOnTextChanged(action: (PromptDialog) -> Unit): PromptDialog {
         onTextChanged = action