Fix/keep model keys on release (#146)

android/build.gradle

@@ -2,23 +2,23 @@ group 'de.minimalme.spotify_sdk'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
     }
 }

android/src/main/kotlin/de/minimalme/spotify_sdk/SpotifySdkPlugin.kt

@@ -45,6 +45,7 @@ class SpotifySdkPlugin : MethodCallHandler, FlutterPlugin, ActivityAware, Plugin
     // method channel
     private var methodChannel: MethodChannel? = null
     private val channelName = "spotify_sdk"
+    private val loggingTag = "spotify_sdk"
 
     // event channels
     private var playerContextChannel : EventChannel? = null
@@ -236,12 +237,18 @@ class SpotifySdkPlugin : MethodCallHandler, FlutterPlugin, ActivityAware, Plugin
                     object : ConnectionListener {
                         override fun onConnected(spotifyAppRemoteValue: SpotifyAppRemote) {
                             spotifyAppRemote = spotifyAppRemoteValue
+
                             playerContextChannel?.setStreamHandler(PlayerContextChannel(spotifyAppRemote!!.playerApi))
+                            Log.i(loggingTag, "Set stream handler for PlayerContextChannel")
                             playerStateChannel?.setStreamHandler(PlayerStateChannel(spotifyAppRemote!!.playerApi))
+                            Log.i(loggingTag, "Set stream handler for PlayerStateChannel")
                             capabilitiesChannel?.setStreamHandler(CapabilitiesChannel(spotifyAppRemote!!.userApi))
+                            Log.i(loggingTag, "Set stream handler for CapabilitiesChannel")
                             userStatusChannel?.setStreamHandler(UserStatusChannel(spotifyAppRemote!!.userApi))
-
+                            Log.i(loggingTag, "Set stream handler for UserStatusChannel")
                             initiallyConnected = true
+
+                            Log.i(loggingTag, "App Remote successfully connected")
                             // emit connection established event
                             connStatusEventChannel(ConnectionStatusChannel.ConnectionEvent(true, "Successfully connected to Spotify.", null, null))
                             // method success
@@ -297,7 +304,7 @@ class SpotifySdkPlugin : MethodCallHandler, FlutterPlugin, ActivityAware, Plugin
                                     errorCode = errorConnection
                                 }
                             }
-                            Log.e("SPOTIFY_SDK", errorMessage)
+                            Log.e(loggingTag, errorMessage)
                             // notify plugin
                             if (initiallyConnected) {
                                 // emit connection error event

android/src/main/kotlin/de/minimalme/spotify_sdk/subscriptions/ConnectionStatusChannel.kt

@@ -1,12 +1,19 @@
 package de.minimalme.spotify_sdk.subscriptions
 
+import android.util.Log
 import com.google.gson.Gson
+import com.google.gson.annotations.SerializedName
 import io.flutter.plugin.common.EventChannel
 import kotlinx.event.SetEvent
 
 class ConnectionStatusChannel(private val connStatusStream: SetEvent<ConnectionEvent>) : EventChannel.StreamHandler {
 
-    data class ConnectionEvent(val connected: Boolean, val message: String, val errorCode: String?, val errorDetails: Any?)
+    data class ConnectionEvent(
+            @SerializedName("connected") val connected: Boolean,
+            @SerializedName("message" )val message: String,
+            @SerializedName("errorCode") val errorCode: String?,
+            @SerializedName("errorDetails") val errorDetails: Any?
+            )
 
     override fun onListen(arguments: Any?, events: EventChannel.EventSink?) {
         connStatusStream += { event ->

example/android/build.gradle

@@ -1,20 +1,20 @@
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

example/lib/logging/custom_log_filter.dart

@@ -0,0 +1,8 @@
+import 'package:logger/logger.dart';
+
+class CustomLogFilter extends LogFilter {
+  @override
+  bool shouldLog(LogEvent event) {
+    return true;
+  }
+}

example/lib/main.dart

@@ -33,7 +33,17 @@ class Home extends StatefulWidget {
 class _HomeState extends State<Home> {
   bool _loading = false;
   bool _connected = false;
-  final Logger _logger = Logger();
+  final Logger _logger = Logger(
+    //filter: CustomLogFilter(), // custom logfilter can be used to have logs in release mode
+    printer: PrettyPrinter(
+      methodCount: 2, // number of method calls to be displayed
+      errorMethodCount: 8, // number of method calls if stacktrace is provided
+      lineLength: 120, // width of the output
+      colors: true, // Colorful log messages
+      printEmojis: true, // Print an emoji for each log message
+      printTime: true,
+    ),
+  );
 
   CrossfadeState? crossfadeState;
   late ImageUri? currentTrackImageUri;

example/pubspec.yaml

@@ -10,7 +10,7 @@ dependencies:
     sdk: flutter
   logger: ^1.1.0
   flutter_dotenv: ^5.0.2
-  cupertino_icons: ^1.0.3
+  cupertino_icons: ^1.0.4
 
 dev_dependencies:
   flutter_test:

lib/logging/custom_log_filter.dart

@@ -0,0 +1,8 @@
+import 'package:logger/logger.dart';
+
+class CustomLogFilter extends LogFilter {
+  @override
+  bool shouldLog(LogEvent event) {
+    return true;
+  }
+}