Commit c207221c authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Fix crash when shortcut is deleted if it is having null package name

parent ee47058f
Pipeline #89618 passed with stage
in 8 minutes and 13 seconds
...@@ -520,7 +520,7 @@ public class LauncherActivity extends AppCompatActivity implements ...@@ -520,7 +520,7 @@ public class LauncherActivity extends AppCompatActivity implements
} }
public void onAppAddEvent(AppAddEvent appAddEvent) { public void onAppAddEvent(AppAddEvent appAddEvent) {
updateOrAddApp(appAddEvent.getPackageName(),appAddEvent.getUserHandle()); updateOrAddApp(appAddEvent.getPackageName(), appAddEvent.getUserHandle());
//DatabaseManager.getManager(this).saveLayouts(pages, mDock); //DatabaseManager.getManager(this).saveLayouts(pages, mDock);
if (moveTo != -1) { if (moveTo != -1) {
mHorizontalPager.setCurrentPage(moveTo); mHorizontalPager.setCurrentPage(moveTo);
...@@ -1984,11 +1984,18 @@ public class LauncherActivity extends AppCompatActivity implements ...@@ -1984,11 +1984,18 @@ public class LauncherActivity extends AppCompatActivity implements
.setMessage(R.string.uninstall_shortcut_dialog) .setMessage(R.string.uninstall_shortcut_dialog)
.setPositiveButton(R.string.ok, (dialog1, which) -> { .setPositiveButton(R.string.ok, (dialog1, which) -> {
ShortcutItem shortcut = (ShortcutItem) launcherItem; ShortcutItem shortcut = (ShortcutItem) launcherItem;
DeepShortcutManager.getInstance(this).unpinShortcut(ShortcutKey.fromItem(shortcut)); if (shortcut.packageName != null) {
if (DeepShortcutManager.getInstance(this).wasLastCallSuccess()) { DeepShortcutManager.getInstance(this).unpinShortcut(ShortcutKey.fromItem(shortcut));
if (DeepShortcutManager.getInstance(this).wasLastCallSuccess()) {
deleteShortcutFromProvider(shortcut.id);
removeShortcutView(shortcut, blissFrameLayout);
}
} else {
// Null package name generally comes for nougat shortcuts so don't unpin here, just directly delete it.
deleteShortcutFromProvider(shortcut.id); deleteShortcutFromProvider(shortcut.id);
removeShortcutView(shortcut, blissFrameLayout); removeShortcutView(shortcut, blissFrameLayout);
} }
}) })
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.setIcon(launcherItem.icon) .setIcon(launcherItem.icon)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment