From 6d24a080757a3c88e5586a43b78c3c3b03a54b6c Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Sat, 11 Jul 2020 14:45:39 +0400
Subject: [PATCH] test 3

---
 .../manager/core/downloader/MicrogDownloadService.kt      | 3 ++-
 .../manager/core/downloader/VancedDownloadService.kt      | 2 ++
 .../com/vanced/manager/ui/fragments/URLChangeFragment.kt  | 7 ++++++-
 .../vanced/manager/ui/fragments/UpdateCheckFragment.kt    | 3 ++-
 .../main/java/com/vanced/manager/utils/InternetTools.kt   | 8 +++++++-
 5 files changed, 19 insertions(+), 4 deletions(-)

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 b6f9b10e..9d8bbe11 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
@@ -5,6 +5,7 @@ import android.app.Service
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.net.Uri
 import android.os.IBinder
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
@@ -28,7 +29,7 @@ class MicrogDownloadService: Service() {
     private var downloadId: Long = 0
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        registerReceiver(receiver, null)
+        registerReceiver(receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
         downloadMicrog()
         stopSelf()
         return START_NOT_STICKY
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 a897d396..5e23a711 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
@@ -5,6 +5,7 @@ import android.app.Service
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.net.Uri
 import android.os.Build
 import android.os.IBinder
@@ -31,6 +32,7 @@ class VancedDownloadService: Service() {
     private var apkType: String = "arch"
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        registerReceiver(receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
         downloadSplits()
         stopSelf()
         return START_NOT_STICKY
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/URLChangeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/URLChangeFragment.kt
index 58fcb8a3..1cc5f8c7 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/URLChangeFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/URLChangeFragment.kt
@@ -31,7 +31,12 @@ class URLChangeFragment : DialogFragment() {
         val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
         urlField.hint = prefs.getString("install_url", baseUrl)
         view.findViewById<MaterialButton>(R.id.url_save).setOnClickListener {
-            prefs.edit().putString("install_url", urlField.text.toString()).apply()
+            if (urlField.text.endsWith("/"))
+                prefs.edit().putString("install_url", urlField.text.removeSuffix("/").toString()).apply()
+
+            if (!urlField.text.startsWith("https://"))
+                prefs.edit().putString("install_url", "https://${urlField.text}").apply()
+
             dismiss()
         }
         view.findViewById<MaterialButton>(R.id.url_reset).setOnClickListener {
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt
index 6cd31bfb..a6b32dbb 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt
@@ -5,6 +5,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Context.DOWNLOAD_SERVICE
 import android.content.Intent
+import android.content.IntentFilter
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
@@ -45,7 +46,7 @@ class UpdateCheckFragment : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        activity?.registerReceiver(receiver, null)
+        activity?.registerReceiver(receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
         checkUpdates()
         view.findViewById<Button>(R.id.update_center_dismiss).setOnClickListener { dismiss() }
         view.findViewById<MaterialButton>(R.id.update_center_recheck).setOnClickListener{ checkUpdates() }
diff --git a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
index 4c54912c..6d77c894 100644
--- a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
+++ b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
@@ -46,15 +46,17 @@ object InternetTools {
         client.newCall(request).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
                 toReturn = 0
+                returnVal(toReturn)
             }
 
             override fun onResponse(call: Call, response: Response) {
                 toReturn = JSONObject(response.body?.string()!!).getInt(obj)
+                returnVal(toReturn)
                 Log.d("VMResponse", toReturn.toString())
             }
-
         })
 
+        Log.d("VMResponse", toReturn.toString())
         return toReturn
     }
 
@@ -80,6 +82,10 @@ object InternetTools {
         return toReturn
     }
 
+    fun returnVal(value: Any): Any {
+        return value
+    }
+
     fun isUpdateAvailable(): Boolean {
         val checkUrl = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/manager.json")
         val remoteVersion = checkUrl.get("versionCode").asInt