Fix more crashes below Android 10

This commit is contained in:
Suphon Thanakornpakapong
2021-05-31 10:47:43 +07:00
parent 7c26603f33
commit 61d2358ba1
8 changed files with 30 additions and 17 deletions
@@ -143,7 +143,7 @@ public class BgDataModel {
screenSet.add(item.screenId);
}
}
if (FeatureFlags.topQsbOnFirstScreenEnabled(LawnchairApp.getContext()) || screenSet.isEmpty()) {
if (FeatureFlags.topQsbOnFirstScreenEnabled(LawnchairApp.getInstance()) || screenSet.isEmpty()) {
screenSet.add(Workspace.FIRST_SCREEN_ID);
}
return screenSet.getArray();
@@ -262,7 +262,7 @@ public class GridSizeMigrationTask {
*/
protected void migrateScreen(int screenId) {
// If we are migrating the first screen, do not touch the first row.
int startY = (FeatureFlags.topQsbOnFirstScreenEnabled(LawnchairApp.getContext()) && screenId == Workspace.FIRST_SCREEN_ID)
int startY = (FeatureFlags.topQsbOnFirstScreenEnabled(LawnchairApp.getInstance()) && screenId == Workspace.FIRST_SCREEN_ID)
? 1 : 0;
ArrayList<DbEntry> items = loadWorkspaceEntries(screenId);
@@ -447,7 +447,7 @@ public class LoaderCursor extends CursorWrapper {
if (item.screenId == Workspace.FIRST_SCREEN_ID) {
// Mark the first row as occupied (if the feature is enabled)
// in order to account for the QSB.
screen.markCells(0, 0, countX + 1, 1, FeatureFlags.topQsbOnFirstScreenEnabled(LawnchairApp.getContext()));
screen.markCells(0, 0, countX + 1, 1, FeatureFlags.topQsbOnFirstScreenEnabled(LawnchairApp.getInstance()));
}
occupied.put(item.screenId, screen);
}