From a13306c6804b8da306e14faefb05bcc2add42fb0 Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Sat, 10 Apr 2021 13:15:54 +0200
Subject: [PATCH] Remove unused parameters from getDownloadInputStream()

---
 .../org/moire/ultrasonic/service/CachedMusicService.java     | 4 ++--
 .../main/java/org/moire/ultrasonic/service/DownloadFile.java | 3 +--
 .../main/java/org/moire/ultrasonic/service/MusicService.java | 2 +-
 .../org/moire/ultrasonic/service/OfflineMusicService.java    | 2 +-
 .../kotlin/org/moire/ultrasonic/service/RESTMusicService.kt  | 5 +----
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java
index d8033ceb..458132a8 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/CachedMusicService.java
@@ -321,9 +321,9 @@ public class CachedMusicService implements MusicService
 	}
 
 	@Override
-	public Pair<InputStream, Boolean> getDownloadInputStream(Context context, MusicDirectory.Entry song, long offset, int maxBitrate, CancellableTask task) throws Exception
+	public Pair<InputStream, Boolean> getDownloadInputStream(MusicDirectory.Entry song, long offset, int maxBitrate) throws Exception
 	{
-		return musicService.getDownloadInputStream(context, song, offset, maxBitrate, task);
+		return musicService.getDownloadInputStream(song, offset, maxBitrate);
 	}
 
 	@Override
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
index eb71800f..a3d84d6f 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/DownloadFile.java
@@ -377,8 +377,7 @@ public class DownloadFile
 				{
 					// Attempt partial HTTP GET, appending to the file if it exists.
 					Pair<InputStream, Boolean> response = musicService
-							.getDownloadInputStream(context, song, partialFile.length(), bitRate,
-									DownloadTask.this);
+							.getDownloadInputStream(song, partialFile.length(), bitRate);
 
 					if (response.getSecond())
 					{
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java
index 8ef64e81..86782318 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MusicService.java
@@ -108,7 +108,7 @@ public interface MusicService
 	 * Return response {@link InputStream} and a {@link Boolean} that indicates if this response is
 	 * partial.
 	 */
-	Pair<InputStream, Boolean> getDownloadInputStream(Context context, MusicDirectory.Entry song, long offset, int maxBitrate, CancellableTask task) throws Exception;
+	Pair<InputStream, Boolean> getDownloadInputStream(MusicDirectory.Entry song, long offset, int maxBitrate) throws Exception;
 
 	// TODO: Refactor and remove this call (see RestMusicService implementation)
 	String getVideoUrl(Context context, String id, boolean useFlash) throws Exception;
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java
index 80688551..a78d09b2 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/OfflineMusicService.java
@@ -893,7 +893,7 @@ public class OfflineMusicService implements MusicService
 	}
 
 	@Override
-	public Pair<InputStream, Boolean> getDownloadInputStream(Context context, MusicDirectory.Entry song, long offset, int maxBitrate, CancellableTask task) {
+	public Pair<InputStream, Boolean> getDownloadInputStream(MusicDirectory.Entry song, long offset, int maxBitrate) {
 		Timber.w("OfflineMusicService.getDownloadInputStream was called but it isn't available");
 		return null;
 	}
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 8f380d9e..e724065b 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
@@ -59,7 +59,6 @@ import org.moire.ultrasonic.domain.toDomainEntitiesList
 import org.moire.ultrasonic.domain.toDomainEntity
 import org.moire.ultrasonic.domain.toDomainEntityList
 import org.moire.ultrasonic.domain.toMusicDirectoryDomainEntity
-import org.moire.ultrasonic.util.CancellableTask
 import org.moire.ultrasonic.util.FileUtil
 import org.moire.ultrasonic.util.Util
 import timber.log.Timber
@@ -611,11 +610,9 @@ open class RESTMusicService(
 
     @Throws(Exception::class)
     override fun getDownloadInputStream(
-        context: Context,
         song: MusicDirectory.Entry,
         offset: Long,
-        maxBitrate: Int,
-        task: CancellableTask
+        maxBitrate: Int
     ): Pair<InputStream, Boolean> {
         val songOffset = if (offset < 0) 0 else offset