From 41506e0405bd831a42ad70a628d6256defde4403 Mon Sep 17 00:00:00 2001
From: Tim Malseed <t.malseed@gmail.com>
Date: Wed, 30 Oct 2019 22:06:51 +1100
Subject: [PATCH 1/3] Fixed an issue preventing playlists from appearing

---
 .../main/java/com/simplecity/amp_library/model/Playlist.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index 4a9d0520e..9e0a89ef0 100644
--- 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,8 @@ 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(*)", "is_podcast=1" })
+                .projection(new String[] { "count(*)", MediaStore.Audio.Media.IS_PODCAST})
+                .selection(MediaStore.Audio.Media.IS_PODCAST + "=1")
                 .build();
 
         return SqlUtils.createSingleQuery(ShuttleApplication.getInstance(), cursor -> new Playlist(

From e920dcd058e1263016da1bf4d8888ae592983762 Mon Sep 17 00:00:00 2001
From: Tim Malseed <t.malseed@gmail.com>
Date: Wed, 30 Oct 2019 22:32:25 +1100
Subject: [PATCH 2/3] Dispose of disposables when service is destroyed

---
 .../notifications/MusicNotificationHelper.java        | 11 +++++++++--
 .../simplecity/amp_library/playback/MusicService.java |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java b/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java
index e239c3546..64240a958 100644
--- a/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java
+++ b/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java
@@ -31,6 +31,7 @@
 import com.simplecity.amp_library.utils.PlaceholderProvider;
 import com.simplecity.amp_library.utils.PlaylistUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 import java.util.ConcurrentModificationException;
 
@@ -48,6 +49,8 @@ public class MusicNotificationHelper extends NotificationHelper {
 
     private Handler handler;
 
+    private CompositeDisposable compositeDisposable = new CompositeDisposable();
+
     public MusicNotificationHelper(Context context) {
         super(context);
 
@@ -106,7 +109,7 @@ public void notify(Context context, @NonNull Song song, boolean isPlaying, @NonN
         notification = getBuilder(context, song, mediaSessionToken, bitmap, isPlaying, isFavorite).build();
         notify(NOTIFICATION_ID, notification);
 
-        PlaylistUtils.isFavorite(song)
+        compositeDisposable.add(PlaylistUtils.isFavorite(song)
                 .first(false)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -116,7 +119,7 @@ public void notify(Context context, @NonNull Song song, boolean isPlaying, @NonN
                     notify(notification);
                 }, error -> {
                     LogUtils.logException(TAG, "MusicNotificationHelper failed to present notification", error);
-                });
+                }));
 
         handler.post(() -> Glide.with(context)
                 .load(song)
@@ -172,4 +175,8 @@ public void notify(Notification notification) {
     public void cancel() {
         super.cancel(NOTIFICATION_ID);
     }
+
+    public void tearDown() {
+        compositeDisposable.clear();
+    }
 }
diff --git a/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java b/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java
index 19f33c0ee..424aa7a39 100644
--- a/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java
+++ b/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java
@@ -281,6 +281,7 @@ public void onDestroy() {
         playbackManager.destroy();
 
         dummyNotificationHelper.teardown(this);
+        notificationHelper.tearDown();
 
         disposables.clear();
 

From b9db0116bef16472e7ef3e77f27003a68e5bf342 Mon Sep 17 00:00:00 2001
From: Tim Malseed <t.malseed@gmail.com>
Date: Wed, 30 Oct 2019 23:36:56 +1100
Subject: [PATCH 3/3] Bump to 2.0.12

---
 .idea/codeStyles/Project.xml                  | 65 +++++++++----------
 app/src/main/assets/web/info.html             |  6 ++
 app/src/main/assets/web/info_dark.html        |  6 ++
 .../ui/dialog/ChangelogDialog.java            | 12 ++++
 buildSrc/src/main/kotlin/Config.kt            |  2 +-
 5 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index e067c6457..0efb26e81 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -46,7 +46,7 @@
     <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
     <option name="ENUM_CONSTANTS_WRAP" value="1" />
     <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
       <option name="LAYOUT_SETTINGS">
         <value>
           <option name="INSERT_BLANK_LINE_BEFORE_TAG" value="false" />
@@ -61,9 +61,6 @@
       <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="" withSubpackages="true" static="false" />
@@ -89,7 +86,6 @@
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <XML>
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
     <ADDITIONAL_INDENT_OPTIONS fileType="php">
@@ -238,28 +234,22 @@
           <section>
             <rule>
               <match>
-                <NAME>class</NAME>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <NAME>layout</NAME>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <NAME>xmlns:android</NAME>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
               </match>
             </rule>
           </section>
           <section>
             <rule>
               <match>
-                <NAME>xmlns:.*</NAME>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
               </match>
               <order>BY_NAME</order>
             </rule>
@@ -269,6 +259,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -279,6 +270,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -288,8 +280,9 @@
             <rule>
               <match>
                 <AND>
-                  <NAME>.*:layout_width</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
             </rule>
@@ -298,8 +291,9 @@
             <rule>
               <match>
                 <AND>
-                  <NAME>.*:layout_height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
             </rule>
@@ -308,8 +302,9 @@
             <rule>
               <match>
                 <AND>
-                  <NAME>.*:layout_.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
               <order>BY_NAME</order>
@@ -320,27 +315,25 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
-              <order>BY_NAME</order>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
             </rule>
           </section>
           <section>
             <rule>
               <match>
-                <NAME>.*(?&lt;!style)$</NAME>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
               </match>
               <order>BY_NAME</order>
             </rule>
           </section>
-          <section>
-            <rule>
-              <match>
-                <NAME>style</NAME>
-              </match>
-            </rule>
-          </section>
         </rules>
       </arrangement>
     </codeStyleSettings>
diff --git a/app/src/main/assets/web/info.html b/app/src/main/assets/web/info.html
index c0c934dc7..510ef90a4 100644
--- a/app/src/main/assets/web/info.html
+++ b/app/src/main/assets/web/info.html
@@ -8,6 +8,12 @@
 </head>
 
 <body>
+    <h4>2.0.12</h4>
+<ul>
+    <li>Fixed an issue preventing playlists from showing up</li>
+    <li>Crash fixes</li>
+    <li>I've been rebuilding Shuttle from scratch for almost a year now! DM me your Play Store email address on Discord <a href="https://discord.gg/4Z5EU7K">Discord</a> if you're interested in testing the alpha :D</li>
+</ul>
     <h4>2.0.11</h4>
 <ul>
     <li>Fixed artwork downloading issue (no longer relying on flaky Last.FM API)</li>
diff --git a/app/src/main/assets/web/info_dark.html b/app/src/main/assets/web/info_dark.html
index 998bc62b1..10c0b03d7 100644
--- a/app/src/main/assets/web/info_dark.html
+++ b/app/src/main/assets/web/info_dark.html
@@ -8,6 +8,12 @@
 </head>
 
 <body>
+    <h4>2.0.12</h4>
+<ul>
+    <li>Fixed an issue preventing playlists from showing up</li>
+    <li>Crash fixes</li>
+    <li>I've been rebuilding Shuttle from scratch for almost a year now! DM me your Play Store email address on Discord <a href="https://discord.gg/4Z5EU7K">Discord</a> if you're interested in testing the alpha :D</li>
+</ul>
     <h4>2.0.11</h4>
 <ul>
     <li>Fixed artwork downloading issue (no longer relying on flaky Last.FM API)</li>
diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java
index dbf84fb3b..599aa9be9 100644
--- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java
+++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java
@@ -2,6 +2,8 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
 import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -44,6 +46,16 @@ public void onPageFinished(WebView view, String url) {
                 ViewUtils.fadeOut(progressBar, ()
                         -> ViewUtils.fadeIn(webView, null));
             }
+
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                if (intent.resolveActivity(context.getPackageManager()) != null) {
+                    context.startActivity(intent);
+                    return true;
+                }
+                return false;
+            }
         });
 
         Aesthetic.get(context)
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 6b64fd400..6ea7314f1 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,5 +1,5 @@
 object Config {
 
-    const val versionName = "2.0.11"
+    const val versionName = "2.0.12"
 
 }
\ No newline at end of file