etc
/
VancedManager
mirror of https://github.com/YTVanced/VancedManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

testing

This commit is contained in:
X1nto 2020-06-19 22:20:41 +04:00
parent eca65b86dd
commit 1754bcad43
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
View File

@ -4,7 +4,6 @@ import android.app.Service
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.IBinder import android.os.IBinder
import android.widget.Toast
import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.dezlum.codelabs.getjson.GetJson import com.dezlum.codelabs.getjson.GetJson
import com.vanced.manager.core.installer.MicrogInstaller.installMicrog import com.vanced.manager.core.installer.MicrogInstaller.installMicrog
@ -50,7 +49,7 @@ class MicrogDownloadService: Service() {
onNext = { progress -> onNext = { progress ->
val intent = Intent(HomeFragment.MICROG_DOWNLOADING) val intent = Intent(HomeFragment.MICROG_DOWNLOADING)
intent.action = HomeFragment.MICROG_DOWNLOADING intent.action = HomeFragment.MICROG_DOWNLOADING
intent.putExtra("microgProgress", progress.percentStr().toInt()) intent.putExtra("microgProgress", progress.percent().toInt())
LocalBroadcastManager.getInstance(this).sendBroadcast(intent) LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
}, },
onComplete = { onComplete = {
@ -58,8 +57,10 @@ class MicrogDownloadService: Service() {
installMicrog(this) installMicrog(this)
}, },
onError = { throwable -> onError = { throwable ->
Toast.makeText(this, throwable.toString(), Toast.LENGTH_SHORT) val intent = Intent(HomeFragment.DOWNLOAD_ERROR)
.show() intent.action = HomeFragment.DOWNLOAD_ERROR
intent.putExtra("DownloadError", throwable.toString())
LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
} }
) )
} }

10
app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
View File

@ -5,7 +5,6 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build import android.os.Build
import android.os.IBinder import android.os.IBinder
import android.widget.Toast
import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.vanced.manager.core.installer.RootSplitInstallerService import com.vanced.manager.core.installer.RootSplitInstallerService
@ -65,12 +64,12 @@ class VancedDownloadService: Service() {
task.delete() task.delete()
disposable = task.download() disposable = task.download()
.observeOn(Schedulers.single()) .observeOn(Schedulers.newThread())
.subscribeBy( .subscribeBy(
onNext = { progress -> onNext = { progress ->
val intent = Intent(HomeFragment.VANCED_DOWNLOADING) val intent = Intent(HomeFragment.VANCED_DOWNLOADING)
intent.action = HomeFragment.VANCED_DOWNLOADING intent.action = HomeFragment.VANCED_DOWNLOADING
intent.putExtra("vancedProgress", progress.percentStr().toInt()) intent.putExtra("vancedProgress", progress.percent().toInt())
LocalBroadcastManager.getInstance(this).sendBroadcast(intent) LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
}, },
onComplete = { onComplete = {
@ -91,7 +90,10 @@ class VancedDownloadService: Service() {
} }
}, },
onError = { throwable -> onError = { throwable ->
Toast.makeText(this, throwable.toString(), Toast.LENGTH_SHORT).show() val intent = Intent(HomeFragment.DOWNLOAD_ERROR)
intent.action = HomeFragment.DOWNLOAD_ERROR
intent.putExtra("DownloadError", throwable.toString())
LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
} }
) )
} }

31
app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
View File

@ -12,6 +12,7 @@ import android.os.Bundle
import android.util.Log import android.util.Log
import android.view.* import android.view.*
import android.widget.ProgressBar import android.widget.ProgressBar
import android.widget.Toast
import androidx.core.animation.addListener import androidx.core.animation.addListener
import androidx.databinding.DataBindingUtil import androidx.databinding.DataBindingUtil
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
@ -28,7 +29,6 @@ import com.vanced.manager.R
import com.vanced.manager.adapter.SectionPageAdapter import com.vanced.manager.adapter.SectionPageAdapter
import com.vanced.manager.adapter.SectionPageRootAdapter import com.vanced.manager.adapter.SectionPageRootAdapter
import com.vanced.manager.core.fragments.Home import com.vanced.manager.core.fragments.Home
import com.vanced.manager.core.installer.MicrogInstaller.installMicrog
import com.vanced.manager.core.installer.RootAppUninstaller import com.vanced.manager.core.installer.RootAppUninstaller
import com.vanced.manager.databinding.FragmentHomeBinding import com.vanced.manager.databinding.FragmentHomeBinding
import com.vanced.manager.ui.MainActivity import com.vanced.manager.ui.MainActivity
@ -69,9 +69,6 @@ class HomeFragment : Home() {
if (variantPref == "Root") { if (variantPref == "Root") {
attachRootChangelog() attachRootChangelog()
if (viewModel.signatureStatusTxt != getString(R.string.signature_disabled)) {
disableVancedButton(getString(R.string.signature_not_checked))
}
} else } else
attachNonrootChangelog() attachNonrootChangelog()
@ -94,6 +91,7 @@ class HomeFragment : Home() {
} }
val vancedinstallbtn = view?.findViewById<MaterialButton>(R.id.vanced_installbtn) val vancedinstallbtn = view?.findViewById<MaterialButton>(R.id.vanced_installbtn)
val networkErrorLayout = view?.findViewById<MaterialCardView>(R.id.home_network_wrapper) val networkErrorLayout = view?.findViewById<MaterialCardView>(R.id.home_network_wrapper)
val viewModel: HomeViewModel by viewModels()
disposable = ReactiveNetwork.observeInternetConnectivity() disposable = ReactiveNetwork.observeInternetConnectivity()
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
@ -110,7 +108,7 @@ class HomeFragment : Home() {
GetJson().AsJSONObject("https://vanced.app/api/v1/microg.json") GetJson().AsJSONObject("https://vanced.app/api/v1/microg.json")
.get("versionCode").asInt .get("versionCode").asInt
if (variant == "nonroot") { if (variant == "Nonroot") {
val microginstallbtn = val microginstallbtn =
view?.findViewById<MaterialButton>(R.id.microg_installbtn) view?.findViewById<MaterialButton>(R.id.microg_installbtn)
microginstallbtn?.visibility = View.VISIBLE microginstallbtn?.visibility = View.VISIBLE
@ -138,9 +136,7 @@ class HomeFragment : Home() {
} }
} }
} else { } else {
activity?.getString(R.string.no_microg)?.let { disableVancedButton(getString(R.string.no_microg))
disableVancedButton(it)
}
} }
} }
@ -183,6 +179,10 @@ class HomeFragment : Home() {
} }
if (variant == "Root" && viewModel.signatureStatusTxt != getString(R.string.signature_disabled)) {
disableVancedButton(getString(R.string.signature_not_checked))
}
} }
val oa2 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", 0f, 0.3f) val oa2 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", 0f, 0.3f)
@ -237,17 +237,18 @@ class HomeFragment : Home() {
private val broadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() { private val broadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
val viewModel: HomeViewModel by viewModels()
when (intent.action) { when (intent.action) {
SIGNATURE_DISABLED -> { SIGNATURE_DISABLED -> {
activity?.application?.let { HomeViewModel(it).signatureStatusTxt = getString(R.string.signature_disabled)} viewModel.signatureStatusTxt = getString(R.string.signature_disabled)
val mIntent = Intent(activity, RootAppUninstaller::class.java) val mIntent = Intent(activity, RootAppUninstaller::class.java)
mIntent.putExtra("Data", "com.vanced.stub") mIntent.putExtra("Data", "com.vanced.stub")
activity?.startService(mIntent) activity?.startService(mIntent)
activity?.recreate() //activity?.recreate()
} }
SIGNATURE_ENABLED -> { SIGNATURE_ENABLED -> {
activity?.application?.let { HomeViewModel(it).signatureStatusTxt = getString(R.string.signature_enabled)} viewModel.signatureStatusTxt = getString(R.string.signature_enabled)
activity?.recreate() //activity?.recreate()
} }
MICROG_DOWNLOADING -> { MICROG_DOWNLOADING -> {
val progress = intent.getIntExtra("microgProgress", 0) val progress = intent.getIntExtra("microgProgress", 0)
@ -261,6 +262,11 @@ class HomeFragment : Home() {
progressbar?.visibility = View.VISIBLE progressbar?.visibility = View.VISIBLE
progressbar?.progress = progress progressbar?.progress = progress
} }
DOWNLOAD_ERROR -> {
val error = intent.getStringExtra("DownloadError") as String
Toast.makeText(activity, error, Toast.LENGTH_SHORT).show()
Log.d("VMDwnld", error)
}
} }
} }
} }
@ -345,6 +351,7 @@ class HomeFragment : Home() {
const val SIGNATURE_ENABLED = "Signature verification enabled" const val SIGNATURE_ENABLED = "Signature verification enabled"
const val VANCED_DOWNLOADING = "Vanced downloading" const val VANCED_DOWNLOADING = "Vanced downloading"
const val MICROG_DOWNLOADING = "MicroG downloading" const val MICROG_DOWNLOADING = "MicroG downloading"
const val DOWNLOAD_ERROR = "Error occurred"
} }
} }