Simplify Cuberite update process

cuberite · Mar 23, 2024 · 85f4eb8 · 85f4eb8
1 parent 2dba320
commit 85f4eb8
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 23 deletions.
diff --git a/app/src/main/kotlin/org/cuberite/android/fragments/SettingsFragment.kt b/app/src/main/kotlin/org/cuberite/android/fragments/SettingsFragment.kt
@@ -266,14 +266,9 @@ URL: $url""")
 
     // Install-related methods
     private fun initializeInstallSettings() {
-        val updateBinary = findPreference<Preference>("installUpdateBinary")
-        updateBinary!!.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            InstallService.download(requireActivity(), InstallService.State.NEED_DOWNLOAD_BINARY)
-            true
-        }
-        val updateServer = findPreference<Preference>("installUpdateServer")
-        updateServer!!.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            InstallService.download(requireActivity(), InstallService.State.NEED_DOWNLOAD_SERVER)
+        val update = findPreference<Preference>("installUpdate")
+        update!!.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+            InstallService.download(requireActivity(), InstallService.State.NEED_DOWNLOAD_BOTH)
             true
         }
         val abi = String.format(getString(R.string.settings_install_manually_abi), CuberiteService.preferredABI)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -28,8 +28,6 @@
 
     <string name="settings_install_update">Cuberite aktualisieren</string>
     <string name="settings_install_update_explanation">An automatischen Aktualisierungen wird noch gearbeitet. Bis dahin kann über diese Funktion Cuberite aktualisiert werden. Achten Sie drauf, dass eine Aktualisierung Servereinstellungen überschreiben kann.</string>
-    <string name="settings_install_update_binary">Cuberite Programmdatei herunterladen und installieren</string>
-    <string name="settings_install_update_server">Cuberite Daten herunter laden und entpacken</string>
     <string name="settings_install_manually">Daten manuell installieren</string>
     <string name="settings_install_manually_explanation">Sie können eigene Dateien auswählen, statt diese automatisch herunterzuladen. Tun Sie dies nur, wenn sie wissen, was sie tun.</string>
     <string name="settings_install_manually_abi">Benötigte ABI: %1$s</string> <!-- Do not translate %1$s, its the placeholder for the ABI -->

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -28,8 +28,6 @@
 
     <string name="settings_install_update">Update Cuberite</string>
     <string name="settings_install_update_explanation">Gebruike deze sectie van tijd tot tijd om uw Cuberite installatie te updaten. Opmerking: als u een server.zip update uitvoert is er een kans dat uw server instellingen verloren gaan.</string>
-    <string name="settings_install_update_binary">Download en installeer de Cuberite binary</string>
-    <string name="settings_install_update_server">Download en installeer server.zip</string>
     <string name="settings_install_manually">Installeer zip bestanden manueel</string>
     <string name="settings_install_manually_explanation">In plaats van Cuberite te downloaden kan u ervoor kiezen om uw eigen gecompileerde binaries te gebruiken. Gebruik dit enkel als u weet wat u doet.</string>
     <string name="settings_install_manually_abi">Benodigde ABI voor dit apparaat: %1$s</string> <!-- Do not translate %1$s, its the placeholder for the ABI -->

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -28,8 +28,6 @@
 
     <string name="settings_install_update">Atualizar o Cuberite</string>
     <string name="settings_install_update_explanation">Use essa seção de tempos em tempos para atualizar a sua instalação do Cuberite. Por favor note que se você fizer a atualização do server.zip algumas configurações customizadas podem ser perdidas.</string>
-    <string name="settings_install_update_binary">Baixar e instalar o binário do Cuberite</string>
-    <string name="settings_install_update_server">Baixar e instalar o server.zip</string>
     <string name="settings_install_manually">Instalar arquivos zip manualmente</string>
     <string name="settings_install_manually_explanation">Em vez de baixar o Cuberite você pode usar seus próprios binários. Use essa opção apenas se você souber o que você está fazendo.</string>
     <string name="settings_install_manually_abi">ABI exigida pelo seu dispositivo: %1$s</string> <!-- Do not translate %1$s, its the placeholder for the ABI -->

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -44,8 +44,6 @@
 
     <string name="settings_install_update">执行Cuberite更新</string>
     <string name="settings_install_update_explanation">使用以下选项来更新您的Cuberite\n注意，执行server.zip更新，可能会覆盖服务器设置</string>
-    <string name="settings_install_update_binary">下载并安装Libraries文件</string>
-    <string name="settings_install_update_server">下载并安装server.zip</string>
     <string name="settings_install_manually">手动安装zip文件</string>
     <string name="settings_install_manually_explanation">您可以使用自己编译的Libraries文件，无需下载Cuberite</string>
     <string name="settings_install_manually_abi">设备所需的ABI：%1$s</string> <!-- Do not translate %1$s, its the placeholder for the ABI -->

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -50,8 +50,6 @@
 
     <string name="settings_install_update">Update Cuberite</string>
     <string name="settings_install_update_explanation">Use this section from time to time to update your Cuberite installation</string>
-    <string name="settings_install_update_binary">Update Cuberite executable</string>
-    <string name="settings_install_update_server">Update server files</string>
     <string name="settings_install_manually">Install Cuberite manually</string>
     <string name="settings_install_manually_explanation">Instead of downloading Cuberite, you can use your own compiled executable. Use this only if you understand what you are doing.</string>
     <string name="settings_install_manually_abi">Required ABI for your device: %1$s</string> <!-- Do not translate %1$s, its the placeholder for the ABI -->

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -41,11 +41,8 @@
             app:enableCopying="true"
             app:selectable="false" />
         <Preference
-            app:key="installUpdateBinary"
-            app:title="@string/settings_install_update_binary" />
-        <Preference
-            app:key="installUpdateServer"
-            app:title="@string/settings_install_update_server" />
+            app:key="installUpdate"
+            app:title="@string/settings_install_update" />
     </PreferenceCategory>
 
     <PreferenceCategory