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 3563c4ef..62583b45 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
@@ -81,12 +81,12 @@ class MicrogDownloadService: Service() {
if (intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadId) {
//prefs?.edit()?.putBoolean("isMicrogDownloading", false)?.apply()
//cancelNotif(channel, this@MicrogDownloadService)
- val bIntent = Intent(this@MicrogDownloadService, AppInstaller::class.java)
- bIntent.putExtra("path", "${filesDir.path}/microg.apk")
- bIntent.putExtra("pkg", "com.mgoogle.android.gms")
- val mIntent = Intent(HomeFragment.MICROG_DOWNLOADED)
+ val mIntent = Intent()
mIntent.action = HomeFragment.MICROG_DOWNLOADED
LocalBroadcastManager.getInstance(this@MicrogDownloadService).sendBroadcast(mIntent)
+ val bIntent = Intent(this@MicrogDownloadService, AppInstaller::class.java)
+ bIntent.putExtra("path", "${getExternalFilesDir("apk")}/microg.apk")
+ bIntent.putExtra("pkg", "com.mgoogle.android.gms")
startService(bIntent)
}
}
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/DevSettingsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/DevSettingsFragment.kt
index 276b5063..ffb76f3e 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/DevSettingsFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/DevSettingsFragment.kt
@@ -76,7 +76,7 @@ class DevSettingsFragment: PreferenceFragmentCompat() {
override fun onReceive(context: Context?, intent: Intent?) {
if (intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadId) {
activity?.let {
- val apk = File("${activity?.filesDir?.path}/manager.apk")
+ val apk = File("${activity?.getExternalFilesDir("apk")}/manager.apk")
val uri =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
FileProvider.getUriForFile(activity!!, "${activity?.packageName}.provider", apk)
diff --git a/app/src/main/res/layout/include_vanced.xml b/app/src/main/res/layout/include_vanced.xml
index f37af117..6a3e3f7f 100644
--- a/app/src/main/res/layout/include_vanced.xml
+++ b/app/src/main/res/layout/include_vanced.xml
@@ -50,7 +50,7 @@
style="@style/ButtonStyle"
android:text="@{viewModel.vancedInstallButtonTxt}"
android:textColor="@{viewModel.shouldBeDisabled ? @color/LightGray : @color/White}"
- android:backgroundTint="@{viewModel.shouldBeDisabled ? @color/Gray : @color/Accent}"
+ android:backgroundTint="@{viewModel.shouldBeDisabled ? @drawable/Gray : @drawable/Accent}"
app:icon="@{viewModel.vancedInstallButtonIcon}"
android:clickable="@{!viewModel.shouldBeDisabled}"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0a8fc696..844c911a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,4 +16,7 @@
?attr/colorPrimary
+ ?attr/colorPrimary
+ @color/Gray
+