Merge branch 'master' into dev

timusus · timusus · commit c1080f259dc5 · 2019-10-30T23:53:25.000+11:00
# Conflicts:
#	.idea/codeStyles/Project.xml
#	app/src/main/assets/web/info.html
#	app/src/main/assets/web/info_dark.html
#	app/src/main/java/com/simplecity/amp_library/model/Playlist.java
#	app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java
#	app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.java
#	buildSrc/src/main/kotlin/Config.kt
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/app/src/main/assets/web/info.html b/app/src/main/assets/web/info.html
@@ -8,6 +8,16 @@
 </head>
 
 <body>
+<h4>2.0.13-beta1</h4>
+<ul>
+    <li>Continues where 2.0.12-beta6 left off</li>
+</ul>
+<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.12-beta6</h4>
 <ul>
     <li>Fixed an issue where artwork didn't load on some devices</li>
diff --git a/app/src/main/assets/web/info_dark.html b/app/src/main/assets/web/info_dark.html
@@ -8,6 +8,16 @@
 </head>
 
 <body>
+<h4>2.0.13-beta1</h4>
+<ul>
+    <li>Continues where 2.0.12-beta6 left off</li>
+</ul>
+<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.12-beta6</h4>
 <ul>
     <li>Fixed an issue where artwork didn't load on some devices</li>
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
@@ -33,6 +33,7 @@
 import com.simplecity.amp_library.utils.SettingsManager;
 import com.simplecity.amp_library.utils.playlists.FavoritesPlaylistManager;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 import java.util.ConcurrentModificationException;
 
@@ -52,6 +53,8 @@ public class MusicNotificationHelper extends NotificationHelper {
 
     private AnalyticsManager analyticsManager;
 
+    private CompositeDisposable compositeDisposable = new CompositeDisposable();
+
     public MusicNotificationHelper(Context context, AnalyticsManager analyticsManager) {
         super(context);
 
@@ -119,7 +122,7 @@ public void notify(
         notification = getBuilder(context, song, mediaSessionToken, bitmap, isPlaying, isFavorite).build();
         notify(NOTIFICATION_ID, notification);
 
-        favoritesPlaylistManager.isFavorite(song)
+        compositeDisposable.add(favoritesPlaylistManager.isFavorite(song)
                 .first(false)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -129,7 +132,7 @@ public void notify(
                     notify(notification);
                 }, error -> {
                     LogUtils.logException(TAG, "MusicNotificationHelper failed to present notification", error);
-                });
+                }));
 
         handler.post(() -> Glide.with(context)
                 .load(song)
@@ -194,4 +197,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
@@ -336,6 +336,7 @@ public void onDestroy() {
         playbackManager.destroy();
 
         dummyNotificationHelper.teardown(this);
+        notificationHelper.tearDown();
 
         disposables.clear();
 
diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt
@@ -3,6 +3,8 @@ package com.simplecity.amp_library.ui.dialog
 import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.support.v4.app.DialogFragment
 import android.support.v4.app.FragmentManager
@@ -48,6 +50,15 @@ class ChangelogDialog : DialogFragment() {
 
                 ViewUtils.fadeOut(progressBar) { ViewUtils.fadeIn(webView, null) }
             }
+
+            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                if (intent.resolveActivity(context!!.packageManager) != 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
@@ -1,5 +1,5 @@
 object Config {
 
-    const val versionName = "2.0.12-beta6"
+    const val versionName = "2.0.13-beta1"
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`object Config {`
`2`	`2`
`3`		`- const val versionName = "2.0.12-beta6"`
	`3`	`+ const val versionName = "2.0.13-beta1"`
`4`	`4`
`5`	`5`	`}`