lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Catch SecurityExceptions; unpin apps if they couldn't be launched

Browse Source
This commit is contained in:
MM20 2022-03-27 14:17:47 +02:00
parent 2a9339926d
commit 3a15b59526
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt
View File

@ -15,6 +15,7 @@ import android.os.UserHandle
import androidx.core.content.getSystemService
import de.mm20.launcher2.icons.LauncherIcon
import de.mm20.launcher2.ktx.getSerialNumber
import de.mm20.launcher2.ktx.tryStartActivity
import de.mm20.launcher2.preferences.Settings.IconSettings.LegacyIconBackground
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
@ -80,7 +81,7 @@ class LauncherApp(
val intent = Intent()
intent.component = ComponentName(`package`, activity)
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
context.startActivity(intent, options)
return context.tryStartActivity(intent, options)
} else {
try {
launcherApps.startMainActivity(

2
ktx/src/main/java/de/mm20/launcher2/ktx/Context.kt
View File

@ -25,5 +25,7 @@ fun Context.tryStartActivity(intent: Intent, bundle: Bundle? = null): Boolean {
true
} catch (e: ActivityNotFoundException) {
false
} catch (e: SecurityException) {
false
}
}

1
search/build.gradle.kts
View File

@ -50,4 +50,5 @@ dependencies {
implementation(project(":database"))
implementation(project(":preferences"))
implementation(project(":crashreporter"))
implementation(project(":ktx"))
}

6
search/src/main/java/de/mm20/launcher2/search/data/Searchable.kt
View File

@ -6,6 +6,7 @@ import android.content.Intent
import android.os.Bundle
import android.widget.Toast
import de.mm20.launcher2.icons.LauncherIcon
import de.mm20.launcher2.ktx.tryStartActivity
import de.mm20.launcher2.preferences.Settings
import de.mm20.launcher2.preferences.Settings.IconSettings.LegacyIconBackground
import de.mm20.launcher2.search.R
@ -22,10 +23,9 @@ abstract class Searchable : Comparable<Searchable> {
open fun launch(context: Context, options: Bundle?): Boolean {
val intent = getLaunchIntent(context) ?: return false
return try {
context.startActivity(intent, options)
return if (context.tryStartActivity(intent, options)) {
true
} catch (e: ActivityNotFoundException) {
} else {
Toast.makeText(context, context.getString(R.string.error_activity_not_found, label), Toast.LENGTH_SHORT).show()
false
}

5
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt
View File

@ -9,6 +9,7 @@ import de.mm20.launcher2.favorites.FavoritesRepository
import de.mm20.launcher2.icons.IconRepository
import de.mm20.launcher2.icons.LauncherIcon
import de.mm20.launcher2.ktx.isAtLeastApiLevel
import de.mm20.launcher2.search.data.Application
import de.mm20.launcher2.search.data.Searchable
import kotlinx.coroutines.flow.Flow
import org.koin.core.component.KoinComponent
@ -46,7 +47,7 @@ abstract class SearchableItemVM(
}
fun launch(context: Context, bounds: Rect? = null): Boolean {
open fun launch(context: Context, bounds: Rect? = null): Boolean {
val view = (context as? AppCompatActivity)?.window?.decorView
val options = if (bounds != null && view != null) {
ActivityOptionsCompat.makeClipRevealAnimation(
@ -66,6 +67,8 @@ abstract class SearchableItemVM(
if (searchable.launch(context, bundle)) {
favoritesRepository.incrementLaunchCounter(searchable)
return true
} else if (searchable is Application) {
favoritesRepository.unpinItem(searchable)
}
return false
}