From ca6196da5445c7e8dbb9654abb15bb16efe61754 Mon Sep 17 00:00:00 2001
From: archroid <archroid.dev@gmail.com>
Date: Thu, 17 Mar 2022 22:40:18 +0330
Subject: [PATCH] Fixed minor bugs

---
 .../java/com/github/libretube/Settings.kt     | 33 +++++++++++--------
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/xml/settings.xml             |  1 +
 3 files changed, 21 insertions(+), 15 deletions(-)

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 @@
     <string name="downloadfailed">Download Failed!</string>
     <string name="vlc">Open in VLC</string>
     <string name="vlcerror">Can\'t open in VLC. Maybe it\'s not installed yet?</string>
-    <string name="import_from_yt">Import subscriptions data from youtube</string>
+    <string name="import_from_yt">Import subscriptions from youtube</string>
 
 </resources>
\ 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 @@
     <androidx.preference.Preference
         app:key="import_from_yt"
         app:title="@string/import_from_yt"
+        android:hint="This is my hint"
         />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file