From 10be21c87538e5f5e2895353e5649e49b4409d6a Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Fri, 7 Aug 2020 11:07:49 +0400
Subject: [PATCH] added option to delete downloaded file

---
 .../manager/core/downloader/MicrogDownloadService.kt     | 1 +
 .../manager/core/downloader/VancedDownloadService.kt     | 1 +
 .../com/vanced/manager/ui/fragments/SettingsFragment.kt  | 9 +++++++++
 app/src/main/res/values/strings.xml                      | 4 +++-
 app/src/main/res/xml/preferences.xml                     | 4 ++++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt b/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
index 8e5151c5..b766ed03 100644
--- a/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
+++ b/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
@@ -33,6 +33,7 @@ class MicrogDownloadService: Service() {
     private fun downloadMicrog() {
         runBlocking {
             launch {
+                getExternalFilesDir("apk")?.delete()
                 val url = getObjectFromJson(
                     "${PreferenceManager.getDefaultSharedPreferences(this@MicrogDownloadService)
                         .getString("install_url", baseUrl)}/microg.json", "url"
diff --git a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
index 225647e9..dd6c06ce 100644
--- a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
+++ b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
@@ -41,6 +41,7 @@ class VancedDownloadService: Service() {
         val context = this
         runBlocking {
             launch {
+                getExternalFilesDir("apks")?.delete()
                 val defPrefs = PreferenceManager.getDefaultSharedPreferences(context)
                 val installUrl = defPrefs.getString("install_url", baseUrl)
                 val vancedVer = getObjectFromJson("$installUrl/vanced.json", "version")
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
index 0c1aaed0..7986c446 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
@@ -91,6 +91,15 @@ class SettingsFragment : PreferenceFragmentCompat() {
             true
         }
 
+        findPreference<Preference>("clear_files")?.setOnPreferenceClickListener {
+            with(requireActivity()) {
+                getExternalFilesDir("apk")?.delete()
+                getExternalFilesDir("apks")?.delete()
+                Toast.makeText(this, getString(R.string.cleared_files), Toast.LENGTH_SHORT)
+            }
+            true
+        }
+
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c148fb91..45a791dc 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,12 +49,14 @@
     <string name="accent_purple">Purple</string>
     <string name="accent_red">Red</string>
     <string name="accent_yellow">Yellow</string>
-    <string name="check_updates">Check for updates</string>
     <string name="category_interface">Interface</string>
     <string name="category_manager">Manager</string>
+    <string name="check_updates">Check for updates</string>
     <string name="chosen_install_values">Chosen installation preferences</string>
     <string name="chosen_lang">Language(s): %1$s</string>
     <string name="chosen_theme">Theme: %1$s</string>
+    <string name="clear_files">Clear downloaded files</string>
+    <string name="cleared_files">Successfully cleared files</string>
     <string name="link_title">Use Chrome Custom Tabs</string>
     <string name="link_custom_tabs">Links will open in Chrome Custom Tabs</string>
     <string name="link_external_browser">Links will open in an External Browser</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 57424920..135f1973 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -67,6 +67,10 @@
             android:title="@string/update_url"
             android:key="install_url" />
 
+        <Preference
+            android:title="@string/clear_files"
+            android:key="clear_files"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file