Remove unused experimental switch

2021-08-06 08:59:11 +02:00 · 2021-08-06 08:59:11 +02:00 · 81dd69a9d7
commit 81dd69a9d7
--- a/app/src/main/java/audio/funkwhale/ffa/activities/SettingsActivity.kt
+++ b/app/src/main/java/audio/funkwhale/ffa/activities/SettingsActivity.kt
@ -64,16 +64,6 @@ class SettingsFragment :
    when (preference?.key) {
      "oss_licences" -> startActivity(Intent(activity, LicencesActivity::class.java))

-      "experiments" -> {
-        context?.let { context ->
-          AlertDialog.Builder(context)
-            .setTitle(context.getString(R.string.settings_experiments_restart_title))
-            .setMessage(context.getString(R.string.settings_experiments_restart_content))
-            .setPositiveButton(android.R.string.yes) { _, _ -> }
-            .show()
-        }
-      }
-
      "crash" -> {
        activity?.let { activity ->
          (activity.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager)?.also { clip ->
--- a/app/src/main/java/audio/funkwhale/ffa/utils/Util.kt
+++ b/app/src/main/java/audio/funkwhale/ffa/utils/Util.kt
@ -73,14 +73,8 @@ fun toDurationString(duration: Long, showSeconds: Boolean = false): String {

 object Settings {

-  fun hasAccessToken(): Boolean {
-    return PowerPreference.getFileByName(AppContext.PREFS_CREDENTIALS).contains("access_token")
-  }
-
  fun isAnonymous() =
    PowerPreference.getFileByName(AppContext.PREFS_CREDENTIALS).getBoolean("anonymous", false)

-  fun areExperimentsEnabled() = PowerPreference.getDefaultFile().getBoolean("experiments", false)
-
  fun getScopes() = PowerPreference.getDefaultFile().getString("scope", "all").split(",")
 }
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -31,10 +31,6 @@
    <string name="settings_night_mode_off_summary">Heller Modus ist immer eingeschaltet</string>
    <string name="settings_night_mode_system">Wie Systemvoreinstellung</string>
    <string name="settings_night_mode_system_summary">Der Nachtmodus wird den Systemeinstellungen folgen</string>
-    <string name="settings_experiments">Experimentielle Funktionen aktivieren</string>
-    <string name="settings_experiments_description">Auf eigenes Risiko, die App kann abstützen oder einfrieren</string>
-    <string name="settings_experiments_restart_title">Neustart erforderlich</string>
-    <string name="settings_experiments_restart_content">Bitte beende die App und starte sie dann neu, um die Einstellungen zu übernehmen</string>
    <string name="settings_information">Informationen</string>
    <string name="settings_version_title">Version</string>
    <string name="settings_information_repository_description">Funkwhale für Android</string>
@ -126,4 +122,4 @@
    <string name="filters_followed">Gefolgte Inhalte</string>
    <string name="settings_play_order_shuffle">Alben zufällig abspielen</string>
    <string name="settings_play_order_shuffle_summary">Alben werden zufällig abgespielt</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -74,10 +74,6 @@
    <string name="settings_information_repository_description">Funkwhale para Android</string>
    <string name="settings_information_repository_title">Repositorio</string>
    <string name="settings_information">Información</string>
-    <string name="settings_experiments_restart_content">Por favor fuerza la salida y reinicia la app para que surjan efecto los cambios</string>
-    <string name="settings_experiments_restart_title">Reinicio requerido</string>
-    <string name="settings_experiments_description">Úsalo bajo tu propio riesgo, puede congelar o cerrar inesperadamente la app</string>
-    <string name="settings_experiments">Activar opciones experimentales</string>
    <string name="settings_night_mode_system_summary">El modo oscuro seguirá los ajustes del sistema</string>
    <string name="settings_night_mode_system">Seguir los ajustes del sistema</string>
    <string name="settings_night_mode_off_summary">El modo claro siempre estará activado</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -39,10 +39,6 @@
    <string name="settings_night_mode_off_summary">Le mode jour sera toujours activé</string>
    <string name="settings_night_mode_system">Suivre les préférences du système</string>
    <string name="settings_night_mode_system_summary">Le mode nuit suivra les préférence système</string>
-    <string name="settings_experiments">Activer les fonctionnalité expérimentales</string>
-    <string name="settings_experiments_description">Utiliser à vos risques et périls, peut potentiellement ralentir ou crasher l\'application</string>
-    <string name="settings_experiments_restart_title">Relancement requis</string>
-    <string name="settings_experiments_restart_content">Veuillez tuer puis relancer l\'application afin que ce changement soit pris en compte</string>
    <string name="settings_information">Information</string>
    <string name="settings_information_repository_title">Dépôt</string>
    <string name="settings_information_repository_description">Funkwhale pour Android</string>
@ -126,4 +122,4 @@
        <item quantity="one">Téléchargement de %1$d piste</item>
        <item quantity="other">Téléchargement de %1$d pistes</item>
    </plurals>
-</resources>
+</resources>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="settings_experiments">Activar características experimentais</string>
    <string name="settings_night_mode_system_summary">O modo escuro seguirá os axustes do sistema</string>
    <string name="settings_night_mode_system">Seguir axustes do sistema</string>
    <string name="settings_night_mode_off_summary">O modo claro estará activo sempre</string>
@ -123,7 +122,4 @@
    <string name="settings_information_repository_description">Funkwhale para Android</string>
    <string name="settings_information_repository_title">Repositorio</string>
    <string name="settings_information">Información</string>
-    <string name="settings_experiments_restart_content">Por favor, pecha e reinicia a app para que este cambio sexa aplicado</string>
-    <string name="settings_experiments_restart_title">Require reiniciar</string>
-    <string name="settings_experiments_description">Usa baixo a túa responsabilidade, podería facer fallar a app</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -86,10 +86,6 @@
    <string name="settings_information_repository_description">Funkwhale za Android</string>
    <string name="settings_information_repository_title">Softverski repozitorij</string>
    <string name="settings_information">Informacije</string>
-    <string name="settings_experiments_restart_content">Molimo ugasite i ponovno pokrenite aplikaciju kako bi se promjene primjenile</string>
-    <string name="settings_experiments_restart_title">Potrebno ponovno pokretanje</string>
-    <string name="settings_experiments_description">Koristiti na svoju odgovornost, može zamrznuti ili srušiti aplikaciju</string>
-    <string name="settings_experiments">Omogući eksperimentalne funkcije</string>
    <string name="settings_night_mode_system_summary">Tamni izgled će se prilagoditi postavkama sistema</string>
    <string name="settings_night_mode_system">Prilagodi postavkama sistema</string>
    <string name="settings_night_mode_off">Uvijek isključen (svjetli izgled)</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -83,10 +83,6 @@
    <string name="settings_information_repository_description">Funkwhale per Android</string>
    <string name="settings_information_repository_title">Repository</string>
    <string name="settings_information">Informazione</string>
-    <string name="settings_experiments_restart_content">Si prega di chiudere e riavviare l\'app affinché questa modifica abbia effetto</string>
-    <string name="settings_experiments_restart_title">Riavvio richiesto</string>
-    <string name="settings_experiments_description">Utilizzare a proprio rischio, potrebbe bloccare o mandare in crash l\'app</string>
-    <string name="settings_experiments">Abilita funzionalità sperimentali</string>
    <string name="settings_night_mode_system_summary">La modalità notturna seguirà le impostazioni di sistema</string>
    <string name="settings_night_mode_system">Segui le impostazioni di sistema</string>
    <string name="settings_night_mode_off_summary">La modalità luce sarà sempre attiva</string>
@ -126,4 +122,4 @@
    <string name="login_cleartext">Consenti traffico in chiaro (HTTP)</string>
    <string name="login_hostname">Nome dell\'host</string>
    <string name="login_welcome">Inserisci i dettagli della tua istanza di Funkwhale per accedere al suo contenuto</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -36,8 +36,6 @@
    <string name="login_cleartext">平文での通信（HTTP）を許可する</string>
    <string name="settings_other">その他の設定</string>
    <string name="settings_night_mode">ダークモード</string>
-    <string name="settings_experiments_description">あなた自身のリスクで使用してください。アプリがフリーズしたり、クラッシュするかもしれません</string>
-    <string name="settings_experiments_restart_title">アプリの再起動が必要です</string>
    <string name="settings_information">情報</string>
    <string name="settings_information_repository_title">Gitリポジトリ</string>
    <string name="settings_information_repository_description">Funkwhale for Android</string>
@ -82,8 +80,6 @@
    <string name="login_username">ユーザーネーム</string>
    <string name="title_oss_licences">オープンソースライセンス</string>
    <string name="settings_media_cache_size_summary">オフライン再生向けの曲の保存のために、%d GBが使われます</string>
-    <string name="settings_experiments">実験的な機能を有効にする</string>
-    <string name="settings_experiments_restart_content">変更を適用するためにアプリを終了し、再起動して下さい</string>
    <string name="settings_crash_report_copied">クリップボードに前回のクラッシュレポートがコピーされました</string>
    <string name="track_info_details_track_title">曲名</string>
    <string name="radio_random_title">ランダム</string>
@ -107,4 +103,4 @@
        <item quantity="other">%1$d曲をダウンロードしています</item>
    </plurals>
    <string name="logout_content">本当にこのFunkwhaleポッドからサインアウトしますか？</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -75,8 +75,6 @@
    <string name="settings_information_repository_description">Funkwhale dla Androida</string>
    <string name="settings_information_repository_title">Repozytorium</string>
    <string name="settings_information">Informacje</string>
-    <string name="settings_experiments_restart_content">Aby wprowadzić zmiany należy zrestartować aplikację</string>
-    <string name="settings_experiments_restart_title">Restart jest wymagany</string>
    <string name="settings_play_order_in_order">Odtwarzaj utwory w albumach w kolejności</string>
    <string name="settings_play_order_shuffle">Mieszaj albumy</string>
    <string name="search_placeholder">Szukaj wykonawców, albumów i utworów</string>
@ -104,8 +102,6 @@
    <string name="settings_information_license_description">Licencja MIT</string>
    <string name="settings_information_license_title">Licencja</string>
    <string name="settings_version_title">Wersja</string>
-    <string name="settings_experiments_description">Używasz na własną odpowiedzialność — może powodować problemy</string>
-    <string name="settings_experiments">Włącz funkcje eksperymentalne</string>
    <string name="settings_night_mode_system_summary">Tryb będzie zależny od ustawień telefonu</string>
    <string name="settings_night_mode_system">Respektuj ustawienia systemowe</string>
    <string name="settings_night_mode_off_summary">Tryb jasny będzie zawsze włączony</string>
@ -131,4 +127,4 @@
    <string name="login_username">Nazwa użytkownika</string>
    <string name="login_anonymous">Anonimowy dostęp</string>
    <string name="login_cleartext">Zezwól na nieszyfrowany przesył (HTTP)</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -76,10 +76,6 @@
    <string name="settings_information_repository_description">Funkwhale для Android </string>
    <string name="settings_information_repository_title">Репозиторий</string>
    <string name="settings_information">Информация</string>
-    <string name="settings_experiments_restart_content">Пожалуйста, остановите и запустите приложение что бы изменения применились</string>
-    <string name="settings_experiments_restart_title">Требуется перезагрузка</string>
-    <string name="settings_experiments_description">Используйте на свой страх и риск, приложение может подтормаживать или сбоить</string>
-    <string name="settings_experiments">Включить эксперементальные возможности</string>
    <string name="settings_night_mode_system_summary">Тёмный режим будет следовать настройкам системы</string>
    <string name="settings_night_mode_system">Как указано в настройках системы</string>
    <string name="settings_night_mode_off_summary">Светлый режим всегда будет включен</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -65,10 +65,6 @@
    <string name="settings_information_repository_description">安卓版放克鲸</string>
    <string name="settings_information_repository_title">代码库</string>
    <string name="settings_information">信息</string>
-    <string name="settings_experiments_restart_content">请终止并重新启动应用程序，以便此更改生效</string>
-    <string name="settings_experiments_restart_title">需要重新启动</string>
-    <string name="settings_experiments_description">自行承担使用风险，可能会冻结或崩溃应用</string>
-    <string name="settings_experiments">启用实验功能</string>
    <string name="settings_night_mode_system_summary">夜间模式将遵循系统设置</string>
    <string name="settings_night_mode_system">遵循系统设置</string>
    <string name="settings_night_mode_off_summary">明亮模式将始终打开</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -40,10 +40,6 @@
  <string name="settings_night_mode_off_summary">Light mode will always be on</string>
  <string name="settings_night_mode_system">Follow system settings</string>
  <string name="settings_night_mode_system_summary">Night mode will follow system settings</string>
-  <string name="settings_experiments">Enable experimental features</string>
-  <string name="settings_experiments_description">Use at your own risks, may freeze or crash the app</string>
-  <string name="settings_experiments_restart_title">Restart required</string>
-  <string name="settings_experiments_restart_content">Please kill and restart the app in order for this change to take effect</string>
  <string name="settings_information">Information</string>
  <string name="settings_information_repository_title">Repository</string>
  <string name="settings_information_repository_description">Funkwhale for Android</string>
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@ -42,12 +42,6 @@
      android:key="night_mode"
      android:title="@string/settings_night_mode" />

-    <CheckBoxPreference
-      android:icon="@drawable/experimental"
-      android:key="experiments"
-      android:summary="@string/settings_experiments_description"
-      android:title="@string/settings_experiments" />
-
    <Preference
      android:icon="@drawable/bug"
      android:key="crash"
@ -96,4 +90,4 @@

  </PreferenceCategory>

-</androidx.preference.PreferenceScreen>
+</androidx.preference.PreferenceScreen>