diff --git a/app/src/main/java/com/github/libretube/Settings.kt b/app/src/main/java/com/github/libretube/Settings.kt
index dcbf1494e..24da4abe6 100644
--- a/app/src/main/java/com/github/libretube/Settings.kt
+++ b/app/src/main/java/com/github/libretube/Settings.kt
@@ -40,30 +40,35 @@ class Settings : PreferenceFragmentCompat() {
override fun onCreate(savedInstanceState: Bundle?) {
- getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri ->
+ getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? ->
- var zipfile = ZipFile(UriUtils.uri2File(uri))
+ if(uri != null){
+ var zipfile = ZipFile(UriUtils.uri2File(uri))
- var zipentry =
- zipfile.getEntry("Takeout/YouTube and YouTube Music/subscriptions/subscriptions.csv")
+ var zipentry =
+ zipfile.getEntry("Takeout/YouTube and YouTube Music/subscriptions/subscriptions.csv")
- var inputStream = zipfile.getInputStream(zipentry)
+ var inputStream = zipfile.getInputStream(zipentry)
- val baos = ByteArrayOutputStream()
+ val baos = ByteArrayOutputStream()
- inputStream.use { it.copyTo(baos) }
+ inputStream.use { it.copyTo(baos) }
- var subscriptions = baos.toByteArray().decodeToString()
+ var subscriptions = baos.toByteArray().decodeToString()
- var subscribedCount = 0
+ var subscribedCount = 0
- for(text in subscriptions.lines()){
- if(text.take(24) != "Channel Id,Channel Url,C" && !text.take(24).isEmpty()){
- subscribe(text.take(24))
- subscribedCount++
- Log.d(TAG, "subscribed: " + text +" total: " + subscribedCount)
+ for(text in subscriptions.lines()){
+ if(text.take(24) != "Channel Id,Channel Url,C" && !text.take(24).isEmpty()){
+ subscribe(text.take(24))
+ subscribedCount++
+ Log.d(TAG, "subscribed: " + text +" total: " + subscribedCount)
+ }
}
+
+ Toast.makeText(context, "Subscribed to " + subscribedCount + " channels.", Toast.LENGTH_SHORT).show()
}
+
}
super.onCreate(savedInstanceState)
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5cabe1100..bb9f105fc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,6 +29,6 @@
Download Failed!
Open in VLC
Can\'t open in VLC. Maybe it\'s not installed yet?
- Import subscriptions data from youtube
+ Import subscriptions from youtube
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 8bf54d28c..b60f9c81e 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -33,6 +33,7 @@
\ No newline at end of file