aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when a gesture tries to open an uninstalled app

Browse Source
This commit is contained in:
Till Kottmann
2018-07-31 21:54:29 +02:00
parent d71d8d00e5
commit de9b69e051
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@@ -596,4 +596,5 @@
<string name="dt2s_admin_warning">By disabling device admin, you will not be able to use double tap to lock on your home screen.</string>
<string name="icon_pack_applied_toast">\"%s\" has been applied successfully!</string>
<string name="app_gesture_failed_toast">Opening app failed</string>
</resources>

11
src/ch/deletescape/lawnchair/gestures/handlers/LauncherGestureHandlers.kt
View File

@@ -4,10 +4,12 @@ import android.content.Context
import android.content.Intent
import android.os.UserHandle
import android.support.annotation.Keep
import android.widget.Toast
import ch.deletescape.lawnchair.gestures.GestureController
import ch.deletescape.lawnchair.gestures.GestureHandler
import ch.deletescape.lawnchair.gestures.ui.SelectAppActivity
import com.android.launcher3.R
import com.android.launcher3.Utilities
import com.android.launcher3.compat.LauncherAppsCompat
import com.android.launcher3.compat.UserManagerCompat
import com.android.launcher3.shortcuts.DeepShortcutManager
@@ -159,8 +161,13 @@ class StartAppGestureHandler(context: Context, config: JSONObject?) : GestureHan
override fun onGestureTrigger(controller: GestureController) {
when (type) {
"app" -> {
LauncherAppsCompat.getInstance(context)
.startActivityForProfile(target!!.componentName, target!!.user, null, null)
try {
LauncherAppsCompat.getInstance(context)
.startActivityForProfile(target!!.componentName, target!!.user, null, null)
} catch (e: NullPointerException){
// App is probably not installed anymore, show a Toast
Toast.makeText(context, R.string.app_gesture_failed_toast, Toast.LENGTH_LONG).show()
}
}
"shortcut" -> {
DeepShortcutManager.getInstance(context)