fastlane/metadata/android/en-US/changelogs/119.txt

@@ -1,10 +0,0 @@
-Features:
-- This releases focuses on shuffled playback. The view of the playlist will now present itself in the order it will actually play. You can toggle the shuffle mode to create a new order, while the past playback history will be preserved.
-- Use Coroutines for triggering the download or playback of music through the context menus
-- Enable Artists pictures by Default
-
-Bug fixes:
-- Remove an unhelpful popup that "ID must be set"
-- Shuffle mode doesn't always play all tracks
-- Shuffle mode starts with the first track most of the time
-

fastlane/metadata/android/en-US/changelogs/120.txt

@@ -1,10 +0,0 @@
-Features:
-- This releases focuses on shuffled playback. The view of the playlist will now present itself in the order it will actually play. You can toggle the shuffle mode to create a new order, while the past playback history will be preserved.
-- Use Coroutines for triggering the download or playback of music through the context menus
-- Enable Artists pictures by Default
-
-Bug fixes:
-- Remove an unhelpful popup that "ID must be set"
-- Shuffle mode doesn't always play all tracks
-- Shuffle mode starts with the first track most of the time
-

gradle.properties

@@ -20,6 +20,3 @@ android.nonFinalResIds=true
 # It can be removed if it makes problems
 org.gradle.unsafe.configuration-cache=true
 
-# TODO Renable on day (check that Retrofit, Jackson, and Imageloader are working)
-android.enableR8.fullMode=false
-

ultrasonic/build.gradle

@@ -9,8 +9,8 @@ android {
 
     defaultConfig {
         applicationId "org.moire.ultrasonic"
-        versionCode 120
+        versionCode 117
-        versionName "4.4.1"
+        versionName "4.3.4"
 
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk

ultrasonic/minify/proguard-retrofit.pro

@@ -1,41 +1,10 @@
-# Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and
+#### From retrofit
-# EnclosingMethod is required to use InnerClasses.
--keepattributes Signature, InnerClasses, EnclosingMethod
 
-# Retrofit does reflection on method and parameter annotations.
+# Retain generic type information for use by reflection by converters and adapters.
--keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+-keepattributes Signature
-
+# Retain service method parameters.
-# Keep annotation default values (e.g., retrofit2.http.Field.encoded).
+-keepclassmembernames,allowobfuscation interface * {
--keepattributes AnnotationDefault
-
-# Retain service method parameters when optimizing.
--keepclassmembers,allowshrinking,allowobfuscation interface * {
     @retrofit2.http.* <methods>;
 }
-
 # Ignore annotation used for build tooling.
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-
-# Ignore JSR 305 annotations for embedding nullability information.
--dontwarn javax.annotation.**
-
-# Guarded by a NoClassDefFoundError try/catch and only used when on the classpath.
--dontwarn kotlin.Unit
-
-# Top-level functions that can only be used by Kotlin.
--dontwarn retrofit2.KotlinExtensions
--dontwarn retrofit2.KotlinExtensions$*
-
-# With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy
-# and replaces all potential values with null. Explicitly keeping the interfaces prevents this.
--if interface * { @retrofit2.http.* <methods>; }
--keep,allowobfuscation interface <1>
-
-# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
--keep,allowobfuscation,allowshrinking interface retrofit2.Call
--keep,allowobfuscation,allowshrinking class retrofit2.Response
-
-# With R8 full mode generic signatures are stripped for classes that are not
-# kept. Suspend functions are wrapped in continuations where the type argument
-# is used.
--keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation

ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt

@@ -142,15 +142,13 @@ class TrackViewHolder(val view: View) :
 
         // Listen for rating updates
         rxBusSubscription!! += RxBus.ratingPublishedObservable.subscribe {
-            launch(Dispatchers.Main) {
+            // Ignore updates which are not for the current song
-                // Ignore updates which are not for the current song
+            if (it.id != song.id) return@subscribe
-                if (it.id != song.id) return@launch
 
-                if (it.rating is HeartRating) {
+            if (it.rating is HeartRating) {
-                    updateSingleStar(it.rating.isHeart)
+                updateSingleStar(it.rating.isHeart)
-                } else if (it.rating is StarRating) {
+            } else if (it.rating is StarRating) {
-                    updateFiveStars(it.rating.starRating.toInt())
+                updateFiveStars(it.rating.starRating.toInt())
-                }
             }
         }
     }