diff options
Diffstat (limited to 'app/src/main/java/moe/yuuta/workmode/MainActivity.kt')
| -rw-r--r-- | app/src/main/java/moe/yuuta/workmode/MainActivity.kt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/app/src/main/java/moe/yuuta/workmode/MainActivity.kt b/app/src/main/java/moe/yuuta/workmode/MainActivity.kt index de913c3..b3f4882 100644 --- a/app/src/main/java/moe/yuuta/workmode/MainActivity.kt +++ b/app/src/main/java/moe/yuuta/workmode/MainActivity.kt @@ -171,6 +171,12 @@ class MainActivity : AppCompatActivity(), SwitchBar.OnSwitchChangeListener, View // TODO val canSafelyLoadAppInfoForO1 = Utils.canSafelyLoadAppInfo(o1, this@MainActivity) val canSafelyLoadAppInfoForO2 = Utils.canSafelyLoadAppInfo(o2, this@MainActivity) + if ((canSafelyLoadAppInfoForO1 && !canSafelyLoadAppInfoForO2) || + (!canSafelyLoadAppInfoForO1 && canSafelyLoadAppInfoForO2)) { + // A unsafe app is comparing to a safe app, just put the unsafe one in under the safe one. + return@sorted 1 + } + // They are both unsafe requests. if (!canSafelyLoadAppInfoForO1 || !canSafelyLoadAppInfoForO2) { if (o1.userId > o2.userId) { @@ -181,13 +187,8 @@ class MainActivity : AppCompatActivity(), SwitchBar.OnSwitchChangeListener, View return@sorted 0 } } - if ((canSafelyLoadAppInfoForO1 && !canSafelyLoadAppInfoForO2) || - (!canSafelyLoadAppInfoForO1 && canSafelyLoadAppInfoForO2)) { - // A unsafe app is comparing to a safe app, just put the unsafe one in under the safe one. - return@sorted 1 - } - return@sorted sCollator.compare(packageManager.getApplicationLabel(packageManager.getApplicationInfo(o1.packageName, 0)).toString() - , packageManager.getApplicationLabel(packageManager.getApplicationInfo(o2.packageName, 0))) + return@sorted sCollator.compare(packageManager.getApplicationLabel(packageManager.getApplicationInfo(o1.packageName, PackageManager.MATCH_DISABLED_COMPONENTS)).toString() + , packageManager.getApplicationLabel(packageManager.getApplicationInfo(o2.packageName, PackageManager.MATCH_DISABLED_COMPONENTS))) } .collect(Collectors.toList()) } @@ -397,7 +398,7 @@ private class Adapter : RecyclerView.Adapter<Adapter.VH>() { context .packageManager .getApplicationLabel( - context.packageManager.getApplicationInfo(packageInfo.packageName, 0) + context.packageManager.getApplicationInfo(packageInfo.packageName, PackageManager.MATCH_DISABLED_COMPONENTS) ) else packageInfo.packageName |