From db31fefe8390af6fa799c959b1d31413a40a98ab Mon Sep 17 00:00:00 2001 From: tzugen Date: Fri, 11 Jun 2021 10:42:40 +0200 Subject: [PATCH 1/5] Remove flash support --- detekt-baseline.xml | 1 - .../ultrasonic/fragment/SettingsFragment.java | 3 - .../org/moire/ultrasonic/util/Constants.java | 1 - .../java/org/moire/ultrasonic/util/Util.java | 55 +++---- .../ultrasonic/util/VideoPlayerType.java | 139 ------------------ .../ultrasonic/service/CachedMusicService.kt | 4 +- .../moire/ultrasonic/service/MusicService.kt | 2 +- .../ultrasonic/service/OfflineMusicService.kt | 2 +- .../ultrasonic/service/RESTMusicService.kt | 3 +- .../moire/ultrasonic/subsonic/VideoPlayer.kt | 16 +- .../org/moire/ultrasonic/view/SongView.kt | 4 +- ultrasonic/src/main/res/values-cs/strings.xml | 5 +- ultrasonic/src/main/res/values-de/strings.xml | 5 +- ultrasonic/src/main/res/values-es/strings.xml | 5 +- ultrasonic/src/main/res/values-fr/strings.xml | 5 +- ultrasonic/src/main/res/values-hu/strings.xml | 5 +- ultrasonic/src/main/res/values-it/strings.xml | 4 +- ultrasonic/src/main/res/values-nl/strings.xml | 5 +- ultrasonic/src/main/res/values-pl/strings.xml | 5 +- .../src/main/res/values-pt-rBR/strings.xml | 5 +- ultrasonic/src/main/res/values-pt/strings.xml | 5 +- ultrasonic/src/main/res/values-ru/strings.xml | 5 +- .../src/main/res/values-zh-rCN/strings.xml | 4 +- ultrasonic/src/main/res/values/arrays.xml | 10 -- ultrasonic/src/main/res/values/strings.xml | 5 +- ultrasonic/src/main/res/xml/settings.xml | 11 -- 26 files changed, 50 insertions(+), 264 deletions(-) delete mode 100644 ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java diff --git a/detekt-baseline.xml b/detekt-baseline.xml index e1cb4ed7..856dc92d 100644 --- a/detekt-baseline.xml +++ b/detekt-baseline.xml @@ -5,7 +5,6 @@ ComplexCondition:DownloadHandler.kt$DownloadHandler.<no name provided>$!append && !playNext && !unpin && !background ComplexCondition:FilePickerAdapter.kt$FilePickerAdapter$currentDirectory.absolutePath == "/" || currentDirectory.absolutePath == "/storage" || currentDirectory.absolutePath == "/storage/emulated" || currentDirectory.absolutePath == "/mnt" ComplexCondition:LocalMediaPlayer.kt$LocalMediaPlayer$Util.getGaplessPlaybackPreference() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && ( playerState === PlayerState.STARTED || playerState === PlayerState.PAUSED ) - ComplexCondition:SongView.kt$SongView$TextUtils.isEmpty(transcodedSuffix) || transcodedSuffix == suffix || song.isVideo && Util.getVideoPlayerType() !== VideoPlayerType.FLASH ComplexMethod:DownloadFile.kt$DownloadFile.DownloadTask$override fun execute() ComplexMethod:FilePickerAdapter.kt$FilePickerAdapter$private fun fileLister(currentDirectory: File) ComplexMethod:SongView.kt$SongView$fun setSong(song: MusicDirectory.Entry, checkable: Boolean, draggable: Boolean) diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java index 66da521d..5a6cfdd8 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java @@ -55,7 +55,6 @@ public class SettingsFragment extends PreferenceFragmentCompat private Preference addServerPreference; private ListPreference theme; - private ListPreference videoPlayer; private ListPreference maxBitrateWifi; private ListPreference maxBitrateMobile; private ListPreference cacheSize; @@ -110,7 +109,6 @@ public class SettingsFragment extends PreferenceFragmentCompat addServerPreference = findPreference(Constants.PREFERENCES_KEY_SERVERS_EDIT); theme = findPreference(Constants.PREFERENCES_KEY_THEME); - videoPlayer = findPreference(Constants.PREFERENCES_KEY_VIDEO_PLAYER); maxBitrateWifi = findPreference(Constants.PREFERENCES_KEY_MAX_BITRATE_WIFI); maxBitrateMobile = findPreference(Constants.PREFERENCES_KEY_MAX_BITRATE_MOBILE); cacheSize = findPreference(Constants.PREFERENCES_KEY_CACHE_SIZE); @@ -411,7 +409,6 @@ public class SettingsFragment extends PreferenceFragmentCompat private void update() { theme.setSummary(theme.getEntry()); - videoPlayer.setSummary(videoPlayer.getEntry()); maxBitrateWifi.setSummary(maxBitrateWifi.getEntry()); maxBitrateMobile.setSummary(maxBitrateMobile.getEntry()); cacheSize.setSummary(cacheSize.getEntry()); diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java index 14806a76..880564d8 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java @@ -117,7 +117,6 @@ public final class Constants public static final String PREFERENCES_KEY_CLEAR_PLAYLIST = "clearPlaylist"; public static final String PREFERENCES_KEY_CLEAR_BOOKMARK = "clearBookmark"; public static final String PREFERENCES_KEY_DISC_SORT = "discAndTrackSort"; - public static final String PREFERENCES_KEY_VIDEO_PLAYER = "videoPlayer"; public static final String PREFERENCES_KEY_SEND_BLUETOOTH_NOTIFICATIONS = "sendBluetoothNotifications"; public static final String PREFERENCES_KEY_SEND_BLUETOOTH_ALBUM_ART = "sendBluetoothAlbumArt"; public static final String PREFERENCES_KEY_VIEW_REFRESH = "viewRefresh"; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java index 82366ed6..e93d7cc4 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java @@ -21,8 +21,9 @@ package org.moire.ultrasonic.util; import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; -import android.content.*; -import android.content.pm.ApplicationInfo; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.res.Resources; import android.content.res.TypedArray; @@ -39,7 +40,6 @@ import android.os.Build; import android.os.Environment; import android.os.Parcelable; import android.util.DisplayMetrics; -import timber.log.Timber; import android.util.TypedValue; import android.view.Gravity; import android.view.View; @@ -51,19 +51,32 @@ import androidx.preference.PreferenceManager; import org.moire.ultrasonic.R; import org.moire.ultrasonic.app.UApp; import org.moire.ultrasonic.data.ActiveServerProvider; -import org.moire.ultrasonic.domain.*; +import org.moire.ultrasonic.domain.Bookmark; +import org.moire.ultrasonic.domain.MusicDirectory; import org.moire.ultrasonic.domain.MusicDirectory.Entry; +import org.moire.ultrasonic.domain.PlayerState; +import org.moire.ultrasonic.domain.RepeatMode; +import org.moire.ultrasonic.domain.SearchResult; import org.moire.ultrasonic.service.DownloadFile; import org.moire.ultrasonic.service.MediaPlayerService; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.Closeable; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.text.DecimalFormat; -import java.util.List; import java.util.Locale; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; +import timber.log.Timber; + /** * @author Sindre Mehus * @version $Id$ @@ -1148,36 +1161,6 @@ public class Util else return minutes > 0 ? String.format(Locale.getDefault(), "%d:%02d", minutes, seconds) : String.format(Locale.getDefault(), "0:%02d", seconds); } - public static VideoPlayerType getVideoPlayerType() - { - SharedPreferences preferences = getPreferences(); - return VideoPlayerType.forKey(preferences.getString(Constants.PREFERENCES_KEY_VIDEO_PLAYER, VideoPlayerType.MX.getKey())); - } - - public static boolean isPackageInstalled(Context context, String packageName) - { - PackageManager pm = context.getPackageManager(); - List packages = null; - - if (pm != null) - { - packages = pm.getInstalledApplications(0); - } - - if (packages != null) - { - for (ApplicationInfo packageInfo : packages) - { - if (packageInfo.packageName.equals(packageName)) - { - return true; - } - } - } - - return false; - } - public static String getVersionName(Context context) { String versionName = null; diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java deleted file mode 100644 index ff005e73..00000000 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/VideoPlayerType.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - This file is part of Subsonic. - - Subsonic is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Subsonic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Subsonic. If not, see . - - Copyright 2013 (C) Sindre Mehus - */ -package org.moire.ultrasonic.util; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.net.Uri; - -import org.moire.ultrasonic.R; -import org.moire.ultrasonic.domain.MusicDirectory; -import org.moire.ultrasonic.service.MusicServiceFactory; - -/** - * @author Sindre Mehus - * @version $Id: VideoPlayerType.java 3473 2013-05-23 16:42:49Z sindre_mehus $ - */ -public enum VideoPlayerType -{ - - MX("mx") - { - @Override - public void playVideo(final Context context, MusicDirectory.Entry entry) throws Exception - { - - // Check if MX Player is installed. - boolean installedAd = Util.isPackageInstalled(context, PACKAGE_NAME_MX_AD); - boolean installedPro = Util.isPackageInstalled(context, PACKAGE_NAME_MX_PRO); - - if (!installedAd && !installedPro) - { - new AlertDialog.Builder(context).setMessage(R.string.video_get_mx_player_text).setPositiveButton(R.string.video_get_mx_player_button, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int i) - { - try - { - context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format("market://details?id=%s", PACKAGE_NAME_MX_AD)))); - } - catch (android.content.ActivityNotFoundException x) - { - context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format("http://play.google.com/store/apps/details?id=%s", PACKAGE_NAME_MX_AD)))); - } - - dialog.dismiss(); - } - }).setNegativeButton(R.string.common_cancel, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int i) - { - dialog.dismiss(); - } - }).show(); - - } - else - { - // See documentation on https://sites.google.com/site/mxvpen/api - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setPackage(installedPro ? PACKAGE_NAME_MX_PRO : PACKAGE_NAME_MX_AD); - intent.putExtra("title", entry.getTitle()); - intent.setDataAndType(Uri.parse(MusicServiceFactory.getMusicService().getVideoUrl(entry.getId(), false)), "video/*"); - context.startActivity(intent); - } - } - }, - - FLASH("flash") - { - @Override - public void playVideo(Context context, MusicDirectory.Entry entry) throws Exception - { - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri.parse(MusicServiceFactory.getMusicService().getVideoUrl(entry.getId(), true))); - context.startActivity(intent); - } - }, - - DEFAULT("default") - { - @Override - public void playVideo(Context context, MusicDirectory.Entry entry) throws Exception - { - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setDataAndType(Uri.parse(MusicServiceFactory.getMusicService().getVideoUrl(entry.getId(), false)), "video/*"); - context.startActivity(intent); - } - }; - - private final String key; - - VideoPlayerType(String key) - { - this.key = key; - } - - public String getKey() - { - return key; - } - - public static VideoPlayerType forKey(String key) - { - for (VideoPlayerType type : VideoPlayerType.values()) - { - if (type.key.equals(key)) - { - return type; - } - } - return null; - } - - public abstract void playVideo(Context context, MusicDirectory.Entry entry) throws Exception; - - private static final String PACKAGE_NAME_MX_AD = "com.mxtech.videoplayer.ad"; - private static final String PACKAGE_NAME_MX_PRO = "com.mxtech.videoplayer.pro"; - -} diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt index 30e5ff10..6e329d39 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt @@ -264,8 +264,8 @@ class CachedMusicService(private val musicService: MusicService) : MusicService, } @Throws(Exception::class) - override fun getVideoUrl(id: String, useFlash: Boolean): String? { - return musicService.getVideoUrl(id, useFlash) + override fun getVideoUrl(id: String): String? { + return musicService.getVideoUrl(id) } @Throws(Exception::class) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt index b9e5f5f3..cce41209 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt @@ -123,7 +123,7 @@ interface MusicService { // TODO: Refactor and remove this call (see RestMusicService implementation) @Throws(Exception::class) - fun getVideoUrl(id: String, useFlash: Boolean): String? + fun getVideoUrl(id: String): String? @Throws(Exception::class) fun updateJukeboxPlaylist(ids: List?): JukeboxStatus diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt index a4ad2ca9..f8519561 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt @@ -396,7 +396,7 @@ class OfflineMusicService : MusicService, KoinComponent { } @Throws(OfflineException::class) - override fun getVideoUrl(id: String, useFlash: Boolean): String? { + override fun getVideoUrl(id: String): String? { throw OfflineException("getVideoUrl isn't available in offline mode") } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt index 684dc84b..6d3a531c 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt @@ -481,8 +481,7 @@ open class RESTMusicService( @Throws(Exception::class) override fun getVideoUrl( - id: String, - useFlash: Boolean + id: String ): String { // TODO This method should not exists as video should be loaded using stream method // Previous method implementation uses assumption that video will be available diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/VideoPlayer.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/VideoPlayer.kt index fb03a627..152aa89a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/VideoPlayer.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/VideoPlayer.kt @@ -1,22 +1,30 @@ package org.moire.ultrasonic.subsonic import android.content.Context +import android.content.Intent +import android.net.Uri import org.moire.ultrasonic.R import org.moire.ultrasonic.domain.MusicDirectory +import org.moire.ultrasonic.service.MusicServiceFactory import org.moire.ultrasonic.util.Util /** * This utility class helps starting video playback */ -class VideoPlayer() { +class VideoPlayer { fun playVideo(context: Context, entry: MusicDirectory.Entry?) { - if (!Util.isNetworkConnected()) { + if (!Util.isNetworkConnected() || entry == null) { Util.toast(context, R.string.select_album_no_network) return } - val player = Util.getVideoPlayerType() try { - player.playVideo(context, entry) + val intent = Intent(Intent.ACTION_VIEW) + val url = MusicServiceFactory.getMusicService().getVideoUrl(entry.id) + intent.setDataAndType( + Uri.parse(url), + "video/*" + ) + context.startActivity(intent) } catch (e: Exception) { Util.toast(context, e.toString(), false) } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/SongView.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/SongView.kt index 3a4638c7..54fcf3a1 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/SongView.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/SongView.kt @@ -36,7 +36,6 @@ import org.moire.ultrasonic.service.DownloadFile import org.moire.ultrasonic.service.MediaPlayerController import org.moire.ultrasonic.service.MusicServiceFactory.getMusicService import org.moire.ultrasonic.util.Util -import org.moire.ultrasonic.util.VideoPlayerType import org.moire.ultrasonic.view.EntryAdapter.SongViewHolder import timber.log.Timber @@ -111,8 +110,7 @@ class SongView(context: Context) : UpdateView(context), Checkable, KoinComponent val transcodedSuffix = song.transcodedSuffix fileFormat = if ( - TextUtils.isEmpty(transcodedSuffix) || transcodedSuffix == suffix || - song.isVideo && Util.getVideoPlayerType() !== VideoPlayerType.FLASH + TextUtils.isEmpty(transcodedSuffix) || transcodedSuffix == suffix || song.isVideo ) suffix else String.format("%s > %s", suffix, transcodedSuffix) val artistName = song.artist diff --git a/ultrasonic/src/main/res/values-cs/strings.xml b/ultrasonic/src/main/res/values-cs/strings.xml index 55ba92ac..12d0b6ae 100644 --- a/ultrasonic/src/main/res/values-cs/strings.xml +++ b/ultrasonic/src/main/res/values-cs/strings.xml @@ -311,7 +311,7 @@ Očekává jména hlavních adresářů obsahující jména umělců Procházet za použití ID3 tagů Používat metodu ID3 tagů místo jmen na základě adresářové struktury - Video + Video Videopřehrávač Obnovení náhledu .5 sekundy @@ -371,9 +371,6 @@ Výchozí pozdrav sdílení Mrkni na hudbu sdílenou z %s Sdílet skladby přes - MX Player - Výchozí - Flash Sdílení Všechny skladby od %s Zobrazit všechny skladby umělce diff --git a/ultrasonic/src/main/res/values-de/strings.xml b/ultrasonic/src/main/res/values-de/strings.xml index aab075fe..1e522845 100644 --- a/ultrasonic/src/main/res/values-de/strings.xml +++ b/ultrasonic/src/main/res/values-de/strings.xml @@ -308,7 +308,7 @@ Annehmen, dass der Ordner der obersten Ebene der Name des Albumkünstlers ist Durchsuchen von ID3-Tags Nutze ID3 Tag Methode anstatt Dateisystem-Methode - Film + Film Filmwiedergabe Aktualisierungsinterval .5 Sekunden @@ -368,9 +368,6 @@ Standard Begrüßung beim Teilen Hör dir mal die Musik an, die ich mit dir über %s geteilt habe. Titel teilen über - MX Player - Standard - Flash Freigabe Alle Titel von %s Alle Titel nach Künstler sortieren diff --git a/ultrasonic/src/main/res/values-es/strings.xml b/ultrasonic/src/main/res/values-es/strings.xml index 35192166..3d3fcc1a 100644 --- a/ultrasonic/src/main/res/values-es/strings.xml +++ b/ultrasonic/src/main/res/values-es/strings.xml @@ -325,7 +325,7 @@ Usar el método de etiquetas ID3 en lugar del método basado en el sistema de ficheros Mostrar la imagen del artista en la lista de artistas Muestra la imagen del artista en la lista de artistas si está disponible - Vídeo + Vídeo Reproductor de vídeo Refresco de la vista .5 segundos @@ -385,9 +385,6 @@ Saludo predeterminado para los compartidos Echa un vistazo a esta música que te comparto desde %s Compartir canciones vía - MX Player - Por defecto - Flash Compartir Todas las canciones por %s Mostrar todas las canciones por artista diff --git a/ultrasonic/src/main/res/values-fr/strings.xml b/ultrasonic/src/main/res/values-fr/strings.xml index 5bc3b7b7..ba9fdc91 100644 --- a/ultrasonic/src/main/res/values-fr/strings.xml +++ b/ultrasonic/src/main/res/values-fr/strings.xml @@ -313,7 +313,7 @@ Utiliser ID3 Tags à la place du système de fichier basique Afficher l’image de l’artiste dans la liste Affiche l’image de l’artiste dans la liste des artistes si celle-ci est disponible - Vidéo + Vidéo Lecteur vidéo Actualisation de la vue 0,5 secondes @@ -373,9 +373,6 @@ Texte par défaut lors d\'un partage Regardez cette musique que j\'ai partagée depuis %s Partager des titres via - MX Player - Défaut - Flash Partager Tous les titres de %s Voir tous les titres par artiste diff --git a/ultrasonic/src/main/res/values-hu/strings.xml b/ultrasonic/src/main/res/values-hu/strings.xml index 5476f2c3..4493ba59 100644 --- a/ultrasonic/src/main/res/values-hu/strings.xml +++ b/ultrasonic/src/main/res/values-hu/strings.xml @@ -325,7 +325,7 @@ ID3 Tag módszer használata a fájlredszer alapú mód helyett. Előadó képének megjelenítése Az előadó listában megjeleníti a képeket, amennyiben elérhetőek - Videó + Videó Videólejátszó Nézet frissítési gyakorisága .5 másodperc @@ -385,9 +385,6 @@ Alapértelmezett megosztási üzenet Hallgasd meg ezt a zenét, megosztottam innen: %s Dalok megosztása ezzel - MX Player - Alapértelmezett - Flash Megosztás %s minden dala Az előadó összes dalának megjelenítése diff --git a/ultrasonic/src/main/res/values-it/strings.xml b/ultrasonic/src/main/res/values-it/strings.xml index f7031d63..c2820f9b 100644 --- a/ultrasonic/src/main/res/values-it/strings.xml +++ b/ultrasonic/src/main/res/values-it/strings.xml @@ -299,7 +299,7 @@ Presumi che la cartella superiore sia il nome dell\'artista dell\'album Sfoglia Utilizzando Tag ID3 Usa metodi tag ID3 invece dei metodi basati sul filesystem - Video + Video Riproduttore video .5 secondo 1 secondo @@ -336,8 +336,6 @@ Commenta \"%s\" è stato rimosso dalla playlist Condividi canzoni via - MX Player - Predefinito 1 canzone %d canzoni diff --git a/ultrasonic/src/main/res/values-nl/strings.xml b/ultrasonic/src/main/res/values-nl/strings.xml index 9cd9fd00..337185ee 100644 --- a/ultrasonic/src/main/res/values-nl/strings.xml +++ b/ultrasonic/src/main/res/values-nl/strings.xml @@ -325,7 +325,7 @@ ID3-labels gebruiken in plaats van systeemlabels Artiestfoto tonen op artiestenlijst Toont de artiestfoto op de artiestenlijst (indien beschikbaar) - Video + Video Videospeler Verversen 0,5 seconden @@ -385,9 +385,6 @@ Standaard deelbericht Hé, luister eens naar de muziek die ik heb gedeeld via %s Nummers delen via - MX Player - Standaard - Flash Delen Alle nummers van %s Alle nummers van artiest tonen diff --git a/ultrasonic/src/main/res/values-pl/strings.xml b/ultrasonic/src/main/res/values-pl/strings.xml index 4f7b15d1..4e84645d 100644 --- a/ultrasonic/src/main/res/values-pl/strings.xml +++ b/ultrasonic/src/main/res/values-pl/strings.xml @@ -308,7 +308,7 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników Zakłada, że folder najwyższego poziomu jest nazwą artysty albumu Przeglądaj używając tagów ID3 Używa metod z tagów ID3 zamiast metod opartych na systemie plików - Wideo + Wideo Odtwarzacz wideo Odświeżanie widoku co pół sekundy @@ -368,9 +368,6 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników Domyślny tekst podczas udostępniania Sprawdź muzykę, którą udostępniam na %s Udostępnij utwory za pomocą - MX Player - Domyślny - Flash Udostępnianie Wszystkie utwory %s Wyświetlaj wszystkie utwory artysty diff --git a/ultrasonic/src/main/res/values-pt-rBR/strings.xml b/ultrasonic/src/main/res/values-pt-rBR/strings.xml index 903d7b6a..4127bfdd 100644 --- a/ultrasonic/src/main/res/values-pt-rBR/strings.xml +++ b/ultrasonic/src/main/res/values-pt-rBR/strings.xml @@ -313,7 +313,7 @@ Usar as etiquetas ID3 ao invés do sistema de arquivos Mostrar Foto do Artista na Lista Mostrar a imagem do artista na lista de artistas, se disponível - Vídeo + Vídeo Player de Vídeo Atualização da Tela .5 segundos @@ -373,9 +373,6 @@ Saudação Padrão do Compartilhamento Confira esta música que compartilhei do %s Compartilhar músicas via - MX Player - Padrão - Flash Compartilhar Todas as Músicas de %s Mostrar Todas as Músicas por Artista diff --git a/ultrasonic/src/main/res/values-pt/strings.xml b/ultrasonic/src/main/res/values-pt/strings.xml index 8fb5bb12..9525264a 100644 --- a/ultrasonic/src/main/res/values-pt/strings.xml +++ b/ultrasonic/src/main/res/values-pt/strings.xml @@ -308,7 +308,7 @@ Assumir que a pasta mais acima é o nome do artista Navegar Usando Etiquetas ID3 Usa as etiquetas ID3 ao invés do sistema de ficheiros - Vídeo + Vídeo Player de Vídeo Atualização do Ecrã .5 segundos @@ -368,9 +368,6 @@ Saudação Padrão Confira esta música que compartilhei do %s Compartilhar músicas via - MX Player - Padrão - Flash Compartilhar Todas as Músicas de %s Todas as Músicas do Artista diff --git a/ultrasonic/src/main/res/values-ru/strings.xml b/ultrasonic/src/main/res/values-ru/strings.xml index 0897075f..a1a8edbc 100644 --- a/ultrasonic/src/main/res/values-ru/strings.xml +++ b/ultrasonic/src/main/res/values-ru/strings.xml @@ -300,7 +300,7 @@ Предположим, папка верхнего уровня - это имя исполнителя альбома Обзор с использованием тегов ID3 Используйте методы тегов ID3 ​​вместо методов на основе файловой системы - Видео + Видео Видеоплеер Посмотреть Обновить .5 секунд @@ -360,9 +360,6 @@ Поделиться приветствием по умолчанию Проверьте эту музыку, с которой я поделился %s Поделиться треками через - MX Player - По умолчанию - Flash Поделиться Все треки %s Показать все треки исполнителя diff --git a/ultrasonic/src/main/res/values-zh-rCN/strings.xml b/ultrasonic/src/main/res/values-zh-rCN/strings.xml index 60067c12..42b39e4d 100644 --- a/ultrasonic/src/main/res/values-zh-rCN/strings.xml +++ b/ultrasonic/src/main/res/values-zh-rCN/strings.xml @@ -224,7 +224,7 @@ 连接正常， 服务器未授权。 主题 允许自签名 HTTPS 证书 - 视频 + 视频 视频播放器 刷新视图 .5 秒 @@ -261,8 +261,6 @@ 评论 %s已从播放列表中移除 分享播放列表 - MX Player - 默认 分享 已禁用 删除文件 diff --git a/ultrasonic/src/main/res/values/arrays.xml b/ultrasonic/src/main/res/values/arrays.xml index d18959e9..22b3cdff 100644 --- a/ultrasonic/src/main/res/values/arrays.xml +++ b/ultrasonic/src/main/res/values/arrays.xml @@ -224,16 +224,6 @@ @string/settings.search_250 @string/settings.search_500 - - mx - default - flash - - - @string/settings.video_mx_player - @string/settings.video_default - @string/settings.video_flash - @string/settings.view_refresh_500 @string/settings.view_refresh_1000 diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml index 62556828..07d54971 100644 --- a/ultrasonic/src/main/res/values/strings.xml +++ b/ultrasonic/src/main/res/values/strings.xml @@ -327,7 +327,7 @@ Use ID3 tag methods instead of file system based methods Show artist picture in artist list Displays the artist picture in the artist list if available - Video + Video Video player View Refresh .5 seconds @@ -387,9 +387,6 @@ Default Share Greeting Check out this music I shared from %s Share songs via - MX Player - Default - Flash Share All Songs by %s Show All Songs By Artist diff --git a/ultrasonic/src/main/res/xml/settings.xml b/ultrasonic/src/main/res/xml/settings.xml index ce724706..c1da757a 100644 --- a/ultrasonic/src/main/res/xml/settings.xml +++ b/ultrasonic/src/main/res/xml/settings.xml @@ -180,17 +180,6 @@ a:title="@string/settings.send_bluetooth_album_art" app:iconSpaceReserved="false"/> - - - From a43a525babcf4d53af1fa2d54721d767db00935c Mon Sep 17 00:00:00 2001 From: tzugen Date: Sat, 12 Jun 2021 15:11:32 +0200 Subject: [PATCH 2/5] Remove two unrelated, but unused files. --- .../GetPodcastEpisodesTestReaderProvider.java | 85 ------------------- .../service/GetPodcastTestReaderProvider.java | 41 --------- 2 files changed, 126 deletions(-) delete mode 100644 ultrasonic/src/main/java/org/moire/ultrasonic/Test/service/GetPodcastEpisodesTestReaderProvider.java delete mode 100644 ultrasonic/src/main/java/org/moire/ultrasonic/Test/service/GetPodcastTestReaderProvider.java diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/Test/service/GetPodcastEpisodesTestReaderProvider.java b/ultrasonic/src/main/java/org/moire/ultrasonic/Test/service/GetPodcastEpisodesTestReaderProvider.java deleted file mode 100644 index 538ad595..00000000 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/Test/service/GetPodcastEpisodesTestReaderProvider.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.moire.ultrasonic.Test.service; - -import java.io.Reader; -import java.io.StringReader; - -/** - * Created by rcocula on 11/03/2016. - */ -public class GetPodcastEpisodesTestReaderProvider { - - private static String data = "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "\n"; - - - public static Reader getReader() { - - return new StringReader(data); - } -} diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/Test/service/GetPodcastTestReaderProvider.java b/ultrasonic/src/main/java/org/moire/ultrasonic/Test/service/GetPodcastTestReaderProvider.java deleted file mode 100644 index 91d3f62d..00000000 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/Test/service/GetPodcastTestReaderProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.moire.ultrasonic.Test.service; - -import java.io.Reader; -import java.io.StringReader; - -/** - * Created by rcocula on 11/03/2016. - */ -public class GetPodcastTestReaderProvider { - - private static String data = "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "\n"; - - - public static Reader getReader() { - - return new StringReader(data); - } -} From f7dfdcadad13df0ca5c5f8348ee5c388bdd3ca41 Mon Sep 17 00:00:00 2001 From: tzugen Date: Sat, 12 Jun 2021 19:48:36 +0200 Subject: [PATCH 3/5] Remove unused strings --- ultrasonic/src/main/res/values-cs/strings.xml | 3 --- ultrasonic/src/main/res/values-de/strings.xml | 3 --- ultrasonic/src/main/res/values-es/strings.xml | 3 --- ultrasonic/src/main/res/values-fr/strings.xml | 3 --- ultrasonic/src/main/res/values-hu/strings.xml | 3 --- ultrasonic/src/main/res/values-it/strings.xml | 3 --- ultrasonic/src/main/res/values-nl/strings.xml | 3 --- ultrasonic/src/main/res/values-pl/strings.xml | 3 --- ultrasonic/src/main/res/values-pt-rBR/strings.xml | 3 --- ultrasonic/src/main/res/values-pt/strings.xml | 3 --- ultrasonic/src/main/res/values-ru/strings.xml | 3 --- ultrasonic/src/main/res/values-zh-rCN/strings.xml | 1 - ultrasonic/src/main/res/values/strings.xml | 7 ++----- 13 files changed, 2 insertions(+), 39 deletions(-) diff --git a/ultrasonic/src/main/res/values-cs/strings.xml b/ultrasonic/src/main/res/values-cs/strings.xml index 12d0b6ae..c01d1597 100644 --- a/ultrasonic/src/main/res/values-cs/strings.xml +++ b/ultrasonic/src/main/res/values-cs/strings.xml @@ -312,7 +312,6 @@ Procházet za použití ID3 tagů Používat metodu ID3 tagů místo jmen na základě adresářové struktury Video - Videopřehrávač Obnovení náhledu .5 sekundy 1 sekunda @@ -334,8 +333,6 @@ 0.00 MB -:-- 0:00 - MX Player není nainstalován. Nainstalujte z Obchodu Play nebo změňte nastavení videí. - Stáhnout MX Player Ťuknutím vybrat hudbu SD karta nedostupná Chybí SD karta diff --git a/ultrasonic/src/main/res/values-de/strings.xml b/ultrasonic/src/main/res/values-de/strings.xml index 1e522845..055683f8 100644 --- a/ultrasonic/src/main/res/values-de/strings.xml +++ b/ultrasonic/src/main/res/values-de/strings.xml @@ -309,7 +309,6 @@ Durchsuchen von ID3-Tags Nutze ID3 Tag Methode anstatt Dateisystem-Methode Film - Filmwiedergabe Aktualisierungsinterval .5 Sekunden 1 Sekunde @@ -331,8 +330,6 @@ 0.00 MB -:-- 0:00 - MX Player ist nicht installiert. Holen Sie ihn sich kostenlos im Play Store, oder ändern Sie die Filmeinstellungen. - MX Player holen Berühren, um Musik auszuwählen SD Karte nicht verfügbar Keine SD Karte diff --git a/ultrasonic/src/main/res/values-es/strings.xml b/ultrasonic/src/main/res/values-es/strings.xml index 3d3fcc1a..f0c8dc81 100644 --- a/ultrasonic/src/main/res/values-es/strings.xml +++ b/ultrasonic/src/main/res/values-es/strings.xml @@ -326,7 +326,6 @@ Mostrar la imagen del artista en la lista de artistas Muestra la imagen del artista en la lista de artistas si está disponible Vídeo - Reproductor de vídeo Refresco de la vista .5 segundos 1 segundo @@ -348,8 +347,6 @@ 0.00 MB -:-- 0:00 - El MX Player no esta instalado. Descárgalo grátis de la Play Store, o cambia la configuración de vídeo. - Obtener MX Player Toca para seleccionar música Tarjeta SD no disponible No hay tarjeta SD diff --git a/ultrasonic/src/main/res/values-fr/strings.xml b/ultrasonic/src/main/res/values-fr/strings.xml index ba9fdc91..4c23cd30 100644 --- a/ultrasonic/src/main/res/values-fr/strings.xml +++ b/ultrasonic/src/main/res/values-fr/strings.xml @@ -314,7 +314,6 @@ Afficher l’image de l’artiste dans la liste Affiche l’image de l’artiste dans la liste des artistes si celle-ci est disponible Vidéo - Lecteur vidéo Actualisation de la vue 0,5 secondes 1 seconde @@ -336,8 +335,6 @@ 0.00 Mo —:—— 0:00 - MX Player n\'est pas installé. Récupérez le gratuitement sur Play Store, ou modifier les paramètres vidéo. - Obtenez MX Player Touchez pour sélectionner un titre Carte SD non disponible Aucune carte SD diff --git a/ultrasonic/src/main/res/values-hu/strings.xml b/ultrasonic/src/main/res/values-hu/strings.xml index 4493ba59..20bdd2d8 100644 --- a/ultrasonic/src/main/res/values-hu/strings.xml +++ b/ultrasonic/src/main/res/values-hu/strings.xml @@ -326,7 +326,6 @@ Előadó képének megjelenítése Az előadó listában megjeleníti a képeket, amennyiben elérhetőek Videó - Videólejátszó Nézet frissítési gyakorisága .5 másodperc 1 másodperc @@ -348,8 +347,6 @@ 0.00 MB -:-- 0:00 - Az MX Player nincs telepítve. Töltse le díjmentesen a Play Áruházból, vagy módosítsa a videó beállításait! - MX Player letöltése Érintse meg a zene kiválasztásához Az SD kártya nem elérhető! Nincs SD kártya! diff --git a/ultrasonic/src/main/res/values-it/strings.xml b/ultrasonic/src/main/res/values-it/strings.xml index c2820f9b..81e41ca5 100644 --- a/ultrasonic/src/main/res/values-it/strings.xml +++ b/ultrasonic/src/main/res/values-it/strings.xml @@ -300,7 +300,6 @@ Sfoglia Utilizzando Tag ID3 Usa metodi tag ID3 invece dei metodi basati sul filesystem Video - Riproduttore video .5 secondo 1 secondo 1.5 secondi @@ -319,8 +318,6 @@ 0.00 MB -:-- 0:00 - MX Player non è installato. Scaricalo gratuitamente dal Play Store, o cambia le impostazioni video. - Ottieni MX Player Tocca per selezionare musica Scheda SD non disponibile Nessuna scheda SD diff --git a/ultrasonic/src/main/res/values-nl/strings.xml b/ultrasonic/src/main/res/values-nl/strings.xml index 337185ee..ae73cbbc 100644 --- a/ultrasonic/src/main/res/values-nl/strings.xml +++ b/ultrasonic/src/main/res/values-nl/strings.xml @@ -326,7 +326,6 @@ Artiestfoto tonen op artiestenlijst Toont de artiestfoto op de artiestenlijst (indien beschikbaar) Video - Videospeler Verversen 0,5 seconden 1 seconde @@ -348,8 +347,6 @@ 0,00 MB -:-- 0:00 - MX Player is niet geïnstalleerd. Installeer deze gratis via de Play Store of wijzig de video-instellingen. - MX Player installeren Druk om muziek te selecteren SD-kaart niet beschikbaar Geen SD-kaart diff --git a/ultrasonic/src/main/res/values-pl/strings.xml b/ultrasonic/src/main/res/values-pl/strings.xml index 4e84645d..f2019e33 100644 --- a/ultrasonic/src/main/res/values-pl/strings.xml +++ b/ultrasonic/src/main/res/values-pl/strings.xml @@ -309,7 +309,6 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników Przeglądaj używając tagów ID3 Używa metod z tagów ID3 zamiast metod opartych na systemie plików Wideo - Odtwarzacz wideo Odświeżanie widoku co pół sekundy co 1 sekundę @@ -331,8 +330,6 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników 0.00 MB -:-- 0:00 - MX Player nie jest zainstalowany, Pobierz go za darmo w Sklepie Play, lub zmień ustawiena wideo. - Pobierz MX Player Dotknij, aby wybrać muzykę Karta SD jest niedostępna Brak karty SD diff --git a/ultrasonic/src/main/res/values-pt-rBR/strings.xml b/ultrasonic/src/main/res/values-pt-rBR/strings.xml index 4127bfdd..062afd45 100644 --- a/ultrasonic/src/main/res/values-pt-rBR/strings.xml +++ b/ultrasonic/src/main/res/values-pt-rBR/strings.xml @@ -314,7 +314,6 @@ Mostrar Foto do Artista na Lista Mostrar a imagem do artista na lista de artistas, se disponível Vídeo - Player de Vídeo Atualização da Tela .5 segundos 1 segundo @@ -336,8 +335,6 @@ 0.00 MB -:-- 0:00 - O MX Player não está instalado. Baixe da graça pela Play Store ou modifique as configurações de vídeo. - Baixar MX Player Toque para selecionar a música Cartão SD indisponível Sem cartão SD diff --git a/ultrasonic/src/main/res/values-pt/strings.xml b/ultrasonic/src/main/res/values-pt/strings.xml index 9525264a..0fc87d74 100644 --- a/ultrasonic/src/main/res/values-pt/strings.xml +++ b/ultrasonic/src/main/res/values-pt/strings.xml @@ -309,7 +309,6 @@ Navegar Usando Etiquetas ID3 Usa as etiquetas ID3 ao invés do sistema de ficheiros Vídeo - Player de Vídeo Atualização do Ecrã .5 segundos 1 segundo @@ -331,8 +330,6 @@ 0.00 MB —:—— 0:00 - O MX Player não está instalado. Descarregue da graça pela Play Store ou modifique as configurações de vídeo. - Descarregar MX Player Toque para selecionar a música Cartão SD indisponível Sem cartão SD diff --git a/ultrasonic/src/main/res/values-ru/strings.xml b/ultrasonic/src/main/res/values-ru/strings.xml index a1a8edbc..a5e9962c 100644 --- a/ultrasonic/src/main/res/values-ru/strings.xml +++ b/ultrasonic/src/main/res/values-ru/strings.xml @@ -301,7 +301,6 @@ Обзор с использованием тегов ID3 Используйте методы тегов ID3 ​​вместо методов на основе файловой системы Видео - Видеоплеер Посмотреть Обновить .5 секунд 1 секунда @@ -323,8 +322,6 @@ 0.00 MB -:-- 0:00 - MX Player не установлен. Получите его бесплатно в магазине Play Store или измените настройки видео. - Получить MX Player Нажмите, чтобы выбрать музыку SD-карта недоступна Нет SD-карты diff --git a/ultrasonic/src/main/res/values-zh-rCN/strings.xml b/ultrasonic/src/main/res/values-zh-rCN/strings.xml index 42b39e4d..2cc97a7a 100644 --- a/ultrasonic/src/main/res/values-zh-rCN/strings.xml +++ b/ultrasonic/src/main/res/values-zh-rCN/strings.xml @@ -225,7 +225,6 @@ 主题 允许自签名 HTTPS 证书 视频 - 视频播放器 刷新视图 .5 秒 1 秒 diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml index 07d54971..298d7200 100644 --- a/ultrasonic/src/main/res/values/strings.xml +++ b/ultrasonic/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - + Loading… A network error occurred. Please check the server address or try again later. @@ -327,8 +327,7 @@ Use ID3 tag methods instead of file system based methods Show artist picture in artist list Displays the artist picture in the artist list if available - Video - Video player + Video View Refresh .5 seconds 1 second @@ -350,8 +349,6 @@ 0.00 MB -:-- 0:00 - MX Player is not installed. Get it for free on Play Store, or change video settings. - Get MX Player Touch to select music SD card unavailable No SD card From 58200660d3748475eb836b8303b6157c7508faad Mon Sep 17 00:00:00 2001 From: tzugen Date: Sat, 12 Jun 2021 19:56:22 +0200 Subject: [PATCH 4/5] Also delete unused strings related to licensing stuff --- ultrasonic/src/main/res/values-cs/strings.xml | 5 ----- ultrasonic/src/main/res/values-de/strings.xml | 5 ----- ultrasonic/src/main/res/values-es/strings.xml | 5 ----- ultrasonic/src/main/res/values-fr/strings.xml | 5 ----- ultrasonic/src/main/res/values-hu/strings.xml | 5 ----- ultrasonic/src/main/res/values-it/strings.xml | 5 ----- ultrasonic/src/main/res/values-nl/strings.xml | 5 ----- ultrasonic/src/main/res/values-pl/strings.xml | 5 ----- ultrasonic/src/main/res/values-pt-rBR/strings.xml | 5 ----- ultrasonic/src/main/res/values-pt/strings.xml | 5 ----- ultrasonic/src/main/res/values-ru/strings.xml | 5 ----- ultrasonic/src/main/res/values-zh-rCN/strings.xml | 4 ---- ultrasonic/src/main/res/values/strings.xml | 5 ----- 13 files changed, 64 deletions(-) diff --git a/ultrasonic/src/main/res/values-cs/strings.xml b/ultrasonic/src/main/res/values-cs/strings.xml index c01d1597..58944209 100644 --- a/ultrasonic/src/main/res/values-cs/strings.xml +++ b/ultrasonic/src/main/res/values-cs/strings.xml @@ -130,16 +130,11 @@ Kliknout pro vyhledání Skladby Hledat - Zkušební doba vypršela - Pozdějí - Získejte neomezená stahování přispěním na Subsonic. - Hned Média nenalezena %d skladeb označeno. %d skladeb odznačeno. Varování: Připojení nedostupné. Chyba: SD karta nedostupná. - Server bez licence. Zbývá %d dní zkušební doby. Přehrát vše Všechny adresáře Vybrat adresář diff --git a/ultrasonic/src/main/res/values-de/strings.xml b/ultrasonic/src/main/res/values-de/strings.xml index 055683f8..08208b9f 100644 --- a/ultrasonic/src/main/res/values-de/strings.xml +++ b/ultrasonic/src/main/res/values-de/strings.xml @@ -129,16 +129,11 @@ Neue Suche Titel Suche - Testperiode zu Ende - Später - Unbegresnze Downloads bei Spende an Sunsonic - Jetzt Keine Medien gefunden %d Titel ausgewählt. %d Titel abgewählt. Warnung: kein Netz. Fehler: Keine SD Karte verfügbar. - Server nicht lizenziert. Noch %d Testtage Alles wiedergeben Alle Ordner Ordner wählen diff --git a/ultrasonic/src/main/res/values-es/strings.xml b/ultrasonic/src/main/res/values-es/strings.xml index f0c8dc81..9b494b2b 100644 --- a/ultrasonic/src/main/res/values-es/strings.xml +++ b/ultrasonic/src/main/res/values-es/strings.xml @@ -140,16 +140,11 @@ Haz click para buscar Canciones Buscar - El periodo de prueba ha finalizado - Mas tarde - Consigue descargas ilimitadas donando a Subsonic. - Ahora No se han encontrado medios %d pista(s) seleccionada(s). %d pista(s) deseleccionada(s). Atención: No hay red disponible. Error: No hay tarjeta SD disponible. - Servidor sin licencia. Quedan %d dia(s) de prueba. Reproducir todo Todas las carpetas Seleccionar la carpeta diff --git a/ultrasonic/src/main/res/values-fr/strings.xml b/ultrasonic/src/main/res/values-fr/strings.xml index 4c23cd30..ad640ff7 100644 --- a/ultrasonic/src/main/res/values-fr/strings.xml +++ b/ultrasonic/src/main/res/values-fr/strings.xml @@ -130,16 +130,11 @@ Cliquer pour rechercher Titres Recherche - La période d\'essai est terminée - Plus tard - Obtenez des téléchargements illimités en faisant un don pour Subsonic. - Maintenant Aucun titre trouvé %d pistes sélectionnées. %d pistes non sélectionnés. Avertissement : Aucun réseau disponible. Erreur : Aucune carte SD disponible. - Serveur sans licence. %d jours d\'essai restants. Tout jouer Tous les dossiers Sélectionner le dossier diff --git a/ultrasonic/src/main/res/values-hu/strings.xml b/ultrasonic/src/main/res/values-hu/strings.xml index 20bdd2d8..ffdf144a 100644 --- a/ultrasonic/src/main/res/values-hu/strings.xml +++ b/ultrasonic/src/main/res/values-hu/strings.xml @@ -140,16 +140,11 @@ Érintse meg a kereséshez Dalok Keresés - A próbaidőszak lejárt! - Később - Korlátlan letöltéshez juthat a Subsonic támogatásával. - Most Nem található média! %d dal kijelölve. %d dal visszavonva. Figyelem: Hálózat nem áll rendelkezésre! Hiba: SD kártya nem áll rendelkezésre! - A kiszolgálónak nincs licence! %d próba nap van hátra! Összes lejátszása Összes mappa Mappa kiválasztása diff --git a/ultrasonic/src/main/res/values-it/strings.xml b/ultrasonic/src/main/res/values-it/strings.xml index 81e41ca5..2a92a780 100644 --- a/ultrasonic/src/main/res/values-it/strings.xml +++ b/ultrasonic/src/main/res/values-it/strings.xml @@ -125,16 +125,11 @@ Selezione per cercare Canzoni Cerca - Periodo di prova terminato - Dopo - Ottieni download illimitato con una donazione a Subsonic. - Ora Nessun media trovato %dtracce selezionate. %d tracce non selezionate. Attenzione: nessuna rete disponibile. Errore: Nessuna memoria SD disponibile. - Nessuna licenza presente. %d giorni di prova rimanenti. Riproduci tutto Tutte le cartelle Seleziona cartella diff --git a/ultrasonic/src/main/res/values-nl/strings.xml b/ultrasonic/src/main/res/values-nl/strings.xml index ae73cbbc..445bfaf4 100644 --- a/ultrasonic/src/main/res/values-nl/strings.xml +++ b/ultrasonic/src/main/res/values-nl/strings.xml @@ -140,16 +140,11 @@ Druk om te zoeken Nummers Zoeken - Proefperiode is afgelopen - Later - Verkrijg ongelimiteerde downloads door te doneren aan Subsonic. - Nu Geen media gevonden %d nummers geselecteerd. %d nummers gedeselecteerd. Waarschuwing: geen internetverbinding. Fout: geen SD-kaart beschikbaar. - Geen serverlicentie; nog %d dagen resterend van de proefperiode. Alles afspelen Alle mappen Map kiezen diff --git a/ultrasonic/src/main/res/values-pl/strings.xml b/ultrasonic/src/main/res/values-pl/strings.xml index f2019e33..d127a8aa 100644 --- a/ultrasonic/src/main/res/values-pl/strings.xml +++ b/ultrasonic/src/main/res/values-pl/strings.xml @@ -128,16 +128,11 @@ Kliknij, aby wyszukać Utwory Wyszukiwanie - Okres próbny zakończył się - Później - Uzyskaj możliwość nieograniczonych pobrań przekazując darowiznę na rzecz Subsonic. - Teraz Brak mediów Zaznaczono %d utworów. Odznaczono %d utworów. Uwaga: sieć niedostępna. Błąd: Niedostępna karta SD. - Serwer bez licencji. Pozostało %d dni próbnych. Odtwórz wszystkie Wszystkie foldery Wybierz folder diff --git a/ultrasonic/src/main/res/values-pt-rBR/strings.xml b/ultrasonic/src/main/res/values-pt-rBR/strings.xml index 062afd45..b9683c7a 100644 --- a/ultrasonic/src/main/res/values-pt-rBR/strings.xml +++ b/ultrasonic/src/main/res/values-pt-rBR/strings.xml @@ -130,16 +130,11 @@ Clique para pesquisar Músicas Pesquisar - O período de teste acabou - Mais tarde - Obtenha downloads ilimitados fazendo uma doação ao Subsonic. - Agora Nenhuma mídia encontrada %d faixas selecionadas. %d faixas desselecionadas. Aviso: Nenhuma rede disponível. Erro: Nenhum cartão SD disponível. - Servidor não licenciado. Restam %d dias de teste. Tocar Tudo Todas as Pastas Selecionar Pasta diff --git a/ultrasonic/src/main/res/values-pt/strings.xml b/ultrasonic/src/main/res/values-pt/strings.xml index 0fc87d74..2687127d 100644 --- a/ultrasonic/src/main/res/values-pt/strings.xml +++ b/ultrasonic/src/main/res/values-pt/strings.xml @@ -128,16 +128,11 @@ Clique para pesquisar Músicas Pesquisar - O período de teste acabou - Mais tarde - Obtenha downloads ilimitados fazendo uma doação ao Subsonic. - Agora Nenhuma mídia encontrada %d faixas selecionadas. %d faixas desselecionadas. Aviso: Nenhuma rede disponível. Erro: Nenhum cartão SD disponível. - Servidor não licenciado. Restam %d dias de teste. Tocar Tudo Todas as Pastas Selecionar Pasta diff --git a/ultrasonic/src/main/res/values-ru/strings.xml b/ultrasonic/src/main/res/values-ru/strings.xml index a5e9962c..b5afcad1 100644 --- a/ultrasonic/src/main/res/values-ru/strings.xml +++ b/ultrasonic/src/main/res/values-ru/strings.xml @@ -125,16 +125,11 @@ Нажми для поиска Песни Поиск - Пробный период окончен - Позже - Получите неограниченное количество загрузок, пожертвовав Subsonic - Сейчас Медиа не найдена %d треки выбраны. %d треки не выбраны. Предупреждение: сеть недоступна. Ошибка: нет SD-карты - Сервер не лицензирован. %d пробные дни остались. Воспроизвести все Все папки Выбрать папку diff --git a/ultrasonic/src/main/res/values-zh-rCN/strings.xml b/ultrasonic/src/main/res/values-zh-rCN/strings.xml index 2cc97a7a..171e18c5 100644 --- a/ultrasonic/src/main/res/values-zh-rCN/strings.xml +++ b/ultrasonic/src/main/res/values-zh-rCN/strings.xml @@ -106,10 +106,6 @@ 点击搜索 歌曲 搜索 - 试用已结束 - 稍后 - 通过捐赠 Subsonic 得到无限制的下载。 - 现在 找不到歌曲 警告：网络不可用 错误：没有SD卡 diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml index 298d7200..04cd961d 100644 --- a/ultrasonic/src/main/res/values/strings.xml +++ b/ultrasonic/src/main/res/values/strings.xml @@ -140,16 +140,11 @@ Click to search Songs Search - Trial period is over - Later - Get unlimited downloads by donating to Subsonic. - Now No media found %d tracks selected. %d tracks unselected. Warning: No network available. Error: No SD card available. - Server not licensed. %d trial days left. Play All All Folders Select Folder From 3b5b8feb5681d2d32b8d9b697dcc92937f5ab855 Mon Sep 17 00:00:00 2001 From: tzugen Date: Sat, 12 Jun 2021 19:58:39 +0200 Subject: [PATCH 5/5] Update baseline files --- detekt-baseline.xml | 8 - ultrasonic/lint-baseline.xml | 642 +++++++++-------------------------- 2 files changed, 159 insertions(+), 491 deletions(-) diff --git a/detekt-baseline.xml b/detekt-baseline.xml index 856dc92d..7235a790 100644 --- a/detekt-baseline.xml +++ b/detekt-baseline.xml @@ -10,8 +10,6 @@ ComplexMethod:SongView.kt$SongView$fun setSong(song: MusicDirectory.Entry, checkable: Boolean, draggable: Boolean) ComplexMethod:TrackCollectionFragment.kt$TrackCollectionFragment$private fun enableButtons() ComplexMethod:TrackCollectionFragment.kt$TrackCollectionFragment$private fun updateInterfaceWithEntries(musicDirectory: MusicDirectory) - EmptyCatchBlock:LocalMediaPlayer.kt$LocalMediaPlayer${ } - EmptyDefaultConstructor:VideoPlayer.kt$VideoPlayer$() EmptyFunctionBlock:SongView.kt$SongView${} FunctionNaming:ThemeChangedEventDistributor.kt$ThemeChangedEventDistributor$fun RaiseThemeChangedEvent() ImplicitDefaultLocale:DownloadFile.kt$DownloadFile$String.format("DownloadFile (%s)", song) @@ -28,7 +26,6 @@ ImplicitDefaultLocale:SongView.kt$SongView$String.format("%02d.", trackNumber) ImplicitDefaultLocale:SongView.kt$SongView$String.format("%s ", bitRate) ImplicitDefaultLocale:SongView.kt$SongView$String.format("%s > %s", suffix, transcodedSuffix) - LargeClass:RESTMusicService.kt$RESTMusicService : MusicService LargeClass:TrackCollectionFragment.kt$TrackCollectionFragment : Fragment LongMethod:DownloadFile.kt$DownloadFile.DownloadTask$override fun execute() LongMethod:EditServerFragment.kt$EditServerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?) @@ -58,7 +55,6 @@ MagicNumber:MediaPlayerService.kt$MediaPlayerService$3 MagicNumber:MediaPlayerService.kt$MediaPlayerService$4 MagicNumber:RESTMusicService.kt$RESTMusicService$206 - MagicNumber:RESTMusicService.kt$RESTMusicService$5 MagicNumber:SongView.kt$SongView$3 MagicNumber:SongView.kt$SongView$4 MagicNumber:SongView.kt$SongView$60 @@ -67,14 +63,10 @@ NestedBlockDepth:DownloadHandler.kt$DownloadHandler$private fun downloadRecursively( fragment: Fragment, id: String, name: String?, isShare: Boolean, isDirectory: Boolean, save: Boolean, append: Boolean, autoPlay: Boolean, shuffle: Boolean, background: Boolean, playNext: Boolean, unpin: Boolean, isArtist: Boolean ) NestedBlockDepth:MediaPlayerService.kt$MediaPlayerService$private fun setupOnSongCompletedHandler() ReturnCount:CommunicationErrorHandler.kt$CommunicationErrorHandler.Companion$fun getErrorMessage(error: Throwable, context: Context): String - ReturnCount:RESTMusicService.kt$RESTMusicService$@Throws(Exception::class) override fun getCoverArt( entry: MusicDirectory.Entry?, size: Int, saveToFile: Boolean, highQuality: Boolean ): Bitmap? ReturnCount:ServerRowAdapter.kt$ServerRowAdapter$ private fun popupMenuItemClick(menuItem: MenuItem, position: Int): Boolean ReturnCount:TrackCollectionFragment.kt$TrackCollectionFragment$override fun onContextItemSelected(menuItem: MenuItem): Boolean - SwallowedException:NavigationActivity.kt$NavigationActivity$catch (e: Resources.NotFoundException) { destination.id.toString() } - ThrowsCount:ApiCallResponseChecker.kt$ApiCallResponseChecker.Companion$@Throws(SubsonicRESTException::class, IOException::class) fun checkResponseSuccessful(response: Response<out SubsonicResponse>) TooGenericExceptionCaught:DownloadFile.kt$DownloadFile$e: Exception TooGenericExceptionCaught:FileLoggerTree.kt$FileLoggerTree$x: Throwable - TooGenericExceptionCaught:LocalMediaPlayer.kt$LocalMediaPlayer$e: Throwable TooGenericExceptionCaught:LocalMediaPlayer.kt$LocalMediaPlayer$ex: Exception TooGenericExceptionCaught:LocalMediaPlayer.kt$LocalMediaPlayer$exception: Throwable TooGenericExceptionCaught:LocalMediaPlayer.kt$LocalMediaPlayer$x: Exception diff --git a/ultrasonic/lint-baseline.xml b/ultrasonic/lint-baseline.xml index 21a3f032..a0874cbb 100644 --- a/ultrasonic/lint-baseline.xml +++ b/ultrasonic/lint-baseline.xml @@ -19,7 +19,7 @@ errorLine2=" ~~~~~~~~~~~"> @@ -172,21 +172,10 @@ errorLine2=" ~~~~"> - - - - - - - - @@ -238,7 +216,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -249,7 +227,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -260,7 +238,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -271,7 +249,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -282,7 +260,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -293,7 +271,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -315,7 +293,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -326,18 +304,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - @@ -348,7 +315,7 @@ errorLine2=" ^"> @@ -359,7 +326,7 @@ errorLine2=" ^"> @@ -370,7 +337,7 @@ errorLine2=" ^"> @@ -381,7 +348,7 @@ errorLine2=" ^"> @@ -392,7 +359,7 @@ errorLine2=" ^"> @@ -403,7 +370,7 @@ errorLine2=" ^"> @@ -414,7 +381,7 @@ errorLine2=" ^"> @@ -738,7 +705,7 @@ column="13"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1532,7 +1208,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1543,7 +1219,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1554,55 +1230,55 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - + @@ -1613,51 +1289,51 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - + + + + @@ -1668,55 +1344,55 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - + + + @@ -1727,51 +1403,51 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1782,7 +1458,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1793,43 +1469,43 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1873,7 +1549,7 @@ errorLine2=" ^"> @@ -1884,7 +1560,7 @@ errorLine2=" ^"> @@ -1895,7 +1571,7 @@ errorLine2=" ^"> @@ -1906,7 +1582,7 @@ errorLine2=" ^"> @@ -1917,18 +1593,7 @@ errorLine2=" ^"> - - - - @@ -1939,18 +1604,7 @@ errorLine2=" ^"> - - - - @@ -1961,7 +1615,29 @@ errorLine2=" ^"> + + + + + + + + @@ -1972,7 +1648,7 @@ errorLine2=" ^"> @@ -1994,7 +1670,7 @@ errorLine2=" ^"> @@ -2113,7 +1789,7 @@ errorLine2=" ^"> @@ -2124,7 +1800,7 @@ errorLine2=" ~~~~~~~"> @@ -2135,7 +1811,7 @@ errorLine2=" ^"> @@ -2146,7 +1822,7 @@ errorLine2=" ~~~~~~~"> @@ -2157,7 +1833,7 @@ errorLine2=" ~~~~~~~">