From 7c256782118997ce4d4c9476b30a40da67005160 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Mon, 10 Mar 2025 22:12:17 +0100
Subject: [PATCH] Subgroup sub image url, ImageVariable default error icon on
 fail to load

---
 .../mainactivity/main/SubscriptionGroupFragment.kt   |  2 ++
 .../com/futo/platformplayer/models/ImageVariable.kt  | 12 ++++++++++--
 app/src/stable/assets/sources/spotify                |  2 +-
 app/src/stable/assets/sources/youtube                |  2 +-
 app/src/unstable/assets/sources/spotify              |  2 +-
 app/src/unstable/assets/sources/youtube              |  2 +-
 dep/polycentricandroid                               |  2 +-
 7 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt
index 9fd4d7d6..a2875647 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt
@@ -256,6 +256,8 @@ class SubscriptionGroupFragment : MainFragment() {
                             val sub = StateSubscriptions.instance.getSubscription(sub) ?: StateSubscriptions.instance.getSubscriptionOther(sub);
                             if(sub != null && sub.channel.thumbnail != null) {
                                 g.image = ImageVariable.fromUrl(sub.channel.thumbnail!!);
+                                if(g.image != null)
+                                    g.image!!.subscriptionUrl = sub.channel.url;
                                 g.image?.setImageView(_imageGroup);
                                 g.image?.setImageView(_imageGroupBackground);
                                 break;
diff --git a/app/src/main/java/com/futo/platformplayer/models/ImageVariable.kt b/app/src/main/java/com/futo/platformplayer/models/ImageVariable.kt
index 1de1f917..00594df7 100644
--- a/app/src/main/java/com/futo/platformplayer/models/ImageVariable.kt
+++ b/app/src/main/java/com/futo/platformplayer/models/ImageVariable.kt
@@ -7,6 +7,7 @@ import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.futo.platformplayer.PresetImages
 import com.futo.platformplayer.R
+import com.futo.platformplayer.logging.Logger
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Transient
 import java.io.File
@@ -18,7 +19,8 @@ data class ImageVariable(
     @Transient
     @Contextual
     private val bitmap: Bitmap? = null,
-    val presetName: String? = null) {
+    val presetName: String? = null,
+    var subscriptionUrl: String? = null) {
 
     @SuppressLint("DiscouragedApi")
     fun setImageView(imageView: ImageView, fallbackResId: Int = -1) {
@@ -63,7 +65,13 @@ data class ImageVariable(
             return ImageVariable(null, null, null, str);
         }
         fun fromFile(file: File): ImageVariable {
-            return ImageVariable.fromBitmap(BitmapFactory.decodeFile(file.absolutePath));
+            try {
+                return ImageVariable.fromBitmap(BitmapFactory.decodeFile(file.absolutePath));
+            }
+            catch(ex: Throwable) {
+                Logger.e("ImageVariable", "Unsupported image format? " + ex.message, ex);
+                return fromResource(R.drawable.ic_error_pred);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/stable/assets/sources/spotify b/app/src/stable/assets/sources/spotify
index 0d05e35c..9c36c457 160000
--- a/app/src/stable/assets/sources/spotify
+++ b/app/src/stable/assets/sources/spotify
@@ -1 +1 @@
-Subproject commit 0d05e35cfc81acfa78594c91c381b79694aaf86d
+Subproject commit 9c36c457463fc2a452f76eb74465e9e234cdaf69
diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index 857c147b..6e0fe924 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 857c147b3a3d3e9d0a79c47f1bd5813e08ed2daf
+Subproject commit 6e0fe9245143336a31954d678cdd22cbc3e0e115
diff --git a/app/src/unstable/assets/sources/spotify b/app/src/unstable/assets/sources/spotify
index 0d05e35c..9c36c457 160000
--- a/app/src/unstable/assets/sources/spotify
+++ b/app/src/unstable/assets/sources/spotify
@@ -1 +1 @@
-Subproject commit 0d05e35cfc81acfa78594c91c381b79694aaf86d
+Subproject commit 9c36c457463fc2a452f76eb74465e9e234cdaf69
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index 857c147b..6e0fe924 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 857c147b3a3d3e9d0a79c47f1bd5813e08ed2daf
+Subproject commit 6e0fe9245143336a31954d678cdd22cbc3e0e115
diff --git a/dep/polycentricandroid b/dep/polycentricandroid
index 44edd69e..f87f00ab 160000
--- a/dep/polycentricandroid
+++ b/dep/polycentricandroid
@@ -1 +1 @@
-Subproject commit 44edd69ece9cac4a6dd95a84ca91299e44f3650a
+Subproject commit f87f00ab9e1262e300246b8963591bdf3a8fada7