chore: add some db logging to apps loading w/ @suphon (a2b91174) · Commits · e / os / BlissLauncher

app/src/main/java/foundation/e/blisslauncher/core/database/DatabaseManager.java

+7 −0

Original line number	Diff line number	Diff line
		package foundation.e.blisslauncher.core.database;

		import android.content.Context;
		import android.util.Log;
		import android.widget.GridLayout;
		import foundation.e.blisslauncher.core.customviews.BlissFrameLayout;
		import foundation.e.blisslauncher.core.database.daos.WidgetDao;
		@@ -42,6 +43,7 @@ public class DatabaseManager {
		}

		public void removeLauncherItem(String itemId) {
		Log.d(TAG, "[debug-db] removeLauncherItem: " + itemId);
		mAppExecutors.diskIO().execute(() -> LauncherDB.getDatabase(mContext).launcherDao().delete(itemId));
		}

		@@ -102,6 +104,11 @@ public class DatabaseManager {
		}
		}
		}
		List<String> ids = new ArrayList<>();
		for (LauncherItem item : items) {
		ids.add(item.id);
		}
		Log.d(TAG, "[debug-db] saveLauncherItems: " + ids);
		LauncherDB.getDatabase(mContext).launcherDao().insertAll(items);
		}

app/src/main/java/foundation/e/blisslauncher/features/launcher/AppProvider.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -258,14 +258,19 @@ public class AppProvider {
		if (mDatabaseItems == null \|\| mDatabaseItems.size() <= 0) {
		mLauncherItems = prepareDefaultLauncherItems();
		} else {
		try {
		mLauncherItems = prepareLauncherItems();
		} catch (Exception e) {
		Log.e(TAG, "[debug-db] prepareLauncherItems failed", e);
		throw e;
		}
		}
		mAppsRepository.updateAppsRelay(mLauncherItems);
		}
		}

		private List<LauncherItem> prepareLauncherItems() {
		Log.d(TAG, "prepareLauncherItems() called");
		Log.d(TAG, "[debug-db] prepareLauncherItems() called");

		/** Indices of folder in {@link #mLauncherItems}. */
		LongSparseArray<Integer> foldersIndex = new LongSparseArray<>();
		@@ -371,7 +376,7 @@ public class AppProvider {

		applicationItems.removeAll(mDatabaseItems);
		List<ApplicationItem> mutableList = new ArrayList<>(applicationItems);
		Collections.sort(mutableList, (app1, app2) -> {
		mutableList.sort((app1, app2) -> {
		Collator collator = Collator.getInstance();
		return collator.compare(app1.title.toString(), app2.title.toString());
		});
		@@ -437,6 +442,7 @@ public class AppProvider {
		}

		private List<LauncherItem> prepareDefaultLauncherItems() {
		Log.d(TAG, "[debug-db] prepareDefaultLauncherItems() called");
		List<LauncherItem> mLauncherItems = new ArrayList<>();
		List<LauncherItem> pinnedItems = new ArrayList<>();
		PackageManager pm = mContext.getPackageManager();
		@@ -464,7 +470,7 @@ public class AppProvider {
		}
		}

		Collections.sort(mLauncherItems, (app1, app2) -> {
		mLauncherItems.sort((app1, app2) -> {
		Collator collator = Collator.getInstance();
		return collator.compare(app1.title.toString(), app2.title.toString());
		});
		@@ -478,7 +484,7 @@ public class AppProvider {
		}

		public void clear() {
		this.sInstance = null;
		sInstance = null;
		mLauncherItems = new ArrayList<>();
		mAppsRepository.updateAppsRelay(Collections.emptyList());
		}

app/src/main/java/foundation/e/blisslauncher/features/launcher/tasks/LoadDatabaseTask.java

+3 −0

Original line number	Diff line number	Diff line
		package foundation.e.blisslauncher.features.launcher.tasks;

		import android.os.AsyncTask;
		import android.util.Log;

		import foundation.e.blisslauncher.core.database.LauncherDB;
		import foundation.e.blisslauncher.core.database.model.LauncherItem;
		import foundation.e.blisslauncher.core.migrate.Migration;
		@@ -28,6 +30,7 @@ public class LoadDatabaseTask extends AsyncTask<Void, Void, List<LauncherItem>>
		@Override
		protected void onPostExecute(List<LauncherItem> launcherItems) {
		super.onPostExecute(launcherItems);
		Log.d("LoadDatabaseTask", "[debug-db] load db done, got " + launcherItems.size() + " items");
		if (mAppProvider != null) {
		mAppProvider.loadDatabaseOver(launcherItems);
		}