Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce multi-user #821

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
package com.absinthe.libchecker.app

import android.content.Context
import android.content.pm.IPackageManager
import android.content.pm.PackageManager
import android.view.WindowManager
import android.view.inputmethod.InputMethodManager
import com.absinthe.libchecker.LibCheckerApp
import rikka.shizuku.ShizukuBinderWrapper
import rikka.shizuku.SystemServiceHelper

object SystemServices {
val packageManager: PackageManager by lazy { LibCheckerApp.app.packageManager }
val iPackageManager: IPackageManager by lazy {
IPackageManager.Stub.asInterface(
ShizukuBinderWrapper(SystemServiceHelper.getSystemService("package"))
)
}
val inputMethodManager: InputMethodManager by lazy { LibCheckerApp.app.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager }
val windowManager: WindowManager by lazy { LibCheckerApp.app.getSystemService(Context.WINDOW_SERVICE) as WindowManager }
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
import com.absinthe.libchecker.app.SystemServices
import com.absinthe.libchecker.utils.OsUtils
import com.absinthe.libchecker.utils.ShizukuUtils
import timber.log.Timber

object PackageManagerCompat {
fun getPackageInfo(packageName: String, flags: Int): PackageInfo {
Expand Down Expand Up @@ -52,6 +54,18 @@ object PackageManagerCompat {
}
}

fun getInstalledPackages(flags: Int, userId: Int): List<PackageInfo> {
if (ShizukuUtils.checkShizukuStatus() != ShizukuUtils.Status.SUCCESS) {
Timber.w("Shizuku unavailable")
return listOf()
}
return if (OsUtils.atLeastT()) {
SystemServices.iPackageManager.getInstalledPackages(flags.toLong(), userId)
} else {
SystemServices.iPackageManager.getInstalledPackages(flags, userId)
}.list
}

fun queryIntentActivities(intent: Intent, flags: Int): List<ResolveInfo> {
return if (OsUtils.atLeastT()) {
SystemServices.packageManager.queryIntentActivities(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ interface AppDataSource {

fun getApplicationList(): List<PackageInfo>

fun getApplicationList(userId: Int): List<PackageInfo>

fun getApplicationMap(ioDispatcher: CoroutineDispatcher): Flow<Map<String, PackageInfo>>

fun getApplicationMap(): Map<String, PackageInfo>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ object LocalAppDataSource : AppDataSource {
return list
}

override fun getApplicationList(userId: Int): List<PackageInfo> {
Timber.d("getApplicationList for $userId start")
val list =
PackageManagerCompat.getInstalledPackages(PackageManager.GET_META_DATA or PackageManager.GET_PERMISSIONS, userId)
Timber.d("getApplicationList for $userId end, apps count: ${list.size}")
return list
}

override fun getApplicationMap(ioDispatcher: CoroutineDispatcher): Flow<Map<String, PackageInfo>> =
flow {
getApplicationList(ioDispatcher).collect { list ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ object Features {
object Ext {
const val APPLICATION_PROP = -1 shl 0
const val APPLICATION_INSTALL_SOURCE = -1 shl 1
const val MULTI_USER = -1 shl 2
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.absinthe.libchecker.features.applist.detail.ui

import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
import android.text.SpannableString
import android.text.style.ImageSpan
Expand All @@ -11,19 +9,18 @@ import androidx.core.view.isGone
import coil.load
import com.absinthe.libchecker.R
import com.absinthe.libchecker.constant.Constants
import com.absinthe.libchecker.constant.URLManager
import com.absinthe.libchecker.database.Repositories
import com.absinthe.libchecker.features.applist.detail.ui.view.AppInstallSourceBottomSheetView
import com.absinthe.libchecker.features.applist.detail.ui.view.AppInstallSourceItemView
import com.absinthe.libchecker.features.applist.detail.ui.view.CenterAlignImageSpan
import com.absinthe.libchecker.utils.PackageUtils
import com.absinthe.libchecker.utils.ShizukuUtils
import com.absinthe.libchecker.utils.extensions.getDrawable
import com.absinthe.libchecker.utils.extensions.launchDetailPage
import com.absinthe.libraries.utils.base.BaseBottomSheetViewDialogFragment
import com.absinthe.libraries.utils.view.BottomSheetHeaderView
import kotlinx.coroutines.runBlocking
import rikka.shizuku.Shizuku
import rikka.sui.Sui

@RequiresApi(Build.VERSION_CODES.R)
class AppInstallSourceBSDFragment :
Expand Down Expand Up @@ -61,22 +58,32 @@ class AppInstallSourceBSDFragment :
return
}
item.packageView.container.icon.load(com.absinthe.lc.rulesbundle.R.drawable.ic_lib_shizuku)
if (!PackageUtils.isAppInstalled(Constants.PackageNames.SHIZUKU) && !Sui.isSui()) {
item.packageView.container.appName.text =
getString(R.string.lib_detail_app_install_source_shizuku_uninstalled)
item.packageView.container.packageName.text =
getString(R.string.lib_detail_app_install_source_shizuku_usage)
item.packageView.container.versionInfo.text =
getString(R.string.lib_detail_app_install_source_shizuku_uninstalled_detail)
item.packageView.setOnClickListener {
startActivity(
Intent(Intent.ACTION_VIEW).apply {
data = Uri.parse(URLManager.SHIZUKU_APP_GITHUB_RELEASE_PAGE)
}
)
when (ShizukuUtils.checkShizukuStatus()) {
ShizukuUtils.Status.SUCCESS -> initAppInstallSourceItemView(item, originatingPackageName)
ShizukuUtils.Status.NOT_AUTHORIZED -> {
item.packageView.container.appName.text =
getString(R.string.lib_detail_app_install_source_shizuku_permission_not_granted)
item.packageView.container.packageName.text =
getString(R.string.lib_detail_app_install_source_shizuku_usage)
item.packageView.container.versionInfo.text =
getString(R.string.lib_detail_app_install_source_shizuku_permission_not_granted_detail)
item.packageView.setOnClickListener {
Shizuku.addRequestPermissionResultListener(this)
Shizuku.requestPermission(0)
}
}
} else {
if (!Shizuku.pingBinder()) {
ShizukuUtils.Status.LOW_VERSION -> {
item.packageView.container.appName.text =
getString(R.string.lib_detail_app_install_source_shizuku_low_version)
item.packageView.container.packageName.text =
getString(R.string.lib_detail_app_install_source_shizuku_usage)
item.packageView.container.versionInfo.text =
getString(R.string.lib_detail_app_install_source_shizuku_low_version_detail)
item.packageView.setOnClickListener {
startActivity(Intent.parseUri("https://github.com/RikkaApps/Shizuku/releases",0))
}
}
ShizukuUtils.Status.NOT_RUNNING -> {
item.packageView.container.appName.text =
getString(R.string.lib_detail_app_install_source_shizuku_not_running)
item.packageView.container.packageName.text =
Expand All @@ -87,34 +94,16 @@ class AppInstallSourceBSDFragment :
PackageUtils.startLaunchAppActivity(requireContext(), Constants.PackageNames.SHIZUKU)
Shizuku.addBinderReceivedListener(this)
}
} else {
if (Shizuku.getVersion() < 10) {
item.packageView.container.appName.text =
getString(R.string.lib_detail_app_install_source_shizuku_low_version)
item.packageView.container.packageName.text =
getString(R.string.lib_detail_app_install_source_shizuku_usage)
item.packageView.container.versionInfo.text =
getString(R.string.lib_detail_app_install_source_shizuku_low_version_detail)
item.packageView.setOnClickListener {
startActivity(
Intent(Intent.ACTION_VIEW).apply {
data = Uri.parse(URLManager.SHIZUKU_APP_GITHUB_RELEASE_PAGE)
}
)
}
} else if (Shizuku.checkSelfPermission() != PackageManager.PERMISSION_GRANTED) {
item.packageView.container.appName.text =
getString(R.string.lib_detail_app_install_source_shizuku_permission_not_granted)
item.packageView.container.packageName.text =
getString(R.string.lib_detail_app_install_source_shizuku_usage)
item.packageView.container.versionInfo.text =
getString(R.string.lib_detail_app_install_source_shizuku_permission_not_granted_detail)
item.packageView.setOnClickListener {
Shizuku.addRequestPermissionResultListener(this)
Shizuku.requestPermission(0)
}
} else {
initAppInstallSourceItemView(item, originatingPackageName)
}
ShizukuUtils.Status.NOT_INSTALLED -> {
item.packageView.container.appName.text =
getString(R.string.lib_detail_app_install_source_shizuku_uninstalled)
item.packageView.container.packageName.text =
getString(R.string.lib_detail_app_install_source_shizuku_usage)
item.packageView.container.versionInfo.text =
getString(R.string.lib_detail_app_install_source_shizuku_uninstalled_detail)
item.packageView.setOnClickListener {
startActivity(Intent.parseUri("https://github.com/RikkaApps/Shizuku/releases",0))
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,12 @@ abstract class BaseAppDetailActivity :
)
}
}

Features.Ext.MULTI_USER -> {
if (!apkAnalyticsMode) {
TODO()
}
}
}
}.launchIn(lifecycleScope)
it.abiBundle.observe(this) { bundle ->
Expand Down
44 changes: 23 additions & 21 deletions app/src/main/kotlin/com/absinthe/libchecker/utils/PackageUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import android.content.Intent
import android.content.pm.ApplicationInfo
import android.content.pm.ApplicationInfoHidden
import android.content.pm.ComponentInfo
import android.content.pm.IPackageManager
import android.content.pm.InstallSourceInfo
import android.content.pm.PackageInfo
import android.content.pm.PackageManager
Expand Down Expand Up @@ -85,8 +84,6 @@ import java.text.DateFormat
import java.util.zip.ZipEntry
import javax.security.cert.X509Certificate
import rikka.shizuku.Shizuku
import rikka.shizuku.ShizukuBinderWrapper
import rikka.shizuku.SystemServiceHelper
import timber.log.Timber

object PackageUtils {
Expand Down Expand Up @@ -1044,24 +1041,29 @@ object PackageUtils {
Timber.e(e)
return null
}
if (!Shizuku.pingBinder()) {
Timber.e("Shizuku not running")
return origInstallSourceInfo
}
if (Shizuku.getVersion() < 10) {
Timber.e("Requires Shizuku API 10")
return origInstallSourceInfo
} else if (Shizuku.checkSelfPermission() != PackageManager.PERMISSION_GRANTED) {
Timber.i("Shizuku not authorized")
return origInstallSourceInfo
}
return IPackageManager.Stub.asInterface(
ShizukuBinderWrapper(SystemServiceHelper.getSystemService("package"))
).let {
if (OsUtils.atLeastU()) {
it.getInstallSourceInfo(packageName, Shizuku.getUid())
} else {
it.getInstallSourceInfo(packageName)
return when (ShizukuUtils.checkShizukuStatus()) {
ShizukuUtils.Status.SUCCESS -> SystemServices.iPackageManager.let {
if (OsUtils.atLeastU()) {
it.getInstallSourceInfo(packageName, Shizuku.getUid())
} else {
it.getInstallSourceInfo(packageName)
}
}
ShizukuUtils.Status.NOT_AUTHORIZED -> {
Timber.i("Shizuku not authorized")
return origInstallSourceInfo
}
ShizukuUtils.Status.LOW_VERSION -> {
Timber.e("Requires Shizuku API 10")
return origInstallSourceInfo
}
ShizukuUtils.Status.NOT_RUNNING -> {
Timber.e("Shizuku not running")
return origInstallSourceInfo
}
ShizukuUtils.Status.NOT_INSTALLED -> {
Timber.e("Shizuku not installed")
return origInstallSourceInfo
}
}
}
Expand Down
26 changes: 26 additions & 0 deletions app/src/main/kotlin/com/absinthe/libchecker/utils/ShizukuUtils.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.absinthe.libchecker.utils

import android.content.pm.PackageManager
import com.absinthe.libchecker.constant.Constants
import rikka.shizuku.Shizuku
import rikka.sui.Sui

object ShizukuUtils {
fun checkShizukuStatus(): Status = when {
!PackageUtils.isAppInstalled(Constants.PackageNames.SHIZUKU) && !Sui.isSui() -> Status.NOT_INSTALLED
!Shizuku.pingBinder() -> Status.NOT_RUNNING
Shizuku.getVersion() < 10 -> Status.LOW_VERSION
Shizuku.checkSelfPermission() != PackageManager.PERMISSION_GRANTED -> Status.NOT_AUTHORIZED
else -> {
Status.SUCCESS
}
}

enum class Status {
SUCCESS,
NOT_AUTHORIZED,
LOW_VERSION,
NOT_RUNNING,
NOT_INSTALLED
}
}
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", ve
kotlinX-coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

androidX-activity = "androidx.activity:activity-ktx:1.8.2"
androidX-annotation = "androidx.annotation:annotation:1.6.0"
androidX-appCompat = "androidx.appcompat:appcompat:1.6.1"
androidX-browser = "androidx.browser:browser:1.7.0"
androidX-constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
Expand Down
1 change: 1 addition & 0 deletions hidden-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ setupLibraryModule {
dependencies {
annotationProcessor(libs.rikka.refine.compiler)
compileOnly(libs.rikka.refine.annotation)
compileOnly(libs.androidX.annotation)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package android.content.pm;

import java.util.List;

abstract class BaseParceledListSlice<T> {

public List<T> getList() {
throw new RuntimeException("STUB");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,18 @@
import android.os.IBinder;
import android.os.IInterface;

import androidx.annotation.RequiresApi;

public interface IPackageManager extends IInterface {

ParceledListSlice<PackageInfo> getInstalledPackages(int flags, int userId);

@RequiresApi(33)
ParceledListSlice<PackageInfo> getInstalledPackages(long flags, int userId);

InstallSourceInfo getInstallSourceInfo(String packageName);

@RequiresApi(34)
InstallSourceInfo getInstallSourceInfo(String packageName, int callingUid);

abstract class Stub extends Binder implements IPackageManager {
Expand Down
10 changes: 10 additions & 0 deletions hidden-api/src/main/java/android/content/pm/ParceledListSlice.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package android.content.pm;

import java.util.List;

public class ParceledListSlice<T> extends BaseParceledListSlice<T> {

public ParceledListSlice(List<T> list) {
throw new RuntimeException("STUB");
}
}
6 changes: 6 additions & 0 deletions hidden-api/src/main/java/android/content/pm/UserInfo.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package android.content.pm;

public class UserInfo {
public int id;
public String name;
}
23 changes: 23 additions & 0 deletions hidden-api/src/main/java/android/os/IUserManager.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package android.os;

import android.content.pm.UserInfo;

import java.util.List;

public interface IUserManager extends IInterface {
/**
* Get users
* @param excludePartial default true
* @param excludeDying default false
* @param excludePreCreated default true
* @return list of UserInfo
*/
List<UserInfo> getUsers(boolean excludePartial, boolean excludeDying, boolean excludePreCreated);

abstract class Stub extends Binder implements IUserManager {

public static IUserManager asInterface(IBinder obj) {
throw new UnsupportedOperationException();
}
}
}
Loading