Merge pull request libre-tube#7368 from FineFindus/fix/export-subs

FineFindus · web-flow · commit 46e0d2625607 · 2025-05-01T15:54:09.000+02:00
fix(Backup): use channel URL for subscription export
diff --git a/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt b/app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
@@ -110,7 +110,7 @@ object ImportHelper {
         when (importFormat) {
             ImportFormat.NEWPIPE -> {
                 val newPipeChannels = subs.map {
-                    NewPipeSubscription(it.name, 0, "$YOUTUBE_FRONTEND_URL${it.url}")
+                    NewPipeSubscription(it.name, 0, "$YOUTUBE_FRONTEND_URL/channel/${it.url}")
                 }
                 val newPipeSubscriptions = NewPipeSubscriptions(subscriptions = newPipeChannels)
                 activity.contentResolver.openOutputStream(uri)?.use {
@@ -123,7 +123,7 @@ object ImportHelper {
                     FreetubeSubscription(
                         it.name,
                         "",
-                        "$YOUTUBE_FRONTEND_URL${it.url}"
+                        "$YOUTUBE_FRONTEND_URL/channel/${it.url}"
                     )
                 }
                 val freeTubeSubscriptions = FreetubeSubscriptions(subscriptions = freeTubeChannels)

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ object ImportHelper {`
`110`	`110`	`when (importFormat) {`
`111`	`111`	`ImportFormat.NEWPIPE -> {`
`112`	`112`	`val newPipeChannels = subs.map {`
`113`		`- NewPipeSubscription(it.name, 0, "$YOUTUBE_FRONTEND_URL${it.url}")`
	`113`	`+ NewPipeSubscription(it.name, 0, "$YOUTUBE_FRONTEND_URL/channel/${it.url}")`
`114`	`114`	`}`
`115`	`115`	`val newPipeSubscriptions = NewPipeSubscriptions(subscriptions = newPipeChannels)`
`116`	`116`	`activity.contentResolver.openOutputStream(uri)?.use {`
`@@ -123,7 +123,7 @@ object ImportHelper {`
`123`	`123`	`FreetubeSubscription(`
`124`	`124`	`it.name,`
`125`	`125`	`"",`
`126`		`- "$YOUTUBE_FRONTEND_URL${it.url}"`
	`126`	`+ "$YOUTUBE_FRONTEND_URL/channel/${it.url}"`
`127`	`127`	`)`
`128`	`128`	`}`
`129`	`129`	`val freeTubeSubscriptions = FreetubeSubscriptions(subscriptions = freeTubeChannels)`