Merge pull request #308 from Automattic/fix/discover-artwork-scaling

Hotfix for Chromecast and discover image scaling

Author: ashiagr

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release notes
 
+### 7.21.1
+
+*   Bug Fixes:
+    *   Fix Chromecast not taking over playback after connection.
+        ([#308](https://github.com/Automattic/pocket-casts-android/pull/308)).
+    *   Fix the discover artwork scaling issue.
+        ([#308](https://github.com/Automattic/pocket-casts-android/pull/308)).
+
 ### 7.21.0
 
 *   Bug Fixes:    

dependencies.gradle

@@ -26,7 +26,7 @@ project.ext {
     applicationId = 'au.com.shiftyjelly.pocketcasts'
 
     versionCode = getVersionCode()
-    versionName = '7.21.0' + getVersionNameSuffix()
+    versionName = '7.21.1' + getVersionNameSuffix()
 
     // Android
     minSdkVersion = 23
@@ -153,8 +153,8 @@ project.ext {
             glide: "com.github.bumptech.glide:glide:$versionGlide",
             glideOkHttp: "com.github.bumptech.glide:okhttp3-integration:$versionGlide",
             glideCompile: "com.github.bumptech.glide:compiler:$versionGlide",
-            coil: "io.coil-kt:coil:2.2.0",
-            coilCompose: "io.coil-kt:coil-compose:2.2.0",
+            coil: "io.coil-kt:coil:2.2.1",
+            coilCompose: "io.coil-kt:coil-compose:2.2.1",
             // OkHttp (http client) - https://github.com/square/okhttp
             okHttp: "com.squareup.okhttp3:okhttp:4.9.3",
             okHttpLogging: "com.squareup.okhttp3:logging-interceptor:4.9.3",

modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/chromecast/CastManagerImpl.kt

@@ -1,6 +1,7 @@
 package au.com.shiftyjelly.pocketcasts.repositories.chromecast
 
 import android.content.Context
+import androidx.core.content.ContextCompat
 import au.com.shiftyjelly.pocketcasts.utils.log.LogBuffer
 import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.cast.framework.Session
@@ -23,7 +24,10 @@ class CastManagerImpl @Inject constructor(@ApplicationContext private val contex
     override val isConnectedObservable = BehaviorRelay.create<Boolean>().apply { accept(false) }
 
     init {
-        getSessionManager()?.addSessionManagerListener(sessionManagerListener)
+        val executor = ContextCompat.getMainExecutor(context)
+        CastContext.getSharedInstance(context, executor)
+            .addOnFailureListener { e -> LogBuffer.e(LogBuffer.TAG_PLAYBACK, "Failed to init CastContext shared instance ${e.message}") }
+            .addOnSuccessListener { castContext -> castContext.sessionManager.addSessionManagerListener(sessionManagerListener) }
     }
 
     override suspend fun isAvailable(): Boolean {