MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set proper component name in FlashFragment

Browse Source
This commit is contained in:
topjohnwu 2020-03-29 23:11:09 -07:00
parent be8479fdba
commit a623a5b7cc
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
View File

@ -139,7 +139,7 @@ private class JobSchedulerWrapper(private val base: JobScheduler) : JobScheduler
} }
} }
object ClassMap { private object ClassMap {
private val map = mapOf( private val map = mapOf(
App::class.java to a.e::class.java, App::class.java to a.e::class.java,

11
app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashFragment.kt
View File

@ -1,8 +1,6 @@
package com.topjohnwu.magisk.ui.flash package com.topjohnwu.magisk.ui.flash
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Activity
import android.app.PendingIntent
import android.content.Context import android.content.Context
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.net.Uri import android.net.Uri
@ -14,8 +12,8 @@ import android.view.View
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.navigation.NavDeepLinkBuilder import androidx.navigation.NavDeepLinkBuilder
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.core.ClassMap
import com.topjohnwu.magisk.core.Const import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.cmp
import com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding import com.topjohnwu.magisk.databinding.FragmentFlashMd2Binding
import com.topjohnwu.magisk.ui.MainActivity import com.topjohnwu.magisk.ui.MainActivity
import com.topjohnwu.magisk.ui.base.BaseUIActivity import com.topjohnwu.magisk.ui.base.BaseUIActivity
@ -73,14 +71,13 @@ class FlashFragment : BaseUIFragment<FlashViewModel, FragmentFlashMd2Binding>()
companion object { companion object {
private fun createIntent(context: Context, args: args): PendingIntent { private fun createIntent(context: Context, args: args) =
return NavDeepLinkBuilder(context) NavDeepLinkBuilder(context)
.setGraph(R.navigation.main) .setGraph(R.navigation.main)
.setComponentName(ClassMap[MainActivity::class.java] as Class<out Activity>) .setComponentName(MainActivity::class.java.cmp(context.packageName))
.setDestination(R.id.flashFragment) .setDestination(R.id.flashFragment)
.setArguments(args.toBundle()) .setArguments(args.toBundle())
.createPendingIntent() .createPendingIntent()
}
private fun flashType(isSecondSlot: Boolean) = private fun flashType(isSecondSlot: Boolean) =
if (isSecondSlot) Const.Value.FLASH_INACTIVE_SLOT else Const.Value.FLASH_MAGISK if (isSecondSlot) Const.Value.FLASH_INACTIVE_SLOT else Const.Value.FLASH_MAGISK