From 68213c85564eb7c50d97f67649a48b9e5ba18885 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Sat, 8 Aug 2020 19:02:10 +0400
Subject: [PATCH] tiny fixes

---
 .../manager/ui/fragments/HomeFragment.kt      | 37 +++++++++++--------
 .../manager/ui/viewmodels/HomeViewModel.kt    |  3 +-
 .../res/layout/fragment_vanced_changelog.xml  | 11 +-----
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
index 262b2665..1102d93c 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
@@ -104,29 +104,34 @@ class HomeFragment : Fragment(), View.OnClickListener {
         when (v?.id) {
             R.id.vanced_installbtn -> {
                 if (!isInstallationRunning(requireActivity())) {
-                    if (variant == "nonroot" && !viewModel.microgInstalled.get()!!) {
-                        Snackbar.make(binding.homeRefresh, R.string.no_microg, Snackbar.LENGTH_LONG)
-                            .setAction(R.string.install) {
+                    if (!viewModel.fetching.get()!!) {
+                        if (variant == "nonroot" && !viewModel.microgInstalled.get()!!) {
+                            Snackbar.make(
+                                binding.homeRefresh,
+                                R.string.no_microg,
+                                Snackbar.LENGTH_LONG
+                            )
+                                .setAction(R.string.install) {
+                                    requireActivity().startService(
+                                        Intent(
+                                            requireActivity(),
+                                            MicrogDownloadService::class.java
+                                        )
+                                    )
+                                }.show()
+                        } else {
+                            if (prefs?.getBoolean("valuesModified", false)!!) {
                                 requireActivity().startService(
                                     Intent(
                                         requireActivity(),
-                                        MicrogDownloadService::class.java
+                                        VancedDownloadService::class.java
                                     )
                                 )
-                            }.show()
-                    } else {
-                        if (prefs?.getBoolean("valuesModified", false)!!) {
-                            requireActivity().startService(
-                                Intent(
-                                    requireActivity(),
-                                    VancedDownloadService::class.java
-                                )
-                            )
-                        } else {
-                            view?.findNavController()?.navigate(R.id.toInstallThemeFragment)
+                            } else {
+                                view?.findNavController()?.navigate(R.id.toInstallThemeFragment)
+                            }
                         }
                     }
-
                 } else
                     Toast.makeText(requireActivity(), R.string.installation_wait, Toast.LENGTH_SHORT)
 
diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt
index d488d0d3..4056810a 100644
--- a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt
+++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt
@@ -75,7 +75,7 @@ open class HomeViewModel(application: Application): AndroidViewModel(application
             microgInstalled.set(isPackageInstalled("com.mgoogle.android.gms", pm))
             vancedInstalled.set(isPackageInstalled(vancedPkgName, pm))
             vancedInstalledVersion.set(getPkgInfo(vancedInstalled.get()!!, vancedPkgName, getApplication()))
-            microgInstalledVersion.set(getPkgInfo(microgInstalled.get()!!, "com.mgoogle.android.gms", getApplication()))
+            microgInstalledVersion.set(getPkgInfo(microgInstalled.get()!!, "com.mgoogle.android.gms", getApplication()).removeSuffix("-vanced"))
             vancedVersionCode.set(getJsonInt("vanced.json", "versionCode", getApplication()))
             microgVersionCode.set(getJsonInt("microg.json", "versionCode", getApplication()))
             vancedInstalledVersionCode.set(getPkgVerCode(vancedInstalled.get()!!, vancedPkgName))
@@ -167,6 +167,7 @@ open class HomeViewModel(application: Application): AndroidViewModel(application
     }
 
     init {
+        fetching.set(false)
         fetchData()
     }
 
diff --git a/app/src/main/res/layout/fragment_vanced_changelog.xml b/app/src/main/res/layout/fragment_vanced_changelog.xml
index 5e2f0e7b..8dfb70c9 100644
--- a/app/src/main/res/layout/fragment_vanced_changelog.xml
+++ b/app/src/main/res/layout/fragment_vanced_changelog.xml
@@ -10,15 +10,6 @@
         android:id="@+id/vanced_changelog"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:textSize="16sp"
-        android:text="Removed:\n
-- Auto subtitles (has been replaced with live captions)\n
-- minimised video player style (Google removed it) \n
-- auto repeat (might be fixed later) \n
-- accessibility seek buttons (might be fixed later) \n\nChanged:\n
-- Whatever Youtube fixed over 9 months :P \n
-- some small bugs \n
-- Installation now with SAI"
-        tools:ignore="HardcodedText" />
+        android:textSize="16sp" />
 
 </FrameLayout>
\ No newline at end of file