timusus · flxholle · Jun 14, 2020 · Jun 14, 2020 · Jul 10, 2020 · Jul 10, 2020
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -49,14 +49,13 @@ android {
     }
 
     compileSdkVersion Dependencies.compileSdk
-    buildToolsVersion Dependencies.buildTools
 
     defaultConfig {
         minSdkVersion Dependencies.minSdk
         targetSdkVersion Dependencies.targetSdk
 
-        versionName Config.versionName
-        versionCode 5000
+        versionName "2.0.17"
+        versionCode 5001
 
         resConfigs "en", "zh-rCN", "fr", "de", "ko", "it", "ru", "nl", "tr", "pl", "ro", "hu", "hi-rIN", "uk", "bg-rBG", "en-rGB", "et-rEE", "vi", "pt-rBR", "es", "en-rNZ", "zh-rTW", "es-rES", "ca", "hr", "en-rAU", "eu-rES", "th", "ja"
 
@@ -261,7 +260,6 @@ dependencies {
     implementation Dependencies.materialDialogs
     implementation Dependencies.materialDialogCommons
     implementation Dependencies.expandableRecyclerView
-    implementation Dependencies.billing
 
     implementation Dependencies.butterknife
     kapt Dependencies.butterknifeAnnotationProcessor

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,8 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:requestLegacyExternalStorage="true">
 
         <meta-data
             android:name="android.max_aspect"

diff --git a/app/src/main/assets/web/info.html b/app/src/main/assets/web/info.html
@@ -8,6 +8,18 @@
 </head>
 
 <body>
+    <h4>2.0.17</h4>
+<ul>
+    <li>Fixed an issue where playlists didn't show up on some devices</li>
+    <li>Shuttle 2 is in alpha testing! DM me your Play Store email address on <a href="https://discord.gg/4Z5EU7K">Discord</a> if you're interested in testing.</li>
+</ul>
+    <h4>2.0.16</h4>
+<ul>
+    <li>Fixed a character encoding issue preventing artwork downloading on some devices</li>
+    <li>Updated language around including/excluding songs</li>
+    <li>Possible fix for playlist editing issues on Android 10</li>
+    <li>Shuttle is now free - Shuttle+ will be removed, so only one version of Shuttle will exist on the Play Store</li>
+</ul>
     <h4>2.0.15</h4>
 <ul>
     <li>More playlist related crash fixes</li>

diff --git a/app/src/main/assets/web/info_dark.html b/app/src/main/assets/web/info_dark.html
@@ -8,6 +8,18 @@
 </head>
 
 <body>
+    <h4>2.0.17</h4>
+<ul>
+    <li>Fixed an issue where playlists didn't show up on some devices</li>
+    <li>Shuttle 2 is in alpha testing! DM me your Play Store email address on <a href="https://discord.gg/4Z5EU7K">Discord</a> if you're interested in testing.</li>
+</ul>
+    <h4>2.0.16</h4>
+<ul>
+    <li>Fixed a character encoding issue preventing artwork downloading on some devices</li>
+    <li>Updated language around including/excluding songs</li>
+    <li>Possible fix for playlist editing issues on Android 10</li>
+    <li>Shuttle is now free - Shuttle+ will be removed, so only one version of Shuttle will exist on the Play Store</li>
+</ul>
     <h4>2.0.15</h4>
 <ul>
     <li>More playlist related crash fixes</li>

diff --git a/app/src/main/java/com/simplecity/amp_library/ShuttleApplication.java b/app/src/main/java/com/simplecity/amp_library/ShuttleApplication.java
@@ -30,10 +30,8 @@
 import com.simplecity.amp_library.sql.databases.CustomArtworkTable;
 import com.simplecity.amp_library.sql.providers.PlayCountTable;
 import com.simplecity.amp_library.sql.sqlbrite.SqlBriteUtils;
-import com.simplecity.amp_library.utils.AnalyticsManager;
 import com.simplecity.amp_library.utils.DataManager;
 import com.simplecity.amp_library.utils.InputMethodManagerLeaks;
-import com.simplecity.amp_library.utils.LegacyUtils;
 import com.simplecity.amp_library.utils.LogUtils;
 import com.simplecity.amp_library.utils.SettingsManager;
 import com.simplecity.amp_library.utils.StringUtils;
@@ -72,8 +70,6 @@ public static synchronized ShuttleApplication getInstance() {
         return instance;
     }
 
-    private boolean isUpgraded;
-
     public static final double VOLUME_INCREMENT = 0.05;
 
     private RefWatcher refWatcher;
@@ -182,15 +178,6 @@ public static String getVersion() {
         return "unknown";
     }
 
-    public void setIsUpgraded(boolean isUpgraded) {
-        this.isUpgraded = isUpgraded;
-        AnalyticsManager.setIsUpgraded();
-    }
-
-    public boolean getIsUpgraded() {
-        return isUpgraded || BuildConfig.DEBUG;
-    }
-
     public static File getDiskCacheDir(String uniqueName) {
         try {
             // Check if media is mounted or storage is built-in, if so, try and use external cache dir

diff --git a/app/src/main/java/com/simplecity/amp_library/billing/BillingManager.java b/app/src/main/java/com/simplecity/amp_library/billing/BillingManager.java
diff --git a/app/src/main/java/com/simplecity/amp_library/constants/Config.java b/app/src/main/java/com/simplecity/amp_library/constants/Config.java
@@ -14,7 +14,4 @@ private Config() {
     public static final String PACKAGE_NAME_PRO = "com.simplecity.amp_pro";
 
     public static final String CHROMECAST_APP_ID = "73341C53";
-
-    // IAP
-    public static final String SKU_PREMIUM = "id_upgrade_to_pro";
 }
diff --git a/app/src/main/java/com/simplecity/amp_library/model/Album.java b/app/src/main/java/com/simplecity/amp_library/model/Album.java
@@ -13,7 +13,7 @@
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -217,8 +217,8 @@ private void setArtworkKey() {
     public String getRemoteArtworkUrl() {
         try {
             return "https://artwork.shuttlemusicplayer.app/api/v1/artwork"
-                    + "?artist=" + URLEncoder.encode(albumArtistName, Charset.forName("UTF-8").toString())
-                    + "&album=" + URLEncoder.encode(name, Charset.forName("UTF-8").toString());
+                    + "?artist=" + URLEncoder.encode(albumArtistName, StandardCharsets.UTF_8.name())
+                    + "&album=" + URLEncoder.encode(name, StandardCharsets.UTF_8.name());
         } catch (UnsupportedEncodingException e) {
             return null;
         }

diff --git a/app/src/main/java/com/simplecity/amp_library/model/AlbumArtist.java b/app/src/main/java/com/simplecity/amp_library/model/AlbumArtist.java
@@ -12,7 +12,7 @@
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -126,7 +126,7 @@ public int hashCode() {
     @Override
     public String getRemoteArtworkUrl() {
         try {
-            return "https://artwork.shuttlemusicplayer.app/api/v1/artwork?artist=" + URLEncoder.encode(name, Charset.forName("UTF-8").toString());
+            return "https://artwork.shuttlemusicplayer.app/api/v1/artwork?artist=" + URLEncoder.encode(name, StandardCharsets.UTF_8.name());
         } catch (UnsupportedEncodingException e) {
             return null;
         }

diff --git a/app/src/main/java/com/simplecity/amp_library/model/Playlist.java b/app/src/main/java/com/simplecity/amp_library/model/Playlist.java
@@ -109,7 +109,7 @@ public static Playlist podcastPlaylist() {
         // Check if there are any podcasts
         Query query = new Query.Builder()
                 .uri(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI)
-                .projection(new String[] { "count(*)", MediaStore.Audio.Media.IS_PODCAST})
+                .projection(new String[] { MediaStore.Audio.Media.IS_PODCAST })
                 .selection(MediaStore.Audio.Media.IS_PODCAST + "=1")
                 .build();
 

diff --git a/app/src/main/java/com/simplecity/amp_library/model/Song.java b/app/src/main/java/com/simplecity/amp_library/model/Song.java
@@ -23,7 +23,7 @@
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 public class Song implements
@@ -361,8 +361,8 @@ private void setArtworkKey() {
     public String getRemoteArtworkUrl() {
         try {
             return "https://artwork.shuttlemusicplayer.app/api/v1/artwork"
-                    + "?artist=" + URLEncoder.encode(albumArtistName, Charset.forName("UTF-8").toString())
-                    + "&album=" + URLEncoder.encode(albumName, Charset.forName("UTF-8").toString());
+                    + "?artist=" + URLEncoder.encode(albumArtistName, StandardCharsets.UTF_8.name())
+                    + "&album=" + URLEncoder.encode(albumName, StandardCharsets.UTF_8.name());
         } catch (UnsupportedEncodingException e) {
             return null;
         }