diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b6a31bf4..75a76de5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,8 +57,6 @@
-
-
diff --git a/app/src/main/java/com/vanced/manager/core/downloader/DownloadBroadcastReceiver.kt b/app/src/main/java/com/vanced/manager/core/downloader/DownloadBroadcastReceiver.kt
deleted file mode 100644
index 92b6080e..00000000
--- a/app/src/main/java/com/vanced/manager/core/downloader/DownloadBroadcastReceiver.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.vanced.manager.core.downloader
-
-import android.app.NotificationManager
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-
-class DownloadBroadcastReceiver: BroadcastReceiver() {
-
- override fun onReceive(context: Context?, intent: Intent?) {
- val notificationManager = context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
- when (intent?.getStringExtra("type")) {
- "vanced" -> {
- context.stopService(Intent(context, VancedDownloadService::class.java))
- notificationManager.cancel(69)
- Log.d("VMNotification", "Canceled vanced download")
- }
- "microg" -> {
- notificationManager.cancel(420)
- context.stopService(Intent(context, MicrogDownloadService::class.java))
- Log.d("VMNotification", "Canceled microg download")
- }
- }
-
- }
-}
\ No newline at end of file
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 7e1369a5..66c8ec33 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
@@ -48,7 +48,6 @@ class MicrogDownloadService: Service() {
NotificationHelper.displayDownloadNotif(
channel,
mProgress.toInt(),
- "microg",
getFileNameFromUrl(dwnldUrl),
this
)
@@ -60,10 +59,7 @@ class MicrogDownloadService: Service() {
val intent = Intent(this@MicrogDownloadService, AppInstaller::class.java)
intent.putExtra("path", "${filesDir.path}/microg.apk")
intent.putExtra("pkg", "com.mgoogle.android.gms")
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- startForegroundService(intent)
- else
- startService(intent)
+ startService(intent)
}
override fun onError(error: Error) {
prefs?.edit()?.putBoolean("isMicrogDownloading", false)?.apply()
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 3db7825a..d03becc4 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
@@ -71,7 +71,7 @@ class VancedDownloadService: Service() {
.setOnStartOrResumeListener { OnStartOrResumeListener { prefs?.edit()?.putBoolean("isVancedDownloading", true)?.apply() } }
.setOnProgressListener { progress ->
val mProgress = progress.currentBytes * 100 / progress.totalBytes
- displayDownloadNotif(channel, mProgress.toInt(), "vanced", getFileNameFromUrl(url), this)
+ displayDownloadNotif(channel, mProgress.toInt(), getFileNameFromUrl(url), this)
}
.start(object : OnDownloadListener {
override fun onDownloadComplete() {
@@ -104,16 +104,9 @@ class VancedDownloadService: Service() {
intent.action = HomeFragment.VANCED_DOWNLOADED
LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
if (variant == "root")
- startInstallService(Intent(this, RootSplitInstallerService::class.java))
+ startService(Intent(this, RootSplitInstallerService::class.java))
else
- startInstallService(Intent(this, SplitInstaller::class.java))
- }
-
- private fun startInstallService(intent: Intent) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- startForegroundService(intent)
- else
- startService(intent)
+ startService(Intent(this, SplitInstaller::class.java))
}
override fun onDestroy() {
diff --git a/app/src/main/java/com/vanced/manager/core/installer/AppInstallerService.kt b/app/src/main/java/com/vanced/manager/core/installer/AppInstallerService.kt
index 0d8b5670..197ae14f 100644
--- a/app/src/main/java/com/vanced/manager/core/installer/AppInstallerService.kt
+++ b/app/src/main/java/com/vanced/manager/core/installer/AppInstallerService.kt
@@ -25,7 +25,7 @@ class AppInstallerService: Service() {
PackageInstaller.STATUS_PENDING_USER_ACTION -> {
Toast.makeText(this, "Installing...", Toast.LENGTH_SHORT).show()
Log.d(TAG, "Requesting user confirmation for installation")
- startForegroundNotif(getString(R.string.installing_app, "MicroG"))
+ createBasicNotif(getString(R.string.installing_app, "MicroG"), notifId, this)
val confirmationIntent = intent.getParcelableExtra(Intent.EXTRA_INTENT)
confirmationIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
try {
@@ -81,23 +81,6 @@ class AppInstallerService: Service() {
}
}
- private fun startForegroundNotif(text: String) {
- val notifBuilder =
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- Notification.Builder(this, 42.toString()).setChannelId("69420")
- else
- Notification.Builder(this).setPriority(Notification.PRIORITY_DEFAULT)
-
- notifBuilder.apply {
- setContentTitle(getString(R.string.app_name))
- setContentText(text)
- setSmallIcon(R.drawable.ic_stat_name)
- }
-
- val notif = notifBuilder.build()
- startForeground(42, notif)
- }
-
@Nullable
override fun onBind(intent: Intent?): IBinder? {
return null
diff --git a/app/src/main/java/com/vanced/manager/core/installer/RootSplitInstallerService.kt b/app/src/main/java/com/vanced/manager/core/installer/RootSplitInstallerService.kt
index 67310c57..7af46208 100644
--- a/app/src/main/java/com/vanced/manager/core/installer/RootSplitInstallerService.kt
+++ b/app/src/main/java/com/vanced/manager/core/installer/RootSplitInstallerService.kt
@@ -53,7 +53,7 @@ class RootSplitInstallerService: Service() {
}
for (apkFile in apkFiles) {
Log.d("AppLog", "installing APK : ${apkFile.name} ${apkFile.fileSize} ")
- startForegroundNotif(getString(R.string.installing_app, "Vanced"))
+ createBasicNotif(getString(R.string.installing_app, "Vanced"), notifId, this)
val command = arrayOf("su", "-c", "pm", "install-write", "-S", "${apkFile.fileSize}", "$sessionId", apkFile.name)
val process: Process = Runtime.getRuntime().exec(command)
val inputPipe = apkFile.getInputStream()
@@ -137,23 +137,6 @@ class RootSplitInstallerService: Service() {
return result
}
- private fun startForegroundNotif(text: String) {
- val notifBuilder =
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- Notification.Builder(this, 666.toString()).setChannelId("69420")
- else
- Notification.Builder(this).setPriority(Notification.PRIORITY_DEFAULT)
-
- notifBuilder.apply {
- setContentTitle(getString(R.string.app_name))
- setContentText(text)
- setSmallIcon(R.drawable.ic_stat_name)
- }
-
- val notif = notifBuilder.build()
- startForeground(666, notif)
- }
-
@Nullable
override fun onBind(intent: Intent?): IBinder? {
return null
diff --git a/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt b/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt
index 6020c06b..767d3a02 100644
--- a/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt
+++ b/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt
@@ -14,7 +14,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.vanced.manager.R
import com.vanced.manager.ui.MainActivity
import com.vanced.manager.utils.MiuiHelper.isMiui
-import com.vanced.manager.utils.NotificationHelper
+import com.vanced.manager.utils.NotificationHelper.createBasicNotif
class SplitInstallerService: Service() {
@@ -23,7 +23,7 @@ class SplitInstallerService: Service() {
when (intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -999)) {
PackageInstaller.STATUS_PENDING_USER_ACTION -> {
Toast.makeText(this, "Installing...", Toast.LENGTH_SHORT).show()
- startForegroundNotif(getString(R.string.installing_app, "Vanced"))
+ createBasicNotif(getString(R.string.installing_app, "Vanced"), notifId, this)
Log.d(TAG, "Requesting user confirmation for installation")
val confirmationIntent =
intent.getParcelableExtra(Intent.EXTRA_INTENT)
@@ -40,7 +40,7 @@ class SplitInstallerService: Service() {
mIntent.action = MainActivity.INSTALL_COMPLETED
mIntent.putExtra("package", "split")
LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
- NotificationHelper.createBasicNotif(
+ createBasicNotif(
getString(R.string.successfully_installed, "Vanced"),
notifId,
this
@@ -48,7 +48,7 @@ class SplitInstallerService: Service() {
}
else -> {
sendFailure(intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -999))
- NotificationHelper.createBasicNotif(
+ createBasicNotif(
getErrorMessage(intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -999)),
notifId,
this
diff --git a/app/src/main/java/com/vanced/manager/utils/NotificationHelper.kt b/app/src/main/java/com/vanced/manager/utils/NotificationHelper.kt
index 434299b4..6824fa86 100644
--- a/app/src/main/java/com/vanced/manager/utils/NotificationHelper.kt
+++ b/app/src/main/java/com/vanced/manager/utils/NotificationHelper.kt
@@ -24,7 +24,7 @@ object NotificationHelper {
}
}
- fun displayDownloadNotif(channel: Int, progress:Int, type: String, filename: String, context: Context) {
+ fun displayDownloadNotif(channel: Int, progress:Int, filename: String, context: Context) {
val notifBuilder =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
Notification.Builder(context, channel.toString()).setChannelId("69420")
diff --git a/app/src/main/res/layout/fragment_custom_url.xml b/app/src/main/res/layout/fragment_custom_url.xml
index 33e38248..8b4790a4 100644
--- a/app/src/main/res/layout/fragment_custom_url.xml
+++ b/app/src/main/res/layout/fragment_custom_url.xml
@@ -37,8 +37,8 @@
-
+ android:textAllCaps="false"
+ android:layout_alignParentStart="true"/>
+ android:layout_marginEnd="4dp"
+ android:text="@string/save"
+ android:layout_alignParentEnd="true"/>
-
+
diff --git a/app/src/main/res/layout/fragment_vanced_theme_selection.xml b/app/src/main/res/layout/fragment_vanced_theme_selection.xml
index 9fffcb26..e4bdf0a4 100644
--- a/app/src/main/res/layout/fragment_vanced_theme_selection.xml
+++ b/app/src/main/res/layout/fragment_vanced_theme_selection.xml
@@ -2,7 +2,6 @@
diff --git a/app/src/main/res/layout/include_about_app_devs.xml b/app/src/main/res/layout/include_about_app_devs.xml
index b8b20a82..abfac5c6 100644
--- a/app/src/main/res/layout/include_about_app_devs.xml
+++ b/app/src/main/res/layout/include_about_app_devs.xml
@@ -7,50 +7,24 @@
app:contentPaddingTop="2dp"
tools:ignore="HardcodedText">
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
-
+ android:text="- Xinto"
+ android:textSize="18sp" />
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_about_vanced_devs.xml b/app/src/main/res/layout/include_about_vanced_devs.xml
index 245b461d..acfc1c66 100644
--- a/app/src/main/res/layout/include_about_vanced_devs.xml
+++ b/app/src/main/res/layout/include_about_vanced_devs.xml
@@ -7,9 +7,10 @@
tools:ignore="HardcodedText"
app:contentPaddingTop="2dp">
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d80914b9..248f4d82 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,7 +89,6 @@
Launch
Welcome
-
Choose your preferred language for Vanced
Note: if you install anything other than English, English will still be installed as an additional language
@@ -101,7 +100,7 @@
Next
- Manager Devs
+ Manager Dev
Sources
Vanced Team