From 05ce1509ecd93610a1d9c0ced9ddfde01c0e402a Mon Sep 17 00:00:00 2001
From: dddddd-mmmmmm <36978885+dddddd-mmmmmm@users.noreply.github.com>
Date: Fri, 1 Mar 2019 15:37:52 +1100
Subject: [PATCH] Fix broken getRESTUrl() calls from other Util classes.

---
 .../net/nullsum/audinaut/service/CachedMusicService.java    | 6 +++---
 app/src/main/java/net/nullsum/audinaut/util/FileUtil.java   | 2 +-
 app/src/main/java/net/nullsum/audinaut/util/SyncUtil.java   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/net/nullsum/audinaut/service/CachedMusicService.java b/app/src/main/java/net/nullsum/audinaut/service/CachedMusicService.java
index cd5f2db..0052a74 100644
--- a/app/src/main/java/net/nullsum/audinaut/service/CachedMusicService.java
+++ b/app/src/main/java/net/nullsum/audinaut/service/CachedMusicService.java
@@ -640,12 +640,12 @@ public class CachedMusicService implements MusicService {
     }
 
     private String getCacheName(Context context, String name, String id) {
-        String s = musicService.getRestUrl(context, null, false) + id;
+        String s = musicService.getRestUrl(context, null, false, null) + id;
         return name + "-" + s.hashCode() + ".ser";
     }
 
     private String getCacheName(Context context, String name) {
-        String s = musicService.getRestUrl(context, null, false);
+        String s = musicService.getRestUrl(context, null, false, null);
         return name + "-" + s.hashCode() + ".ser";
     }
 
@@ -672,7 +672,7 @@ public class CachedMusicService implements MusicService {
 
     private void checkSettingsChanged(Context context) {
         int instance = musicService.getInstance(context);
-        String newUrl = musicService.getRestUrl(context, null, false);
+        String newUrl = musicService.getRestUrl(context, null, false, null);
         if (!Util.equals(newUrl, restUrl)) {
             cachedMusicFolders.clear();
             cachedIndexes.clear();
diff --git a/app/src/main/java/net/nullsum/audinaut/util/FileUtil.java b/app/src/main/java/net/nullsum/audinaut/util/FileUtil.java
index 9d88350..be88fb2 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/FileUtil.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/FileUtil.java
@@ -292,7 +292,7 @@ public class FileUtil {
         }
 
         // Do a special lookup since 4.7+ doesn't match artist/album to entry.getPath
-        String s = Util.getRestUrl(context, null, false) + entry.getId();
+        String s = Util.getRestUrl(context, null, false, null) + entry.getId();
         String cacheName = "album-" + s.hashCode() + ".ser";
         MusicDirectory entryDir = FileUtil.deserialize(context, cacheName, MusicDirectory.class);
 
diff --git a/app/src/main/java/net/nullsum/audinaut/util/SyncUtil.java b/app/src/main/java/net/nullsum/audinaut/util/SyncUtil.java
index e694bfa..e191140 100644
--- a/app/src/main/java/net/nullsum/audinaut/util/SyncUtil.java
+++ b/app/src/main/java/net/nullsum/audinaut/util/SyncUtil.java
@@ -15,7 +15,7 @@ public final class SyncUtil {
 
     private static void checkRestURL(Context context) {
         int instance = Util.getActiveServer(context);
-        String newURL = Util.getRestUrl(context, null, instance, false);
+        String newURL = Util.getRestUrl(context, null, instance, false, null);
         if (url == null || !url.equals(newURL)) {
             syncedPlaylists = null;
             url = newURL;
@@ -72,7 +72,7 @@ public final class SyncUtil {
     }
 
     private static String getPlaylistSyncFile(Context context, int instance) {
-        return "sync-playlist-" + (Util.getRestUrl(context, null, instance, false)).hashCode() + ".ser";
+        return "sync-playlist-" + (Util.getRestUrl(context, null, instance, false, null)).hashCode() + ".ser";
     }
 
     public static void removeMostRecentSyncFiles(Context context) {
@@ -84,7 +84,7 @@ public final class SyncUtil {
     }
 
     private static String getMostRecentSyncFile(Context context, int instance) {
-        return "sync-most_recent-" + (Util.getRestUrl(context, null, instance, false)).hashCode() + ".ser";
+        return "sync-most_recent-" + (Util.getRestUrl(context, null, instance, false, null)).hashCode() + ".ser";
     }
 
     public static class SyncSet implements Serializable {