diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/ManagerChangelogFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/ManagerChangelogFragment.kt index c2bcf3df..b7f002e2 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/ManagerChangelogFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/ManagerChangelogFragment.kt @@ -8,8 +8,9 @@ import android.widget.TextView import androidx.fragment.app.Fragment import com.vanced.manager.R import com.vanced.manager.utils.InternetTools +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking class ManagerChangelogFragment : Fragment() { @@ -22,11 +23,9 @@ class ManagerChangelogFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - runBlocking { - launch { - val changelog = InternetTools.getObjectFromJson("https://x1nto.github.io/VancedFiles/manager.json", "changelog") - view.findViewById(R.id.manager_changelog).text = changelog - } + CoroutineScope(Dispatchers.IO).launch { + val changelog = InternetTools.getObjectFromJson("https://x1nto.github.io/VancedFiles/manager.json", "changelog") + view.findViewById(R.id.manager_changelog).text = changelog } } } diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/MicrogChangelogFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/MicrogChangelogFragment.kt index 62651d1d..d9428ad4 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/MicrogChangelogFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/MicrogChangelogFragment.kt @@ -9,8 +9,9 @@ import androidx.fragment.app.Fragment import androidx.preference.PreferenceManager import com.vanced.manager.R import com.vanced.manager.utils.InternetTools +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking class MicrogChangelogFragment : Fragment() { @@ -23,12 +24,9 @@ class MicrogChangelogFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - runBlocking { - launch { - val baseUrl = PreferenceManager.getDefaultSharedPreferences(activity).getString("install_url", InternetTools.baseUrl) - - view.findViewById(R.id.microg_changelog).text = InternetTools.getObjectFromJson("$baseUrl/microg.json", "changelog") - } + CoroutineScope(Dispatchers.IO).launch { + val baseUrl = PreferenceManager.getDefaultSharedPreferences(activity).getString("install_url", InternetTools.baseUrl) + view.findViewById(R.id.microg_changelog).text = InternetTools.getObjectFromJson("$baseUrl/microg.json", "changelog") } } } diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/VancedChangelogFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/VancedChangelogFragment.kt index e64445e0..b1b65a1a 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/VancedChangelogFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/VancedChangelogFragment.kt @@ -9,8 +9,9 @@ import androidx.fragment.app.Fragment import androidx.preference.PreferenceManager import com.vanced.manager.R import com.vanced.manager.utils.InternetTools +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking class VancedChangelogFragment : Fragment() { @@ -23,14 +24,12 @@ class VancedChangelogFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - runBlocking { - launch { - val vancedVersion = activity?.let { InternetTools.getJsonString("vanced.json", "version", it).replace('.', '_') } - val baseUrl = PreferenceManager.getDefaultSharedPreferences(activity).getString("install_url", InternetTools.baseUrl) + CoroutineScope(Dispatchers.IO).launch { + val vancedVersion = activity?.let { InternetTools.getJsonString("vanced.json", "version", it).replace('.', '_') } + val baseUrl = PreferenceManager.getDefaultSharedPreferences(activity).getString("install_url", InternetTools.baseUrl) - val changelog = InternetTools.getObjectFromJson("$baseUrl/changelog/$vancedVersion.json", "message") - view.findViewById(R.id.vanced_changelog).text = changelog - } + val changelog = InternetTools.getObjectFromJson("$baseUrl/changelog/$vancedVersion.json", "message") + view.findViewById(R.id.vanced_changelog).text = changelog } } }