Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove scanMedia(), as ACTION_MEDIA_SCANNER_SCAN_FILE is deprecated, 

in favour of the MediaStore API which we are already using.
This commit is contained in:
tzugen 2021-04-10 13:56:57 +02:00
parent 0349746228
commit 8fbc2a9fa3
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
16 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
View File

@ -409,20 +409,10 @@ public class DownloadFile
{
Util.renameFile(partialFile, saveFile);
mediaStoreService.saveInMediaStore(DownloadFile.this);
if (Util.getShouldScanMedia(context))
{
Util.scanMedia(context, saveFile);
}
}
else
{
Util.renameFile(partialFile, completeFile);
if (Util.getShouldScanMedia(context))
{
Util.scanMedia(context, completeFile);
}
}
}
}

4
ultrasonic/src/main/java/org/moire/ultrasonic/service/Downloader.java
View File

@ -188,10 +188,6 @@ public class Downloader
DownloadFile downloadFile = backgroundDownloadList.get(i);
if (downloadFile.isWorkDone() && (!downloadFile.shouldSave() || downloadFile.isSaved()))
{
if (Util.getShouldScanMedia(context))
{
Util.scanMedia(context, downloadFile.getCompleteFile());
}
// Don't need to keep list like active song list
backgroundDownloadList.remove(i);

1
ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java
View File

@ -125,7 +125,6 @@ public final class Constants
public static final String PREFERENCES_KEY_DEFAULT_SHARE_GREETING = "sharingDefaultGreeting";
public static final String PREFERENCES_KEY_DEFAULT_SHARE_EXPIRATION = "sharingDefaultExpiration";
public static final String PREFERENCES_KEY_SHOW_ALL_SONGS_BY_ARTIST = "showAllSongsByArtist";
public static final String PREFERENCES_KEY_SCAN_MEDIA = "scanMedia";
public static final String PREFERENCES_KEY_IMAGE_LOADER_CONCURRENCY = "imageLoaderConcurrency";
public static final String PREFERENCES_KEY_FF_IMAGE_LOADER = "ff_new_image_loader";
public static final String PREFERENCES_KEY_USE_FIVE_STAR_RATING = "use_five_star_rating";

12
ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java
View File

@ -1394,18 +1394,6 @@ public class Util
return preferences.getBoolean(Constants.PREFERENCES_KEY_SHOW_ALL_SONGS_BY_ARTIST, false);
}
public static boolean getShouldScanMedia(Context context)
{
SharedPreferences preferences = getPreferences(context);
return preferences.getBoolean(Constants.PREFERENCES_KEY_SCAN_MEDIA, false);
}
public static void scanMedia(Context context, File file)
{
Uri uri = Uri.fromFile(file);
Intent scanFileIntent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri);
context.sendBroadcast(scanFileIntent);
}
public static int getImageLoaderConcurrency(Context context)
{

2
ultrasonic/src/main/res/values-cs/strings.xml
View File

@ -382,8 +382,6 @@
<string name="settings.show_all_songs_by_artist">Zobrazit všechny skladby umělce</string>
<string name="settings.show_all_songs_by_artist_summary">Přidat nový zápis v náhledu umělců pro přístup ke všem skladbám umělce</string>
<string name="download.menu_show_artist">Zobrazit umělce</string>
<string name="settings.scan_media">Skenovat média po stažení</string>
<string name="settings.scan_media_summary">Automaticky skenovat médi po jejich stažení</string>
<string name="settings.image_loader_concurrency">Počet vláken stahování obrázků</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-de/strings.xml
View File

@ -379,8 +379,6 @@
<string name="settings.show_all_songs_by_artist">Alle Titel nach Künstler sortieren</string>
<string name="settings.show_all_songs_by_artist_summary">Einen neuen Eintrag in der Künstleransicht hinzufügen, um auf alle Lieder eines Künstlers zuzugreifen</string>
<string name="download.menu_show_artist">Künstler zeigen</string>
<string name="settings.scan_media">Medien nach Download durchsuchen</string>
<string name="settings.scan_media_summary">Medien nach dem Herunterladen automatisch durchsuchen</string>
<string name="settings.image_loader_concurrency">Paralleles laden von Bildern</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-es/strings.xml
View File

@ -384,8 +384,6 @@
<string name="settings.show_all_songs_by_artist">Mostrar todas las canciones por artista</string>
<string name="settings.show_all_songs_by_artist_summary">Añadir nueva entrada en la vista de artista para acceder a todas las canciones de un artista</string>
<string name="download.menu_show_artist">Mostrar artista</string>
<string name="settings.scan_media">Escanear medio después de descargar</string>
<string name="settings.scan_media_summary">Escanear automáticamente el medio después de descargar</string>
<string name="settings.image_loader_concurrency">Concurrencia del cargador de imágenes</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-fr/strings.xml
View File

@ -384,8 +384,6 @@
<string name="settings.show_all_songs_by_artist">Voir toutes les titres par artiste</string>
<string name="settings.show_all_songs_by_artist_summary">Ajouter une nouvelle entrée de l\'affichage de l\'artiste pour accéder à toutes les titres pour un artiste</string>
<string name="download.menu_show_artist">Afficher l\'artiste</string>
<string name="settings.scan_media">Scan Media After Download</string>
<string name="settings.scan_media_summary">Balayer automatiquement les médias après téléchargement</string>
<string name="settings.image_loader_concurrency">Chargements d’images simultanés</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-hu/strings.xml
View File

@ -383,8 +383,6 @@
<string name="settings.show_all_songs_by_artist">Az előadó összes dalának megjelenítése</string>
<string name="settings.show_all_songs_by_artist_summary">Új bejegyzés hozzáadása az előadóhoz, az előadó összes dalának eléréséhez.</string>
<string name="download.menu_show_artist">Ugrás az előadóhoz</string>
<string name="settings.scan_media">Scan Media After Download</string>
<string name="settings.scan_media_summary">Automatically scan media after download</string>
<string name="settings.image_loader_concurrency">Image Loader Concurrency</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-nl/strings.xml
View File

@ -384,8 +384,6 @@
<string name="settings.show_all_songs_by_artist">Alle nummers van artiest tonen</string>
<string name="settings.show_all_songs_by_artist_summary">Item toevoegen in artiestweergave om alle nummers van een artiest te bekijken</string>
<string name="download.menu_show_artist">Artiest tonen</string>
<string name="settings.scan_media">Media scannen na downloaden</string>
<string name="settings.scan_media_summary">Media automatisch scannen na downloaden</string>
<string name="settings.image_loader_concurrency">Aantal tegelijkertijd te laden afbeeldingen</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-pl/strings.xml
View File

@ -379,8 +379,6 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników
<string name="settings.show_all_songs_by_artist">Wyświetlaj wszystkie utwory artysty</string>
<string name="settings.show_all_songs_by_artist_summary">Dodaje nową pozycję w widoku artysty z wszystkimi jego utworami</string>
<string name="download.menu_show_artist">Wyświetlaj artystę</string>
<string name="settings.scan_media">Skanuj media po pobraniu</string>
<string name="settings.scan_media_summary">Automatycznie uruchamia skanowanie mediów po pobraniu</string>
<string name="settings.image_loader_concurrency">Ilość jednocześnie ładowanych obrazów</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-pt-rBR/strings.xml
View File

@ -384,8 +384,6 @@
<string name="settings.show_all_songs_by_artist">Mostrar Todas as Músicas por Artista</string>
<string name="settings.show_all_songs_by_artist_summary">Adicionar nova entrada em artista para acessar todas as músicas do artista</string>
<string name="download.menu_show_artist">Mostrar Artista</string>
<string name="settings.scan_media">Escanear Música no Download</string>
<string name="settings.scan_media_summary">Automaticamente escaneia música após o download</string>
<string name="settings.image_loader_concurrency">Concorrência ao Carregar Imagens</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-pt/strings.xml
View File

@ -379,8 +379,6 @@
<string name="settings.show_all_songs_by_artist">Todas as Músicas do Artista</string>
<string name="settings.show_all_songs_by_artist_summary">Adicionar nova entrada em artista para ver todas as músicas do artista</string>
<string name="download.menu_show_artist">Mostrar Artista</string>
<string name="settings.scan_media">Varrer Música no Download</string>
<string name="settings.scan_media_summary">Automaticamente varre música após baixar</string>
<string name="settings.image_loader_concurrency">Concorrência ao Carregar Imagens</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values-ru/strings.xml
View File

@ -371,8 +371,6 @@
<string name="settings.show_all_songs_by_artist">Показать все треки исполнителя</string>
<string name="settings.show_all_songs_by_artist_summary">Добавить новую запись в представлении исполнителя, чтобы получить доступ ко всем песням для исполнителя</string>
<string name="download.menu_show_artist">Показать исполнителей</string>
<string name="settings.scan_media">Сканировать носители после загрузки</string>
<string name="settings.scan_media_summary">Автомат</string>
<string name="settings.image_loader_concurrency">Загрузчик совпадающих изображений</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

2
ultrasonic/src/main/res/values/strings.xml
View File

@ -386,8 +386,6 @@
<string name="settings.show_all_songs_by_artist">Show All Songs By Artist</string>
<string name="settings.show_all_songs_by_artist_summary">Add new entry in artist view to access all songs for an artist</string>
<string name="download.menu_show_artist">Show Artist</string>
<string name="settings.scan_media">Scan Media After Download</string>
<string name="settings.scan_media_summary">Automatically scan media after download</string>
<string name="settings.image_loader_concurrency">Image Loader Concurrency</string>
<string name="settings.image_loader_concurrency_1">1</string>
<string name="settings.image_loader_concurrency_2">2</string>

6
ultrasonic/src/main/res/xml/settings.xml
View File

@ -118,12 +118,6 @@
a:summary="@string/settings.clear_bookmark_summary"
a:title="@string/settings.clear_bookmark"
app:iconSpaceReserved="false"/>
<CheckBoxPreference
a:defaultValue="false"
a:key="scanMedia"
a:summary="@string/settings.scan_media_summary"
a:title="@string/settings.scan_media"
app:iconSpaceReserved="false"/>
<ListPreference
a:defaultValue="5000"
a:entries="@array/bufferLengthNames"