From 28fafaaf5f9546eb23504d5ad5f90c236d32ba5f Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:58:55 +0200
Subject: [PATCH] 1.6.6

---
 app/build.gradle                              |  4 +-
 .../com/deniscerri/ytdlnis/util/InfoUtil.kt   |  2 +-
 .../main/res/drawable/baseline_draw_24.xml    |  5 ++
 .../res/drawable/baseline_security_24.xml     |  5 ++
 app/src/main/res/values/arrays.xml            |  6 ++
 app/src/main/res/xml/locales_config.xml       |  6 ++
 app/src/main/res/xml/root_preferences.xml     | 20 ++++++
 .../android/en-US/changelogs/10640.txt        | 69 +++++++++++++++++++
 .../android/en-US/changelogs/10650.txt        | 27 ++++++++
 .../android/en-US/changelogs/10660.txt        | 42 +++++++++++
 .../android/en-US/full_description.txt        | 42 +++++++----
 11 files changed, 213 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_draw_24.xml
 create mode 100644 app/src/main/res/drawable/baseline_security_24.xml
 create mode 100644 fastlane/metadata/android/en-US/changelogs/10640.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/10650.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/10660.txt

diff --git a/app/build.gradle b/app/build.gradle
index 2c2a1c42..2609418d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ plugins {
 def properties = new Properties()
 def versionMajor = 1
 def versionMinor = 6
-def versionPatch = 5
-def versionBuild = 4 // bump for dogfood builds, public betas, etc.
+def versionPatch = 6
+def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 def versionExt = ""
 
 if (versionBuild > 0){
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt
index 10b75b7a..5aae813b 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt
@@ -1286,7 +1286,7 @@ class InfoUtil(private val context: Context) {
                     request.addOption("--write-subs")
                     request.addOption("--write-auto-subs")
                     request.addOption("--sub-format", "${subFormat}/best")
-                    request.addOption("--convert-subtitles", "srt")
+                    request.addOption("--convert-subtitles", subFormat ?: "srt")
                     if (!downloadItem.videoPreferences.embedSubs) {
                         request.addOption("--sub-langs", downloadItem.videoPreferences.subsLanguages.ifEmpty { "en.*,.*-orig" })
                     }
diff --git a/app/src/main/res/drawable/baseline_draw_24.xml b/app/src/main/res/drawable/baseline_draw_24.xml
new file mode 100644
index 00000000..1ecb8e26
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_draw_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:colorAccent" android:pathData="M18.85,10.39l1.06,-1.06c0.78,-0.78 0.78,-2.05 0,-2.83L18.5,5.09c-0.78,-0.78 -2.05,-0.78 -2.83,0l-1.06,1.06L18.85,10.39zM13.19,7.56L4,16.76V21h4.24l9.19,-9.19L13.19,7.56zM19,17.5c0,2.19 -2.54,3.5 -5,3.5c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1c1.54,0 3,-0.73 3,-1.5c0,-0.47 -0.48,-0.87 -1.23,-1.2l1.48,-1.48C18.32,15.45 19,16.29 19,17.5zM4.58,13.35C3.61,12.79 3,12.06 3,11c0,-1.8 1.89,-2.63 3.56,-3.36C7.59,7.18 9,6.56 9,6c0,-0.41 -0.78,-1 -2,-1C5.74,5 5.2,5.61 5.17,5.64C4.82,6.05 4.19,6.1 3.77,5.76C3.36,5.42 3.28,4.81 3.62,4.38C3.73,4.24 4.76,3 7,3c2.24,0 4,1.32 4,3c0,1.87 -1.93,2.72 -3.64,3.47C6.42,9.88 5,10.5 5,11c0,0.31 0.43,0.6 1.07,0.86L4.58,13.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_security_24.xml b/app/src/main/res/drawable/baseline_security_24.xml
new file mode 100644
index 00000000..1adcf488
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_security_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:colorAccent" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
+</vector>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5f318230..88f01753 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -113,6 +113,8 @@
         <item>es</item>
         <item>fa</item>
         <item>fr</item>
+        <item>hi</item>
+        <item>hr</item>
         <item>in</item>
         <item>it</item>
         <item>ja</item>
@@ -120,6 +122,7 @@
         <item>lv</item>
         <item>ms</item>
         <item>nb</item>
+        <item>nn</item>
         <item>pa</item>
         <item>pl</item>
         <item>pt</item>
@@ -127,6 +130,9 @@
         <item>ru</item>
         <item>ro</item>
         <item>sq</item>
+        <item>ta</item>
+        <item>te</item>
+        <item>th</item>
         <item>tr</item>
         <item>ta</item>
         <item>uk</item>
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index 247076fb..b2867ef4 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -10,6 +10,8 @@
     <locale android:name="es"/>
     <locale android:name="fa-IR"/>
     <locale android:name="fr"/>
+    <locale android:name="hi"/>
+    <locale android:name="hr"/>
     <locale android:name="in"/>
     <locale android:name="it"/>
     <locale android:name="ja"/>
@@ -17,6 +19,7 @@
     <locale android:name="lv"/>
     <locale android:name="ms"/>
     <locale android:name="nb-NO"/>
+    <locale android:name="nn"/>
     <locale android:name="pa"/>
     <locale android:name="pl"/>
     <locale android:name="pt"/>
@@ -24,6 +27,9 @@
     <locale android:name="ru"/>
     <locale android:name="ro-RO"/>
     <locale android:name="sq-AL"/>
+    <locale android:name="ta"/>
+    <locale android:name="te"/>
+    <locale android:name="th"/>
     <locale android:name="tr-TR"/>
     <locale android:name="ta-IN"/>
     <locale android:name="uk"/>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index b717e833..7b1d918c 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -69,6 +69,26 @@
                 android:data="https://hosted.weblate.org/projects/ytdlnis/" />
         </Preference>
 
+        <Preference
+            app:icon="@drawable/baseline_security_24"
+            app:key="security"
+            app:summary="🔐 YTDLnis - Privacy Policy"
+            app:title="SECURITY">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://github.com/deniscerri/ytdlnis/blob/main/SECURITY.md" />
+        </Preference>
+
+        <Preference
+            app:icon="@drawable/baseline_draw_24"
+            app:key="license"
+            app:summary="GNU General Public License v3.0"
+            app:title="LICENSE">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://github.com/deniscerri/ytdlnis/blob/main/LICENSE" />
+        </Preference>
+
         <Preference
             app:icon="@drawable/ic_code"
             app:key="rreth"
diff --git a/fastlane/metadata/android/en-US/changelogs/10640.txt b/fastlane/metadata/android/en-US/changelogs/10640.txt
new file mode 100644
index 00000000..2ecb6391
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/10640.txt
@@ -0,0 +1,69 @@
+Notice
+Its suggested you backup your settings and history in case the app crashes on update, because this is a huge update.
+
+
+Added Preferred Audio Format ID
+fixed korean bad strings
+fixed please wait card not showing up
+fixed audio format using mp4 containers
+added portugese language
+added punjabi language
+added greek language
+fixed container not updating in multi select card
+fixed swipe to delete bug in the queued section
+added download now option when u highlight only scheduled items in the context menu
+tapping on the errored notification will send you to errored tab, if you have logs disabled. If logs on it will send u to the log
+added preferred format ordering. By ID, FILESIZE, CONTAINER. Formats grouped by container will also be sorted by filesize
+fixed app not showing formats when u try to modify a current download item and its a different type (audio formats not showing if its a video type and vice versa)
+fixed app showing generic formats in cases where the format length was the same as that of generic formats (silly mistake)
+made the app store static strings for 'best' and 'worst' so that there isnt any confusion when u try to change the language and the stored downloads will have the other language's string
+added collected filesize on top of the download queue
+potentially fixed app not crashing when going to queued screen? idk
+fixed app not moving files when its a fresh install and u havent tried to change the download path.
+added download retries options [--retries and --fragment-retries]
+made the download logs not freeze the app
+download logs will work on quick downloaded items that were later updated
+added app arch and build type in the about section
+added "force-keyframes-at-cuts" preference
+Added download type in logs
+fix video not showing in cut screen. This depends on the streaming url
+fixed xhamster not showing results
+long press download button to save it for later and not schedule it. Also works when u try to queue multiple items
+change app icon background based on theme
+fixed bug when trying to redownload a history item and wanting to use a different type
+made the scheduled item auto-update after its queued so the app doesnt have to update when it begins downloading
+some fixes with output templates
+fixed container and vcodec being saved with translated strings and not constants
+added download thumbnail functionality. Click the result card in the middle and use the video player. Also observe running and queued downloads for that item
+added feature to disable thumbnails on certain screens. U can choose of course
+added feature to convert subs to different formats
+added youtube music search provider
+made app name have a color depending on the theme
+fixed format card not showing a translated string on best and worst strings
+added ability to hide the terminal from the share menu
+fixed app killing active downloads when removing a queued item
+fixed filename template not showing uploader on odysee
+added orange theme (its like yellow but slightly darker)
+fixed cookies not getting saved on older droids
+fixed app making new folder instead of merging when moving files
+added ability to put multiple preferred format ids separated by commas for both audio and video
+added support for piped links and treat them like youtube links
+fixed bug where if an item has no formats and you update audio formats and then go to video tab it will not show the video formats too
+made from and to textboxes wider in the cut video screen depending on the timestamp length
+added search engines in the search view
+removed filename template override if the user leaves it empty. Now it follows the yt-dlp default
+fixed app crashing sometimes when its tablet
+added drag handle to scrolling content
+added pause functionality [This is somewhat wonky because the YT-DLP python process doesnt finish quick enough. So dont spam pause resume]
+made video player faster to load for youtube videos
+Added option to turn off usage of cookies
+some fixes with the cut screen
+Added ability to save command templates as extra commands by default on every downloadcard/AddExtraCommandsDialog
+fixed app not saving the proper youtube link and having to refetch data unnecessarily
+fixed app scrolling in the tablayout in the download queue screen while you are dragging the vertical scrollbar
+fixed app not destroying active downloads when you terminate the app
+added rewind button in the cut section
+fixed play button appearing in cut section when the video is playing
+removed "Downloading" word in the preferences screen. Its Downloads now
+Added embed metadata preference. Turning it off will remove any embedding metadata and parsing metadata commands
+other small stuff
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10650.txt b/fastlane/metadata/android/en-US/changelogs/10650.txt
new file mode 100644
index 00000000..1ca2a13c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/10650.txt
@@ -0,0 +1,27 @@
+App can now be used as share method in Facebook Mod
+extracommand preference will be ignored in backups
+if you have command as preferred download type, it wont fetch info first even if you are not in quick download mode
+if you are in landscape the card doesnt show fully, fixed
+cookies import not working, fixed
+landscape video player in home screen fits better now
+fixed monochome icon being gone
+added yt-dlp auto update option in the settings
+fixed bilibili videos not working in normal mode
+added codec preference h264, h265, av1, avc, vp9
+fixed app not enabling ok button in the cut screen if you change the TO text box only
+added force keyframes at cuts switch in the cut screen
+Added 3 dots in multiple download card. It will have the configure chips in a separate card. Each will have a callback that will update all items in multiple download
+fixed start end textboxes showing truncanted text in playlist select card
+add ability to start a download now and put the rest of the queue behind it
+Scrollbar handle shrinked depending on size. Made it same size
+Fixed Tapping the notification of the errored download leading to the running tab instead of errored
+Set different icon for terminal in share menu
+ignored extra command preference in backups of command templates
+made preference titles be multiline if they are too long
+fixed cookies import not working from external sources other than the app
+fixed app using continue button for a split second when there are no paused downloads
+added state in home screen so that it wont populate trending videos while its searching for an item
+implemented batch downloads in a single worker to avoid bogging down the system with many work requests
+fixed instagram status that have multiple videos just using the first video
+fixed bilibili not working in normal mode
+fixed app overwriting files instead of adding (1) in the filename instead
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10660.txt b/fastlane/metadata/android/en-US/changelogs/10660.txt
new file mode 100644
index 00000000..3c7f6753
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/10660.txt
@@ -0,0 +1,42 @@
+added saved downloads in the settings backup
+made icon bigger in downloading notification
+fixed notification cancel and pausing not working
+fixed app respecting preferred home screen for downloads and more
+removed 000001 in the end of the file if the user has made only one cut
+removed log id from downloads if the user deleted the log
+fixed app crashing when it was listing logs with large texts
+fixed case: if the user had multiple preferred audio formats the app would choose the last one and not the first
+added ability to combine preferred audio formats by writing like 140+251,250. If the download item finds both first audio formats it will merge them together, otherwise get one of them that is available
+fixed app file transfer not working. (had to revert to hidden cache folder as downloads folder wasnt good for some phones)
+fixed app saving as mkv even though mp4 is set as container
+added shortcuts button to the commands tab so you can drop shortcuts to the current command.
+added syntax highlighting in commands tab textbox
+fixed tiktok videos not saving properly
+fixed open file intent
+added hindi language
+added croatian language
+added norwegian language
+added tamil language
+added telugu language
+added thai language
+added readme in azerbajani
+added security.md
+added ability to show preferred audio / video format ids as a generic format in the format list if the item has no formats available
+fixed multi select dialog in the settings not having the same material color as the rest of the system
+fixed navbar being black and not the same color as main activity in the settings activity
+added license to the app info
+added security to the app info
+fixed app not converting subtitle formats
+fixed app retaining terminal state when going to landscape
+made log text stretch horizontally like terminal
+more small stuff
+Added ability to combine all possible combinations of preferred video formats, audio formats, codex and container.
+The app will consider all preferred video ids. For each of them it will consider preferred vcodec and extension. At the same time for each of those elements it will consider all preferred audio commands and/or audio merge. If the format is a generic quality like 1080p or 720p it will also consider that in the long format query. Also the app will add all combos of video + audio only. And all combos of all video + best audio. All video ids alone and best as final fallback. If the user chooses a proper format, the app will not be this descriptive. Preferred video id and audio id combos will only apply on a quick download or best quality generic download
+Added Download Scheduling
+When on the app will only download depending on the time period you have set
+If you turn off scheduling, the app will check for leftover downloads waiting and will immediately start them
+If you manually set a time to download, it will ignore the scheduling period. This period only applies to normal downloads that have no set download time
+The setting is in the downloading section
+Added ability to not use internal storage caching if you have all files access
+This is useful if you are downloading livestreams and u dont have to move files from cache in the settings anymore
+If u are having write permission errors, turn caching back on so the app will use transferring instead
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index f6a47f6b..c740938e 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,20 +1,38 @@
-download audio/video files from more than 1000 websites using yt-dlp
-download playlists or multi select items
+download audio/video files from more than 1000 websites
+process playlists
+edit every playlist item separately just like in a normal download item.
+select a common format for all items and/or select multiple audio formats in case you are downloading them as a video
+select a download path for all items
+select a filename template for all items
+batch update download type to audio/video/custom command in one click
 queue downloads and schedule them by date and time
-use custom commands and templates or go full terminal mode
-remove sponsorblock chapters
+you can also schedule multiple items at the same time
+download multiple items at the same time
+use custom commands and templates or go full yt-dlp mode with a built in terminal
+you can backup and restore templates, so you can share with your buddies
+COOKIES support. Log in with your accounts and download private/unavailable videos, unlock premium formats etc.
+cut videos based on timestamps and video chapters (This yt-dlp feature is experimental on the original project)
+you can make unlimited cuts
+remove sponsorblock elements from the item
+embed them as a chapters in your video
 embed subtitles/metadata/chapters etc
 modify metadata such as title and author
 split item into separate files depending on its chapters
 select different download formats
-process multiple items before download
-quick share card right from the share menu
+bottom card right from the share menu, no need to open the app
+you can create a txt file and fill it with links/playlists/search queries separate by a new line and the app will process them
 search or insert a link from the app
-log downloads
+you can stack searches so you can process them at the same time
+log downloads in case of problems
 re-download cancelled or failed downloads
-incognito mode when you don't want to save a download history
-download multiple items at the same time
-change preferred audio/video formats and qualities
+you can use gestures to swipe left to redownload and right to delete
+you can long click the redownload button in the details sheet to show the download card for more functionality
+incognito mode when you don't want to save a download history or logs
+quick download mode
+download immediately without having to wait for data to process. Turn off the bottom card and it will instantly start
+open / share downloaded files right from the finished notification
+most yt-dlp features are implemented, suggestions are welcome
 Material You interface
-MVVM Architecture w/ WorkManager
-easy to use :)
\ No newline at end of file
+Theming options
+Backup and restore features. (Almost everything can be backed up)
+MVVM Architecture w/ WorkManager
\ No newline at end of file