From 89fcbeab22d917190b2c1342dfbed6b504308f5a Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 04:32:05 +0200 Subject: [PATCH 01/56] chore: update repositories for JCenter end-of-life --- android/build.gradle | 2 +- build.gradle | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f97cafda..6fc3c9fc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,9 +5,9 @@ apply plugin: 'com.github.ben-manes.versions' apply plugin: 'kotlin-android' repositories { - jcenter() maven { url 'https://jitpack.io' } maven { url 'https://maven.google.com' } + maven { url "https://plugins.gradle.org/m2/" } } android { diff --git a/build.gradle b/build.gradle index a9db8a04..5c51ecd6 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,9 @@ buildscript { } repositories { - jcenter() + mavenCentral() + google() + maven { url "https://plugins.gradle.org/m2/" } } dependencies { From fb2d2d24cdf1044a64db02c4980a52c35a532c45 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 04:35:17 +0200 Subject: [PATCH 02/56] chore: update sdk, build tools & plugins - accept IDE suggestions to refactor lint and packagingOptions in app build.gradle - replace package in manifest with namespace in build.gradle to comply with a deprecation in gradle build tools 7.3.0 --- android/build.gradle | 45 ++-- android/src/main/AndroidManifest.xml | 3 +- build.gradle | 10 +- gradle/wrapper/gradle-wrapper.jar | Bin 54329 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 286 ++++++++++++++--------- 6 files changed, 209 insertions(+), 137 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 6fc3c9fc..fc5add8b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -11,8 +11,8 @@ repositories { } android { - compileSdkVersion 26 - buildToolsVersion "25.0.3" + namespace 'org.ligi.fast' + compileSdkVersion 33 defaultConfig { versionCode 68 @@ -74,32 +74,37 @@ android { } } - lintOptions { - disable "MissingTranslation" - disable "TypographyEllipsis" - disable "IconLocation" - disable "IconDensities" - disable "ContentDescription" + lint { + disable 'MissingTranslation', 'TypographyEllipsis', 'IconLocation', 'IconDensities', 'ContentDescription' } // needed for assertJ packagingOptions { - exclude 'asm-license.txt' - exclude 'LICENSE' - exclude 'NOTICE' + resources { + excludes += ['asm-license.txt', 'LICENSE', 'NOTICE'] + } } } dependencies { - compile 'com.github.ligi:tracedroid:1.4' - - androidTestCompile 'com.github.ligi:trulesk:0.21' - androidTestCompile 'com.android.support:support-annotations:26.0.2' - androidTestCompile 'com.squareup.spoon:spoon-client:1.7.1' - androidTestCompile 'com.squareup.assertj:assertj-android:1.2.0' - - testCompile 'com.squareup.assertj:assertj-android:1.2.0' - testCompile 'junit:junit:4.12' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + + //TODO update raises minSdkLevel + implementation 'com.github.ligi:tracedroid:1.4' + + //TODO update raises minSdkLevel and requires AndroidX + androidTestImplementation 'com.github.ligi:trulesk:0.21' + //TODO deprecated? + androidTestImplementation 'com.android.support:support-annotations:28.0.0' + //TODO deprecated? + androidTestImplementation 'com.squareup.spoon:spoon-client:1.7.1' + //TODO deprecated + androidTestImplementation 'com.squareup.assertj:assertj-android:1.2.0' + + //TODO deprecated + testImplementation 'com.squareup.assertj:assertj-android:1.2.0' + //TODO migrate to v5 + testImplementation 'junit:junit:4.13.2' } spoon { diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index a8127b9d..2fc250d3 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + + Date: Sun, 21 Aug 2022 10:50:42 +0200 Subject: [PATCH 09/56] chore: request permission for querying apps on api 30+ --- android/src/main/AndroidManifest.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 6bbf82f3..ab722702 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -9,6 +9,17 @@ --> + + + + + + + + + + + Date: Sun, 21 Aug 2022 08:04:40 +0200 Subject: [PATCH 10/56] chore: specify whether to export activities and receivers --- android/src/main/AndroidManifest.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index ab722702..31364059 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -46,6 +46,7 @@ android:theme="@style/DialogTheme" /> - + From ba04d17747955799bb0537d6d3ffa75e9a6fad51 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 18 Oct 2022 20:52:37 +0200 Subject: [PATCH 11/56] chore: hide "Open as Notification" on android 8 and above broken since sdk level 26: requires notification channel support crashes on android 12 --- .../main/java/org/ligi/fast/ui/AppActionDialogBuilder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java index 86f5bca8..934c9f5e 100644 --- a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java +++ b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java @@ -134,7 +134,9 @@ public void run() { })); } - fkt_map.add(new LabelAndCode(context.getString(R.string.open_as_notification), new OpenAsNotificationRunnable())); + if (Build.VERSION.SDK_INT < 26) { + fkt_map.add(new LabelAndCode(context.getString(R.string.open_as_notification), new OpenAsNotificationRunnable())); + } if (App.getSettings().isMarketForAllActivated() || isMarketApp()) { fkt_map.add(new LabelAndCode(context.getString(R.string.open_in) + " " + TargetStore.STORE_NAME, new Runnable() { @@ -232,6 +234,7 @@ private boolean isMarketApp() { } } + //TODO adjust for notification channel requirement on api 26+ private class OpenAsNotificationRunnable implements Runnable { @Override public void run() { From 1fe72f7af4bd6aa0df9fc74f4c2ea0d0b3f53c32 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 18 Oct 2022 20:57:14 +0200 Subject: [PATCH 12/56] chore: targetSdkVersion 32 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 726b0579..f1ae66c4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,7 +20,7 @@ android { // this can be 5 but for assertj this fails - only a problem for tests // http://stackoverflow.com/questions/25753751/increase-minsdk-for-androidtest minSdkVersion 9 - targetSdkVersion 26 + targetSdkVersion 32 applicationId "org.ligi" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" archivesBaseName = "Fast-$versionName" From 01125281bd266bfe7485769baf240b6bbd7276da Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 08:27:08 +0200 Subject: [PATCH 13/56] chore: reminders for non-localized strings --- android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java | 1 + android/src/main/java/org/ligi/fast/ui/SearchActivity.java | 1 + 2 files changed, 2 insertions(+) diff --git a/android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java b/android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java index 5bcf3b4c..8077a143 100755 --- a/android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java +++ b/android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java @@ -72,6 +72,7 @@ private PreferenceScreen createPreferenceHierarchy() { CheckBoxPreference finishAfterLaunch = new CheckBoxPreference(this); finishAfterLaunch.setKey(FASTSettings.KEY_FINISH_ON_LAUNCH); + //TODO localize finishAfterLaunch.setTitle("Finish on Launch"); finishAfterLaunch.setTitle("Finish FAST on App-Launch"); finishAfterLaunch.setDefaultValue(false); diff --git a/android/src/main/java/org/ligi/fast/ui/SearchActivity.java b/android/src/main/java/org/ligi/fast/ui/SearchActivity.java index ab81717d..18690ed2 100755 --- a/android/src/main/java/org/ligi/fast/ui/SearchActivity.java +++ b/android/src/main/java/org/ligi/fast/ui/SearchActivity.java @@ -181,6 +181,7 @@ public void startItemAtPos(int pos) { startActivity(intent); } catch (ActivityNotFoundException e) { e.printStackTrace(); + //TODO localize Toast.makeText(this,"cannot start: " + e,Toast.LENGTH_LONG).show(); } From de961aad283374494223f36337aaa8329de64e3e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 26 Oct 2022 03:20:54 +0200 Subject: [PATCH 14/56] chore(documentation): document AppInfo.labelMode --- .../main/java/org/ligi/fast/model/AppInfo.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index 89e8ed55..dac9f27d 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -269,10 +269,25 @@ public void setPinMode(int pinMode) { this.pinMode = pinMode; } + /** + * The label mode controls which label to display to the user and identifies aliases. + * An alias is an independent entry for this activity with its own override label, call count + * and pin mode. An alias uses the user-set label if available. + * Valid label modes are: + * 0 - use the default label + * 1 - use the user-set label if available + * 2 - this is an alias + * + * @return the current label mode for this record + */ public int getLabelMode() { return this.labelMode; } + /** + * @see #getLabelMode() + * @param mode the new label mode for this record + */ public void setLabelMode(int mode) { this.labelMode = mode; } From 8d27c1c05d885b413d4552a919736dd228fbf624 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 26 Oct 2022 02:27:56 +0200 Subject: [PATCH 15/56] chore(documentation): categorize AppInfo member variables Variable declarations are sorted into the following categories: - Static information that uniquely identifies the activity - Dynamic information that can be regenerated and may need updating - User generated data that needs to be preserved at all times - Runtime state --- .../main/java/org/ligi/fast/model/AppInfo.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index dac9f27d..28024692 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -20,20 +20,26 @@ public class AppInfo { private static final String SEPARATOR = ";;"; - private String label; - private String alternateLabel; - private String overrideLabel; + // Static information, identifies this activity private String packageName; - private String alternatePackageName; private String activityName; private String hash; - private long installTime; + + // User generated data + private String overrideLabel; private int callCount; - private boolean isValid = true; private int pinMode = 0; private int labelMode = 0; + // Dynamic information that can be regenerated private final AppIconCache iconCache; + private String label; + private long installTime; + + // Runtime state + private String alternateLabel; + private String alternatePackageName; + private boolean isValid = true; private AppInfo(Context ctx) { iconCache = new AppIconCache(ctx, this); From 06a2a959e7109d3f935685e31defc9442dfbbc91 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 08:23:44 +0200 Subject: [PATCH 16/56] fix(Open as Notification): specify the pending intent to me immutable --- .../src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java index 934c9f5e..6d10dd27 100644 --- a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java +++ b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java @@ -240,7 +240,7 @@ private class OpenAsNotificationRunnable implements Runnable { public void run() { final Intent notifyIntent = app_info.getIntent(); - PendingIntent intent = PendingIntent.getActivity(context, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent intent = PendingIntent.getActivity(context, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent .FLAG_IMMUTABLE); final String title = app_info.getDisplayLabel(); NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); From 9ec0e730deea094948cdffb65bf137ce53eaadad Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 06:38:53 +0200 Subject: [PATCH 17/56] fix(SortByLastInstalled): change direction to newest first --- .../java/org/ligi/fast/model/AppInfoSortByLastInstalled.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfoSortByLastInstalled.java b/android/src/main/java/org/ligi/fast/model/AppInfoSortByLastInstalled.java index 9ea86543..2cbe03ae 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfoSortByLastInstalled.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfoSortByLastInstalled.java @@ -14,9 +14,9 @@ public int compare(AppInfo lhs, AppInfo rhs) { if (lhs.getInstallTime() == rhs.getInstallTime()) { result = sortByLabel.compare(lhs, rhs); } else if (lhs.getInstallTime() < rhs.getInstallTime()) { - result = -1; - } else if (lhs.getInstallTime() > rhs.getInstallTime()) { result = 1; + } else if (lhs.getInstallTime() > rhs.getInstallTime()) { + result = -1; } return result; From 7bc01f478896706cc98ed75659ffd70c3a2ea01f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 06:45:05 +0200 Subject: [PATCH 18/56] fix(SortByLastInstalled): sort pinned apps to the top --- .../org/ligi/fast/model/AppInfoSortByLastInstalled.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfoSortByLastInstalled.java b/android/src/main/java/org/ligi/fast/model/AppInfoSortByLastInstalled.java index 2cbe03ae..83e9b797 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfoSortByLastInstalled.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfoSortByLastInstalled.java @@ -5,11 +5,15 @@ public class AppInfoSortByLastInstalled implements Comparator { private final Comparator sortByLabel = new AppInfoSortByLabelComparator(); + private final Comparator sortByPin = new AppInfoSortByPinComparator(); @Override public int compare(AppInfo lhs, AppInfo rhs) { - int result = 0; + int result = sortByPin.compare(lhs, rhs); + if (result != 0) { + return result; + } if (lhs.getInstallTime() == rhs.getInstallTime()) { result = sortByLabel.compare(lhs, rhs); From bdfcfd66d6b6899df27f85f1fb11d6e90b725592 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 08:01:27 +0200 Subject: [PATCH 19/56] fix(LoadingDialog): properly deal with screen rotation instead of locking it --- android/src/main/AndroidManifest.xml | 1 + android/src/main/java/org/ligi/fast/ui/LoadingDialog.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 31364059..235e5c45 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -43,6 +43,7 @@ Date: Tue, 25 Oct 2022 02:15:46 +0200 Subject: [PATCH 20/56] fix(AppIconCache): close the FileInputStream in getIcon() --- android/src/main/java/org/ligi/fast/model/AppIconCache.java | 1 + 1 file changed, 1 insertion(+) diff --git a/android/src/main/java/org/ligi/fast/model/AppIconCache.java b/android/src/main/java/org/ligi/fast/model/AppIconCache.java index 6972933b..8f796754 100644 --- a/android/src/main/java/org/ligi/fast/model/AppIconCache.java +++ b/android/src/main/java/org/ligi/fast/model/AppIconCache.java @@ -115,6 +115,7 @@ public Drawable getIcon() { try { final FileInputStream fileInputStream = new FileInputStream(getIconCacheFile()); final BitmapDrawable drawable = new BitmapDrawable(ctx.getResources(), fileInputStream); + fileInputStream.close(); cachedIcon = new SoftReference(drawable); return cachedIcon.get(); } catch (Exception e) { From c33b72061df43dcaacd60e4b7ccbde656bc166a7 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 01:53:49 +0200 Subject: [PATCH 21/56] fix(AppIconCache): remove log spam --- android/src/main/java/org/ligi/fast/model/AppIconCache.java | 1 - 1 file changed, 1 deletion(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppIconCache.java b/android/src/main/java/org/ligi/fast/model/AppIconCache.java index 8f796754..a55bf477 100644 --- a/android/src/main/java/org/ligi/fast/model/AppIconCache.java +++ b/android/src/main/java/org/ligi/fast/model/AppIconCache.java @@ -77,7 +77,6 @@ private boolean createIconCacheFile() throws IOException { private File getIconCacheFile() { final File file = new File(App.getBaseDir() + "/" + appInfo.getHash() + ".png"); - Log.i("returning " + file.exists()); return file; } From 6ab13032111e234281adfc708409dff189fe583b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 24 Oct 2022 21:01:23 +0200 Subject: [PATCH 22/56] fix(AppInfo): calculate the alternate label from the display label --- .../java/org/ligi/fast/model/AppInfo.java | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index 28024692..486b40fb 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -37,7 +37,7 @@ public class AppInfo { private long installTime; // Runtime state - private String alternateLabel; + private String alternateDisplayLabel; private String alternatePackageName; private boolean isValid = true; @@ -128,7 +128,7 @@ public AppInfo(Context _ctx, ResolveInfo ri) { } private void calculateAlternateLabelAndPackageName() { - alternateLabel = UmlautConverter.replaceAllUmlautsReturnNullIfEqual(label); + alternateDisplayLabel = UmlautConverter.replaceAllUmlautsReturnNullIfEqual(getDisplayLabel()); alternatePackageName = UmlautConverter.replaceAllUmlautsReturnNullIfEqual(packageName); } @@ -188,11 +188,12 @@ public String getActivityName() { } /** - * Please keep in mind that this might now return unexpected values - * @return the user-set label if it is set, default otherwise + * The label that is meant to be displayed to the user. + * + * @return the user-set label if present, default otherwise */ public String getDisplayLabel() { - if (labelMode == 0) { + if (labelMode == 0 || overrideLabel == null) { return label; } else { return overrideLabel; @@ -228,19 +229,13 @@ public String getHash() { } /** - * Please keep in mind that this might now return unexpected values - * @return the user-set label if it is set, alternateLabel otherwise + * The sanitized version of {@link #getDisplayLabel()}} + * Umlauts are converted and accents are stripped from characters. + * + * @return sanitized display label. null if it would be equal to {@link #getDisplayLabel()}. */ public String getAlternateDisplayLabel() { - if (labelMode == 0) { - return alternateLabel; - } else { - return overrideLabel; - } - } - - public String getAlternateLabel() { - return alternateLabel; + return alternateDisplayLabel; } public String getAlternatePackageName() { @@ -304,5 +299,6 @@ public String getOverrideLabel() { public void setOverrideLabel(String label) { this.overrideLabel = label; + calculateAlternateLabelAndPackageName(); } } From 2f8734deddbb7935ac06f2452eacc167fc7843a3 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 00:27:21 +0200 Subject: [PATCH 23/56] fix(AppInfo): invalidate if activityInfo is null --- android/src/main/java/org/ligi/fast/model/AppInfo.java | 1 + 1 file changed, 1 insertion(+) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index 486b40fb..fec8f3d9 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -102,6 +102,7 @@ public AppInfo(Context _ctx, ResolveInfo ri) { packageName = ri.activityInfo.packageName; activityName = ri.activityInfo.name; } else { + isValid = false; packageName = "unknown"; activityName = "unknown"; } From 539b2e68d31a2888c48229b115ae6dc0e7bbad7e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 24 Oct 2022 01:03:09 +0200 Subject: [PATCH 24/56] fix(AppInfo): silently handle NameNotFoundException when looking up install time --- android/src/main/java/org/ligi/fast/model/AppInfo.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index fec8f3d9..4eb47129 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -118,8 +118,7 @@ public AppInfo(Context _ctx, ResolveInfo ri) { installTime = pi.lastUpdateTime; } } catch (NameNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + isValid = false; // Package does not exist } From 2b0cf8766154cf3309d0e26913e34cb00af657b0 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 7 Sep 2022 02:03:05 +0200 Subject: [PATCH 25/56] fix(AppInfo): propagate install time when merging new items --- android/src/main/java/org/ligi/fast/model/AppInfo.java | 1 + 1 file changed, 1 insertion(+) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index 4eb47129..21c00f41 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -258,6 +258,7 @@ public void mergeSafe(AppInfo appInfo) { setOverrideLabel(appInfo.getOverrideLabel()); } + installTime = appInfo.getInstallTime(); label = appInfo.getLabel(); calculateAlternateLabelAndPackageName(); } From da1be9b48101860b5823cedabc22cb580906f891 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 6 Sep 2022 23:28:35 +0200 Subject: [PATCH 26/56] fix(AppInfo): track last update time separately --- .../java/org/ligi/fast/model/AppInfo.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index 21c00f41..a634b807 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -35,6 +35,7 @@ public class AppInfo { private final AppIconCache iconCache; private String label; private long installTime; + private long lastUpdateTime; // Runtime state private String alternateDisplayLabel; @@ -66,11 +67,18 @@ public AppInfo(Context ctx, String cache_str) { labelMode = Integer.parseInt(app_info_str_split[7]); if (app_info_str_split.length > 8) { overrideLabel = app_info_str_split[8]; + if (app_info_str_split.length > 9) { + lastUpdateTime = Long.parseLong(app_info_str_split[9]); + } } } } } + if (lastUpdateTime < installTime) { + lastUpdateTime = installTime; + } + calculateAlternateLabelAndPackageName(); return; } catch (Exception ignored) { @@ -115,7 +123,8 @@ public AppInfo(Context _ctx, ResolveInfo ri) { try { final PackageInfo pi = pmManager.getPackageInfo(packageName, 0); if (Build.VERSION.SDK_INT >= 9) { - installTime = pi.lastUpdateTime; + lastUpdateTime = pi.lastUpdateTime; + installTime = pi.firstInstallTime; } } catch (NameNotFoundException e) { isValid = false; // Package does not exist @@ -136,7 +145,8 @@ public String toCacheString() { return hash + SEPARATOR + label + SEPARATOR + packageName + SEPARATOR + activityName + SEPARATOR + callCount + SEPARATOR + installTime + SEPARATOR + pinMode + - SEPARATOR + labelMode + SEPARATOR + overrideLabel; + SEPARATOR + labelMode + SEPARATOR + overrideLabel + + SEPARATOR + lastUpdateTime; } private String calculateTheHash() { @@ -212,6 +222,10 @@ public long getInstallTime() { return installTime; } + public long getLastUpdateTime() { + return lastUpdateTime; + } + public void setCallCount(int count) { callCount = count; } @@ -259,6 +273,7 @@ public void mergeSafe(AppInfo appInfo) { } installTime = appInfo.getInstallTime(); + lastUpdateTime = appInfo.getLastUpdateTime(); label = appInfo.getLabel(); calculateAlternateLabelAndPackageName(); } From 5d52576d58a6d215f80ce02d3e4ff751c2081c7a Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 2 Jul 2019 02:35:30 +0200 Subject: [PATCH 27/56] fix(AppInfo): infer update time from apk mtime on Froyo and older --- .../java/org/ligi/fast/model/AppInfo.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index a634b807..f52e90b2 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -2,12 +2,15 @@ import android.content.Context; import android.content.Intent; +import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.os.Build; + +import java.io.File; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import org.ligi.axt.helpers.ResolveInfoHelper; @@ -116,13 +119,17 @@ public AppInfo(Context _ctx, ResolveInfo ri) { } callCount = 0; - final PackageManager pmManager = _ctx.getPackageManager(); - installTime = 0; try { - final PackageInfo pi = pmManager.getPackageInfo(packageName, 0); - if (Build.VERSION.SDK_INT >= 9) { + PackageManager pm = _ctx.getPackageManager(); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.GINGERBREAD) { + ApplicationInfo appInfo = pm.getApplicationInfo(packageName, 0); + String appFile = appInfo.sourceDir; + lastUpdateTime = new File(appFile).lastModified(); + installTime = lastUpdateTime; + } else { + PackageInfo pi = pm.getPackageInfo(packageName, 0); lastUpdateTime = pi.lastUpdateTime; installTime = pi.firstInstallTime; } @@ -272,7 +279,11 @@ public void mergeSafe(AppInfo appInfo) { setOverrideLabel(appInfo.getOverrideLabel()); } - installTime = appInfo.getInstallTime(); + // Because we fall back to lastUpdateTime when setting installTime below gingerbread our + // best bet is to just never update it value to keep it close to the first install time. + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) { + installTime = appInfo.getInstallTime(); + } lastUpdateTime = appInfo.getLastUpdateTime(); label = appInfo.getLabel(); calculateAlternateLabelAndPackageName(); From 84c698124609310b87366a7b70bd7cf32c7ad481 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 11:21:48 +0200 Subject: [PATCH 28/56] fix(Layout): remove extra padding at the bottom of item_icon.xml --- android/src/main/res/layout/item_icon.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/android/src/main/res/layout/item_icon.xml b/android/src/main/res/layout/item_icon.xml index 1ae0b4af..32fdafe0 100644 --- a/android/src/main/res/layout/item_icon.xml +++ b/android/src/main/res/layout/item_icon.xml @@ -14,7 +14,5 @@ android:id="@+id/textView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center" - android:paddingBottom="20dp" /> - - \ No newline at end of file + android:gravity="center" /> + From 97f53ff2e714fd3bada8351df696925765403983 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 7 Sep 2022 00:18:44 +0200 Subject: [PATCH 29/56] fix(translation): add missing array values and improve values-de --- android/src/main/res/values/strings.xml | 5 +- .../src/withExtras/res/values-de/strings.xml | 52 +++++++++++++------ .../src/withExtras/res/values-el/strings.xml | 1 + .../src/withExtras/res/values-fr/strings.xml | 1 + .../src/withExtras/res/values-it/strings.xml | 1 + .../src/withExtras/res/values-ja/strings.xml | 2 +- .../src/withExtras/res/values-ru/strings.xml | 2 +- .../src/withExtras/res/values-sr/strings.xml | 1 + 8 files changed, 45 insertions(+), 20 deletions(-) diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index f27e5f57..a3b58e9c 100755 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -54,24 +54,23 @@ More speed or more pixels? Pin Unpin + Tiny Small Medium Large - Dark Light Transparent dark Transparent light - Unsorted Alphabetical By usage By installation time - + diff --git a/android/src/withExtras/res/values-de/strings.xml b/android/src/withExtras/res/values-de/strings.xml index 732d8fc7..e2e3dbc4 100644 --- a/android/src/withExtras/res/values-de/strings.xml +++ b/android/src/withExtras/res/values-de/strings.xml @@ -1,10 +1,9 @@ - FAST Automatische Ausführung Einstellungen Teilen - Suche auch im Packagename - Suche in vollständigen Packagename + Durchsucht auch die Paketnamen + Paketsuche Autostart bei genau einem Ergebnis Öffne mit %s für alle Auch wenn auf anderem Wege installiert @@ -20,31 +19,54 @@ create shortcut Icongröße Wie groß sollen die Icons sein? + Aussehen + Wie soll FAST aussehen? + Sortierung + Wie sollen die Anwendungen sortiert sein? + Umlaute wandeln + ae zu ä; oe zu ö; ss zu ß; ue zu ü + Buchstabensuche + Zeige Einträge mit den gesuchten Buchstaben + Anwendung konnte nicht mehr gefunden werden + Als Alias anlegen + Abbruch + Umbenennen + %s umbenennen + Verbergen + Priorisiere Auflösung oder Geschwindigkeit + Auflösung der Anwendungssymbole + Ignoriere Leerzeichen am Ende der Anfrage + Leerzeichen ignorieren + Anwendungen werden geladen + Verborgene Anwendungen anzeigen + Anheften + Alias löschen + Zwischenspeicher leeren + Verlauf und Anwendungliste zurücksetzen + Titel zurücksetzen + Verborgene Anwendungen anzeigen + Sortiert ans Ende der Liste + Automatische Tastatur + Tastatur wird automatisch aktiviert + Einblenden + Ablösen + klein mittel groß riesig - dunkel hell - transparent hell transparent dunkel + transparent hell - - Aussehen - Wie soll FAST aussehen? - Sortierung - wie sollen die Anwendungen sortiert sein? - Umlaute wandeln - ae zu ä; oe zu ö; ss zu ß; ue zu ü - Lücken OK in Suche - unsortiert alphabetisch - Benutzung + nach Benutzung + nach Installationsdatum diff --git a/android/src/withExtras/res/values-el/strings.xml b/android/src/withExtras/res/values-el/strings.xml index a0357ef8..e22b6807 100644 --- a/android/src/withExtras/res/values-el/strings.xml +++ b/android/src/withExtras/res/values-el/strings.xml @@ -55,5 +55,6 @@ Αταξηνόμητα Αλφαβητικά χρήση + By installation time diff --git a/android/src/withExtras/res/values-fr/strings.xml b/android/src/withExtras/res/values-fr/strings.xml index ff4da6b0..21036b11 100644 --- a/android/src/withExtras/res/values-fr/strings.xml +++ b/android/src/withExtras/res/values-fr/strings.xml @@ -61,5 +61,6 @@ Si vous aimez cette application vous pouvez la partager, sélectionnez partager "Non trié" "Alphabétique" "Usage" + By installation time diff --git a/android/src/withExtras/res/values-it/strings.xml b/android/src/withExtras/res/values-it/strings.xml index 4cda58cc..84e6ddb4 100644 --- a/android/src/withExtras/res/values-it/strings.xml +++ b/android/src/withExtras/res/values-it/strings.xml @@ -72,5 +72,6 @@ Non ordinate Ordine alfabetico A seconda dell\'uso + By installation time diff --git a/android/src/withExtras/res/values-ja/strings.xml b/android/src/withExtras/res/values-ja/strings.xml index 18213255..acb2cbc8 100644 --- a/android/src/withExtras/res/values-ja/strings.xml +++ b/android/src/withExtras/res/values-ja/strings.xml @@ -71,5 +71,5 @@ アルファベット 使用状況 インストール時間 - + diff --git a/android/src/withExtras/res/values-ru/strings.xml b/android/src/withExtras/res/values-ru/strings.xml index 8a49e2b0..76398697 100644 --- a/android/src/withExtras/res/values-ru/strings.xml +++ b/android/src/withExtras/res/values-ru/strings.xml @@ -72,5 +72,5 @@ Алфавитный порядок По использованию По времени установки - + diff --git a/android/src/withExtras/res/values-sr/strings.xml b/android/src/withExtras/res/values-sr/strings.xml index f8b4cc01..849a32bb 100644 --- a/android/src/withExtras/res/values-sr/strings.xml +++ b/android/src/withExtras/res/values-sr/strings.xml @@ -72,5 +72,6 @@ Unsorted Alphabetical By usage + By installation time From 38b49af4ad9e93c0f86b43d0c9077536d01ef564 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 23:44:10 +0200 Subject: [PATCH 30/56] fix(strings): be more clear on what "Clear cache" does --- android/src/main/res/values/strings.xml | 4 ++-- android/src/withExtras/res/values-de/strings.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index a3b58e9c..509df3bd 100755 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -48,8 +48,8 @@ Show keyboard Open the keyboard on startup FAST Launch - Clear cache - Force FAST to reset app list and history + Delete app list and icon cache + Resets app icons, usage data and customizations Icon Resolution More speed or more pixels? Pin diff --git a/android/src/withExtras/res/values-de/strings.xml b/android/src/withExtras/res/values-de/strings.xml index e2e3dbc4..7e8e2e85 100644 --- a/android/src/withExtras/res/values-de/strings.xml +++ b/android/src/withExtras/res/values-de/strings.xml @@ -41,8 +41,8 @@ Verborgene Anwendungen anzeigen Anheften Alias löschen - Zwischenspeicher leeren - Verlauf und Anwendungliste zurücksetzen + Appliste und Icons löschen + Setzt Icons, Benutzungsdaten und Anpassungen zurück Titel zurücksetzen Verborgene Anwendungen anzeigen Sortiert ans Ende der Liste From 8b3b8336c56a4ad4969e9672513e5afd91758dbc Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 29 Oct 2022 00:06:54 +0200 Subject: [PATCH 31/56] fix(strings): be more clear on what "Convert umlauts" does --- android/src/main/res/values/strings.xml | 4 ++-- android/src/withExtras/res/values-de/strings.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 509df3bd..17194b19 100755 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -38,8 +38,8 @@ Choose the look of FAST App Search Sort How should the apps be sorted? - Convert umlauts - Change ae to ä, oe to ö, ss to ß and ue to ü + Regular characters match accented ones as well + Special matches: ae=ä, oe=ö, ue=ü and ss=ß Search within words Matches all letters, not just whole words Caching to serve FAST diff --git a/android/src/withExtras/res/values-de/strings.xml b/android/src/withExtras/res/values-de/strings.xml index 7e8e2e85..f3f8945e 100644 --- a/android/src/withExtras/res/values-de/strings.xml +++ b/android/src/withExtras/res/values-de/strings.xml @@ -23,8 +23,8 @@ Wie soll FAST aussehen? Sortierung Wie sollen die Anwendungen sortiert sein? - Umlaute wandeln - ae zu ä; oe zu ö; ss zu ß; ue zu ü + Ergebnisse mit Akzenten einbeziehen + Sonderbehandlung von Umlauten: ae=ä, oe=ö, ue=ü und ss=ß Buchstabensuche Zeige Einträge mit den gesuchten Buchstaben Anwendung konnte nicht mehr gefunden werden From 94fb3e73956768bcfe9a0b9c498f042a56028643 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 05:57:03 +0200 Subject: [PATCH 32/56] fix(tests): remove unresolved imports in TheAppInfoList and TheStringUtils --- android/src/test/java/org/ligi/fast/testing/TheAppInfoList.java | 2 -- android/src/test/java/org/ligi/fast/testing/TheStringUtils.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/android/src/test/java/org/ligi/fast/testing/TheAppInfoList.java b/android/src/test/java/org/ligi/fast/testing/TheAppInfoList.java index 5b862b6a..b7021da4 100644 --- a/android/src/test/java/org/ligi/fast/testing/TheAppInfoList.java +++ b/android/src/test/java/org/ligi/fast/testing/TheAppInfoList.java @@ -1,7 +1,5 @@ package org.ligi.fast.testing; -import android.test.suitebuilder.annotation.SmallTest; - import org.junit.Before; import org.junit.Test; import org.ligi.fast.model.AppInfo; diff --git a/android/src/test/java/org/ligi/fast/testing/TheStringUtils.java b/android/src/test/java/org/ligi/fast/testing/TheStringUtils.java index b81f3d39..6f3fbfb4 100644 --- a/android/src/test/java/org/ligi/fast/testing/TheStringUtils.java +++ b/android/src/test/java/org/ligi/fast/testing/TheStringUtils.java @@ -1,7 +1,5 @@ package org.ligi.fast.testing; -import android.test.suitebuilder.annotation.SmallTest; - import org.junit.Test; import org.ligi.fast.util.StringUtils; From 678ae003a2a7640d0670c9770a77794238b74a35 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 05:06:55 +0200 Subject: [PATCH 33/56] feat: use https in sharing links --- android/src/forAmazon/java/org/ligi/fast/TargetStore.java | 2 +- android/src/forFDroid/java/fast/TargetStore.java | 2 +- android/src/forGooglePlay/java/org/ligi/fast/TargetStore.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/src/forAmazon/java/org/ligi/fast/TargetStore.java b/android/src/forAmazon/java/org/ligi/fast/TargetStore.java index 9f6e519b..1b9eb2a6 100644 --- a/android/src/forAmazon/java/org/ligi/fast/TargetStore.java +++ b/android/src/forAmazon/java/org/ligi/fast/TargetStore.java @@ -1,7 +1,7 @@ package org.ligi.fast; public class TargetStore { - public final static String STORE_URL = "http://www.amazon.com/gp/mas/dl/android?p="; + public final static String STORE_URL = "https://www.amazon.com/gp/mas/dl/android?p="; public final static String STORE_NAME = "Amazon Store"; public final static String STORE_PNAME = "com.amazon.venezia"; } diff --git a/android/src/forFDroid/java/fast/TargetStore.java b/android/src/forFDroid/java/fast/TargetStore.java index fe1ac9e4..ac72e321 100644 --- a/android/src/forFDroid/java/fast/TargetStore.java +++ b/android/src/forFDroid/java/fast/TargetStore.java @@ -1,7 +1,7 @@ package org.ligi.fast; public class TargetStore { - public final static String STORE_URL = "http://play.google.com/store/apps/details?id="; + public final static String STORE_URL = "https://play.google.com/store/apps/details?id="; public final static String STORE_NAME = "Google Play"; public final static String STORE_PNAME = "com.android.vending"; } diff --git a/android/src/forGooglePlay/java/org/ligi/fast/TargetStore.java b/android/src/forGooglePlay/java/org/ligi/fast/TargetStore.java index fe1ac9e4..ac72e321 100644 --- a/android/src/forGooglePlay/java/org/ligi/fast/TargetStore.java +++ b/android/src/forGooglePlay/java/org/ligi/fast/TargetStore.java @@ -1,7 +1,7 @@ package org.ligi.fast; public class TargetStore { - public final static String STORE_URL = "http://play.google.com/store/apps/details?id="; + public final static String STORE_URL = "https://play.google.com/store/apps/details?id="; public final static String STORE_NAME = "Google Play"; public final static String STORE_PNAME = "com.android.vending"; } From 17c4cc0bc976cc99d0be68a215b0c84f9637b000 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 18 Oct 2022 20:45:07 +0200 Subject: [PATCH 34/56] feat: when sharing, use "[app label] - [url]" --- .../src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java index 6d10dd27..3081dfa8 100644 --- a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java +++ b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java @@ -154,7 +154,7 @@ public void run() { @Override public void run() { try { - String message = "check out this app: " + App.getStoreURL4PackageName(app_info.getPackageName()); + String message = app_info.getLabel() + " - " + App.getStoreURL4PackageName(app_info.getPackageName()); Intent share = new Intent(Intent.ACTION_SEND); share.setType("text/plain"); share.putExtra(Intent.EXTRA_TEXT, message); From f8f31fc0214cdac6dbf95509243d4fb581ad4b67 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 24 Oct 2022 20:45:45 +0200 Subject: [PATCH 35/56] feat: strip accents with java.text.Normalizer if available --- .../src/main/java/org/ligi/fast/util/UmlautConverter.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/android/src/main/java/org/ligi/fast/util/UmlautConverter.java b/android/src/main/java/org/ligi/fast/util/UmlautConverter.java index caf0b827..1c957838 100644 --- a/android/src/main/java/org/ligi/fast/util/UmlautConverter.java +++ b/android/src/main/java/org/ligi/fast/util/UmlautConverter.java @@ -1,5 +1,8 @@ package org.ligi.fast.util; +import android.os.Build; + +import java.text.Normalizer; import java.util.HashMap; import java.util.Map; @@ -57,6 +60,11 @@ public static String replaceAllUmlauts(String input) { output = output.replace(entry.getKey(), entry.getValue()); } + if (Build.VERSION.SDK_INT >= 9) { + output = Normalizer.normalize(output, Normalizer.Form.NFD); + output = output.replaceAll("[\\p{M}]", ""); + } + return output; } From fcdacb7f808a8b323082a182d7ed1fd472c5970d Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 26 Oct 2022 01:20:59 +0200 Subject: [PATCH 36/56] feat: make FAST appear on the recents screen --- android/src/main/AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 235e5c45..f9e12055 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -51,7 +51,6 @@ android:label="@string/app_name" android:launchMode="singleTask" android:stateNotNeeded="true" - android:excludeFromRecents="true" android:configChanges="orientation"> Date: Mon, 1 Jul 2019 23:25:01 +0200 Subject: [PATCH 37/56] feat: make Application Details appear on the recents screen --- .../java/org/ligi/fast/ui/AppActionDialogBuilder.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java index 3081dfa8..705e2f74 100644 --- a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java +++ b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java @@ -193,10 +193,18 @@ private static void showInstalledAppDetails(Context context, String packageName) { Intent intent = new Intent(); final int apiLevel = Build.VERSION.SDK_INT; + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); if (apiLevel >= 9) { // above 2.3 intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); Uri uri = Uri.fromParts(SCHEME, packageName, null); intent.setData(uri); + if (apiLevel >= 11) { + // These flags give every new activity a separate entry on the recents screen instead + // of replacing the most recent one of the same type. The latter does exist since api + // level 1 but below android 3.0 the recents screen only displays the most recent + // 8 items - at least on some screen sizes - and does not allow removing them. + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + } } else { // below 2.3 final String appPkgName = (apiLevel == 8 ? APP_PKG_NAME_22 : APP_PKG_NAME_21); intent.setAction(Intent.ACTION_VIEW); From 4183db6cefff6bd947c452881a7456fb6d8e2f38 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 28 Oct 2022 07:05:34 +0200 Subject: [PATCH 38/56] feat: don't dismiss the Change Label dialog when touching outside --- .../src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java index 705e2f74..53d5173b 100644 --- a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java +++ b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java @@ -59,7 +59,7 @@ public void run() { fkt_map.add(new LabelAndCode(context.getString(R.string.change_label), new Runnable() { @Override public void run() { - new SetLabelDialogBuilder(context, app_info).show(); + new SetLabelDialogBuilder(context, app_info).show().setCanceledOnTouchOutside(false); ((SearchActivity) context).configureAdapter(); } })); From 2d96b0e40419d04e8e57aebe4e1f3305e8c6ce22 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 24 Oct 2022 20:21:42 +0200 Subject: [PATCH 39/56] feat: refresh an app icon if its app was updated --- .../org/ligi/fast/model/AppIconCache.java | 68 ++++++++++++------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppIconCache.java b/android/src/main/java/org/ligi/fast/model/AppIconCache.java index a55bf477..cc328379 100644 --- a/android/src/main/java/org/ligi/fast/model/AppIconCache.java +++ b/android/src/main/java/org/ligi/fast/model/AppIconCache.java @@ -13,10 +13,12 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.IOException; import java.lang.ref.SoftReference; public class AppIconCache { + private static final Bitmap.CompressFormat COMPRESS_FORMAT = Bitmap.CompressFormat.PNG; + private static final String CACHE_FILE_ENDING = ".png"; + private final IconConverter iconConverter = new IconConverter(); private final Context ctx; @@ -29,6 +31,31 @@ public AppIconCache(Context ctx, AppInfo appInfo) { this.appInfo = appInfo; } + private static File getIconCacheFile(AppInfo appInfo) { + return new File(App.getBaseDir() + "/" + appInfo.getHash() + CACHE_FILE_ENDING); + } + + private static void invalidateIconCacheFile(File file) { + if (!file.setLastModified(0)) { + Log.w("Unable to invalidate " + file.getAbsolutePath()); + } + } + + /** + * Notify the icon cache that a cached file needs to be updated the next time {@link #cacheIcon(ResolveInfo)} + * is called. Until then, the outdated files will be kept as a fallback. + */ + public static void invalidateIconCache() { + if (App.getBaseDir().exists()) { + File[] iconFiles = App.getBaseDir().listFiles(pathname -> pathname.getName().endsWith(CACHE_FILE_ENDING)); + if (iconFiles != null) { + for (File iconFile : iconFiles) { + invalidateIconCacheFile(iconFile); + } + } + } + } + public void cacheIcon(ResolveInfo ri) { final PackageManager packageManager = ctx.getPackageManager(); @@ -70,38 +97,31 @@ class IconCacheSpec { public int quality = 100; } - - private boolean createIconCacheFile() throws IOException { - return getIconCacheFile().createNewFile(); - } - private File getIconCacheFile() { - final File file = new File(App.getBaseDir() + "/" + appInfo.getHash() + ".png"); - return file; + return getIconCacheFile(this.appInfo); } private boolean tryIconCaching(IconCacheSpec iconCacheSpec, ResolveInfo ri, PackageManager pm) { - if (getIconCacheFile().exists()) { + if (getIconCacheFile().exists() && getIconCacheFile().lastModified() > appInfo.getLastUpdateTime()) { return true; } - + final Drawable icon = ri.loadIcon(pm); + if (icon == null) { + Log.w("Could not cache icon: PackageManager.loadIcon() returned null"); + return false; + } + final File iconFile = getIconCacheFile(); + final Bitmap cacheIcon = iconConverter.toScaledBitmap(icon, iconCacheSpec); try { - final Drawable icon = ri.loadIcon(pm); - if (icon != null) { - createIconCacheFile(); - - final FileOutputStream fos = new FileOutputStream(getIconCacheFile()); - - final Bitmap cacheIcon = iconConverter.toScaledBitmap(icon, iconCacheSpec); - cacheIcon.compress(Bitmap.CompressFormat.PNG, iconCacheSpec.quality, fos); - - fos.close(); - return true; - } - + iconFile.createNewFile(); + final FileOutputStream fos = new FileOutputStream(iconFile); + cacheIcon.compress(COMPRESS_FORMAT, iconCacheSpec.quality, fos); + fos.close(); + return true; } catch (Exception e) { - Log.w(" Could not cache the Icon" + e); + Log.w("Could not cache icon: " + e); } + invalidateIconCacheFile(iconFile); return false; } From 65110fb6a556f7c2ed6ee306487a257146e999f3 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 29 Oct 2022 01:02:31 +0200 Subject: [PATCH 40/56] feat: keep index when changing icon resolution --- .../src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java b/android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java index 8077a143..f7cc62da 100755 --- a/android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java +++ b/android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java @@ -15,6 +15,7 @@ import org.ligi.fast.App; import org.ligi.fast.R; import org.ligi.fast.TargetStore; +import org.ligi.fast.model.AppIconCache; import org.ligi.fast.settings.FASTSettings; /** @@ -96,7 +97,7 @@ private PreferenceScreen createPreferenceHierarchy() { resolutionPref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - new FileHelper(App.getBaseDir()).deleteRecursive(); + AppIconCache.invalidateIconCache(); return true; } }); From 45ad1307127389d954b719c0f105473b5789886f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 24 Oct 2022 08:55:45 +0200 Subject: [PATCH 41/56] refactor: remove unused ViewHelper.findById --- android/src/main/java/org/ligi/axt/helpers/ViewHelper.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/android/src/main/java/org/ligi/axt/helpers/ViewHelper.java b/android/src/main/java/org/ligi/axt/helpers/ViewHelper.java index eee102e6..47e288ab 100644 --- a/android/src/main/java/org/ligi/axt/helpers/ViewHelper.java +++ b/android/src/main/java/org/ligi/axt/helpers/ViewHelper.java @@ -15,10 +15,6 @@ public ViewHelper(View view) { this.view = view; } - public T findById(int id) { - return (T) view.findViewById(id); - } - public void hideKeyBoard() { InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); if (imm != null) { From d43e3cf373106f45b6758fb9a913bdcb278f9a47 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 08:29:52 +0200 Subject: [PATCH 42/56] refactor: remove unused DynamicAppInfoList.get*WithHash --- .../ligi/fast/model/DynamicAppInfoList.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java b/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java index af3a3614..1e666295 100755 --- a/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java +++ b/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java @@ -156,25 +156,6 @@ private boolean isGapSearchActivateAndTrueForQuery(AppInfo info, String query) { return false; } - private static AppInfo getAppWithHash(String hash, List appInfoList) { - for (AppInfo info : appInfoList) { - if (info.getLabelMode() < 2 && info.getHash().equals(hash)) { - return info; - } - } - return null; - } - - private static AppInfoList getAliasesWithHash(String hash, List appInfoList) { - AppInfoList aliasesWithHash = new AppInfoList(); - for (AppInfo info : appInfoList) { - if (info.getLabelMode() == 2 && info.getHash().equals(hash)) { - aliasesWithHash.add(info); - } - } - return aliasesWithHash; - } - public List getBackingAppInfoList() { return backingAppInfoList; } From 5bdef49429e965d525dcd16f7d697725cf2108e4 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 08:28:44 +0200 Subject: [PATCH 43/56] refactor: remove unused ViewHelper.hideKeyBoard and .startIntentOnClick --- .../java/org/ligi/axt/helpers/ViewHelper.java | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/android/src/main/java/org/ligi/axt/helpers/ViewHelper.java b/android/src/main/java/org/ligi/axt/helpers/ViewHelper.java index 47e288ab..1099b986 100644 --- a/android/src/main/java/org/ligi/axt/helpers/ViewHelper.java +++ b/android/src/main/java/org/ligi/axt/helpers/ViewHelper.java @@ -2,7 +2,6 @@ import android.content.Context; -import android.content.Intent; import android.util.Log; import android.view.View; import android.view.inputmethod.InputMethodManager; @@ -15,15 +14,6 @@ public ViewHelper(View view) { this.view = view; } - public void hideKeyBoard() { - InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - if (imm != null) { - imm.hideSoftInputFromWindow(view.getWindowToken(), 0); - } else { - Log.w("AndroidHelper", "could not hide Keyboard as INPUT_METHOD_SERVICE is not available"); - } - } - public void showKeyboard() { InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); if (imm != null) { @@ -32,15 +22,4 @@ public void showKeyboard() { Log.w("AndroidHelper", "could not show Keyboard as INPUT_METHOD_SERVICE is not available"); } } - - public void startIntentOnClick(final Intent intent) { - view.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - v.getContext().startActivity(intent); - } - }); - } - - } From 5555863ec42a6bf74436345f8982941258f4361d Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 28 Oct 2022 23:48:42 +0200 Subject: [PATCH 44/56] refactor: remove unused class PackageListSerializer its code is entirely duplicated in AppInfoListStore --- .../ligi/fast/util/PackageListSerializer.java | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 android/src/main/java/org/ligi/fast/util/PackageListSerializer.java diff --git a/android/src/main/java/org/ligi/fast/util/PackageListSerializer.java b/android/src/main/java/org/ligi/fast/util/PackageListSerializer.java deleted file mode 100644 index a5635b55..00000000 --- a/android/src/main/java/org/ligi/fast/util/PackageListSerializer.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ligi.fast.util; - -import android.content.Context; - -import org.ligi.fast.model.AppInfo; - -import java.util.ArrayList; -import java.util.List; - -public class PackageListSerializer { - - public static List fromString(Context ctx, String inString) { - List res = new ArrayList(); - - if (inString == null) { - return res; - } - - String[] lines = inString.split("\n"); - for (String line : lines) { - if (line.length() > 0) { - AppInfo appInfo = new AppInfo(ctx, line); - - if (appInfo.isValid()) { - res.add(appInfo); - } - } - - } - - return res; - } -} From 45b3b53f4dffd3e28c3271ecf9fbb830c01b12c8 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 08:29:24 +0200 Subject: [PATCH 45/56] refactor: remove unused classes ActivityHelper and ContextHelper --- .../org/ligi/axt/helpers/ActivityHelper.java | 64 ------------------- .../org/ligi/axt/helpers/ContextHelper.java | 42 ------------ 2 files changed, 106 deletions(-) delete mode 100644 android/src/main/java/org/ligi/axt/helpers/ActivityHelper.java delete mode 100644 android/src/main/java/org/ligi/axt/helpers/ContextHelper.java diff --git a/android/src/main/java/org/ligi/axt/helpers/ActivityHelper.java b/android/src/main/java/org/ligi/axt/helpers/ActivityHelper.java deleted file mode 100644 index c06835e1..00000000 --- a/android/src/main/java/org/ligi/axt/helpers/ActivityHelper.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.ligi.axt.helpers; - -import android.app.Activity; -import android.content.pm.ActivityInfo; -import android.content.res.Configuration; -import android.view.View; - -public class ActivityHelper extends ContextHelper { - - private final Activity activity; - - public ActivityHelper(Activity activity) { - super (activity); - this.activity =activity; - } - - public T findById(int id) { - return (T) activity.findViewById(id); - } - - /** - * dynamically disable rotation - * to be used in onCreate - * slightly modified from http://stackoverflow.com/a/8765901/322642 - */ - public void disableRotation() { - switch (activity.getResources().getConfiguration().orientation){ - case Configuration.ORIENTATION_PORTRAIT: - if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.FROYO){ - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - } else { - int rotation = activity.getWindowManager().getDefaultDisplay().getRotation(); - if(rotation == android.view.Surface.ROTATION_90|| rotation == android.view.Surface.ROTATION_180){ - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT); - } else { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - } - } - break; - - case Configuration.ORIENTATION_LANDSCAPE: - if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.FROYO){ - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - } else { - int rotation = activity.getWindowManager().getDefaultDisplay().getRotation(); - if(rotation == android.view.Surface.ROTATION_0 || rotation == android.view.Surface.ROTATION_90){ - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - } else { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE); - } - } - break; - }//switch - } - - /** - * dynamically enable rotation - * counterpart to enableRotation - * slightly modified from http://stackoverflow.com/a/8765901/322642 - */ - public void enableRotation() { - activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); - } -} diff --git a/android/src/main/java/org/ligi/axt/helpers/ContextHelper.java b/android/src/main/java/org/ligi/axt/helpers/ContextHelper.java deleted file mode 100644 index 7512a459..00000000 --- a/android/src/main/java/org/ligi/axt/helpers/ContextHelper.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.ligi.axt.helpers; - -import android.content.Context; -import android.content.Intent; -import android.view.ViewConfiguration; - -import java.lang.reflect.Field; - -public class ContextHelper { - - private final Context context; - - public ContextHelper(Context context) { - this.context = context; - } - - public void startActivityForClass(Class class2start) { - Intent intent = new Intent(context, class2start); - context.startActivity(intent); - } - - /** - * a little hack because I strongly disagree with the style guide here - * ;-) - * not having the Actionbar overfow menu also with devices with hardware - * key really helps discoverability - * http://stackoverflow.com/questions/9286822/how-to-force-use-of-overflow-menu-on-devices-with-menu-button - **/ - public void forceOverFlowMenuEvenThoughDeviceHasPhysical() { - - try { - ViewConfiguration config = ViewConfiguration.get(context); - Field menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey"); - if (menuKeyField != null) { - menuKeyField.setAccessible(true); - menuKeyField.setBoolean(config, false); - } - } catch (Exception ex) { - // Ignore - but at least we tried ;-) - } - } -} From 8bef983ffed276ae3b8ff138378b5964e1c04355 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 03:24:13 +0200 Subject: [PATCH 46/56] refactor: move TargetStore.java to the appropriate package directory --- android/src/forFDroid/java/{ => org/ligi}/fast/TargetStore.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename android/src/forFDroid/java/{ => org/ligi}/fast/TargetStore.java (100%) diff --git a/android/src/forFDroid/java/fast/TargetStore.java b/android/src/forFDroid/java/org/ligi/fast/TargetStore.java similarity index 100% rename from android/src/forFDroid/java/fast/TargetStore.java rename to android/src/forFDroid/java/org/ligi/fast/TargetStore.java From 092349771f6751bd226e5b1d5dce3cada58ccd36 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 21 Aug 2022 09:42:06 +0200 Subject: [PATCH 47/56] refactor(Layout): remove redundant nesting & Reformat Code for Title Bars --- .../src/noExtras/res/layout/main_title.xml | 61 +++++++------- .../src/noExtras/res/layout/prefs_title.xml | 61 ++++++-------- .../src/withExtras/res/layout/main_title.xml | 79 +++++++++---------- .../src/withExtras/res/layout/prefs_title.xml | 79 ++++++++----------- 4 files changed, 124 insertions(+), 156 deletions(-) diff --git a/android/src/noExtras/res/layout/main_title.xml b/android/src/noExtras/res/layout/main_title.xml index 10040677..57028c37 100644 --- a/android/src/noExtras/res/layout/main_title.xml +++ b/android/src/noExtras/res/layout/main_title.xml @@ -1,40 +1,33 @@ + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingStart="@dimen/padding_medium" + android:paddingLeft="@dimen/padding_medium" + android:paddingBottom="2dp"> - + - - - - - - - + + diff --git a/android/src/noExtras/res/layout/prefs_title.xml b/android/src/noExtras/res/layout/prefs_title.xml index de590014..f6732a70 100644 --- a/android/src/noExtras/res/layout/prefs_title.xml +++ b/android/src/noExtras/res/layout/prefs_title.xml @@ -1,46 +1,37 @@ + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingBottom="2dp"> - - + + - - - - - - - - + android:scaleType="fitEnd" + android:src="@drawable/back" /> + - \ No newline at end of file + + diff --git a/android/src/withExtras/res/layout/main_title.xml b/android/src/withExtras/res/layout/main_title.xml index 29117e84..7c0c9f3e 100644 --- a/android/src/withExtras/res/layout/main_title.xml +++ b/android/src/withExtras/res/layout/main_title.xml @@ -1,50 +1,43 @@ + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingStart="@dimen/padding_medium" + android:paddingLeft="@dimen/padding_medium" + android:paddingBottom="2dp"> - + - + - - - - - - - + + diff --git a/android/src/withExtras/res/layout/prefs_title.xml b/android/src/withExtras/res/layout/prefs_title.xml index d9d38c8d..243f978d 100644 --- a/android/src/withExtras/res/layout/prefs_title.xml +++ b/android/src/withExtras/res/layout/prefs_title.xml @@ -1,56 +1,47 @@ + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingBottom="2dp"> + android:background="@drawable/hightlight" + android:clickable="true" + android:focusable="true" + android:onClick="homePressed" + android:orientation="horizontal"> - - - - - - - - - + android:scaleType="fitEnd" + android:src="@drawable/back" /> - + - \ No newline at end of file + + + + From 8f8d81c8588fb9ed023e6def32db101bc8d1f38e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 24 Oct 2022 08:53:19 +0200 Subject: [PATCH 48/56] refactor(AppInfo): remove getAlternatePackageName Package IDs may only contain [a-zA-Z0-9_] https://developer.android.com/studio/build/configure-app-module --- .../main/java/org/ligi/fast/model/AppInfo.java | 16 +++++----------- .../org/ligi/fast/model/DynamicAppInfoList.java | 6 ------ 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index f52e90b2..d535ec7e 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -42,7 +42,6 @@ public class AppInfo { // Runtime state private String alternateDisplayLabel; - private String alternatePackageName; private boolean isValid = true; private AppInfo(Context ctx) { @@ -82,7 +81,7 @@ public AppInfo(Context ctx, String cache_str) { lastUpdateTime = installTime; } - calculateAlternateLabelAndPackageName(); + calculateAlternateLabel(); return; } catch (Exception ignored) { } @@ -139,13 +138,12 @@ public AppInfo(Context _ctx, ResolveInfo ri) { hash = calculateTheHash(); - calculateAlternateLabelAndPackageName(); + calculateAlternateLabel(); iconCache.cacheIcon(ri); } - private void calculateAlternateLabelAndPackageName() { + private void calculateAlternateLabel() { alternateDisplayLabel = UmlautConverter.replaceAllUmlautsReturnNullIfEqual(getDisplayLabel()); - alternatePackageName = UmlautConverter.replaceAllUmlautsReturnNullIfEqual(packageName); } public String toCacheString() { @@ -259,10 +257,6 @@ public String getAlternateDisplayLabel() { return alternateDisplayLabel; } - public String getAlternatePackageName() { - return alternatePackageName; - } - public void mergeSafe(AppInfo appInfo) { final int localCallCount = getCallCount(); final int remoteCallCount = appInfo.getCallCount(); @@ -286,7 +280,7 @@ public void mergeSafe(AppInfo appInfo) { } lastUpdateTime = appInfo.getLastUpdateTime(); label = appInfo.getLabel(); - calculateAlternateLabelAndPackageName(); + calculateAlternateLabel(); } public int getPinMode() { @@ -326,6 +320,6 @@ public String getOverrideLabel() { public void setOverrideLabel(String label) { this.overrideLabel = label; - calculateAlternateLabelAndPackageName(); + calculateAlternateLabel(); } } diff --git a/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java b/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java index 1e666295..08391fca 100755 --- a/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java +++ b/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java @@ -130,12 +130,6 @@ private boolean appInfoMatchesQuery(AppInfo info, String query) { // also search in package name when activated // TBD should we also do gap search in package name? if (settings.isSearchPackageActivated()) { - if (settings.isUmlautConvertActivated() - && info.getAlternatePackageName() != null - && info.getAlternatePackageName().toLowerCase(Locale.ENGLISH).contains(query)) { - return true; - } - return info.getPackageName().toLowerCase(Locale.ENGLISH).contains(query); } From 3f3db1457ec6634a38308c8929ca84e9881b989c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 08:30:58 +0200 Subject: [PATCH 49/56] refactor(AppInfo): remove setCallCount and getOverrideLabel --- android/src/main/java/org/ligi/fast/model/AppInfo.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index d535ec7e..6afa911b 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -231,10 +231,6 @@ public long getLastUpdateTime() { return lastUpdateTime; } - public void setCallCount(int count) { - callCount = count; - } - public void incrementCallCount() { callCount++; } @@ -314,10 +310,6 @@ public void setLabelMode(int mode) { this.labelMode = mode; } - public String getOverrideLabel() { - return overrideLabel; - } - public void setOverrideLabel(String label) { this.overrideLabel = label; calculateAlternateLabel(); From 641310325827c8bdcf0de367817d795b2dc81820 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 24 Oct 2022 20:42:54 +0200 Subject: [PATCH 50/56] refactor(AppInfo): remove duplicated accent stripping code --- .../src/main/java/org/ligi/fast/model/AppInfo.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index 6afa911b..bf377d10 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -94,20 +94,6 @@ public AppInfo(Context _ctx, ResolveInfo ri) { // init attributes label = new ResolveInfoHelper(ri).getLabelSafely(_ctx); - label = label.replace("ά", "α") - .replaceAll("έ", "ε") - .replaceAll("ή", "η") - .replaceAll("ί", "ι") - .replaceAll("ό", "ο") - .replaceAll("ύ", "υ") - .replaceAll("ώ", "ω") - .replaceAll("Ά", "Α") - .replaceAll("Έ", "Ε") - .replaceAll("Ή", "Η") - .replaceAll("Ί", "Ι") - .replaceAll("Ό", "Ο") - .replaceAll("Ύ", "Υ") - .replaceAll("Ώ", "Ω"); if (ri.activityInfo != null) { packageName = ri.activityInfo.packageName; activityName = ri.activityInfo.name; From b931f60bf3dd0a5a64dad695a6250c57af687709 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 07:19:44 +0200 Subject: [PATCH 51/56] refactor(AppInfo): invert boolean isValid --- .../java/org/ligi/fast/model/AppInfo.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index bf377d10..7bdde01e 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -42,7 +42,7 @@ public class AppInfo { // Runtime state private String alternateDisplayLabel; - private boolean isValid = true; + private boolean isValid = false; private AppInfo(Context ctx) { iconCache = new AppIconCache(ctx, this); @@ -76,17 +76,16 @@ public AppInfo(Context ctx, String cache_str) { } } } + isValid = true; if (lastUpdateTime < installTime) { lastUpdateTime = installTime; } calculateAlternateLabel(); - return; } catch (Exception ignored) { } } - isValid = false; } public AppInfo(Context _ctx, ResolveInfo ri) { @@ -94,14 +93,11 @@ public AppInfo(Context _ctx, ResolveInfo ri) { // init attributes label = new ResolveInfoHelper(ri).getLabelSafely(_ctx); - if (ri.activityInfo != null) { - packageName = ri.activityInfo.packageName; - activityName = ri.activityInfo.name; - } else { - isValid = false; - packageName = "unknown"; - activityName = "unknown"; + if (ri.activityInfo == null) { + return; } + packageName = ri.activityInfo.packageName; + activityName = ri.activityInfo.name; callCount = 0; installTime = 0; @@ -119,11 +115,12 @@ public AppInfo(Context _ctx, ResolveInfo ri) { installTime = pi.firstInstallTime; } } catch (NameNotFoundException e) { - isValid = false; // Package does not exist + return; // Package does not exist } hash = calculateTheHash(); + isValid = true; calculateAlternateLabel(); iconCache.cacheIcon(ri); } From 5b5b8d41523e933d54fb8b8048334e6477230d1c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 07:37:49 +0200 Subject: [PATCH 52/56] refactor(AppInfo): parse CSV with a switch statement --- .../java/org/ligi/fast/model/AppInfo.java | 56 ++++++++----------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index 7bdde01e..56ea8811 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -52,40 +52,32 @@ public AppInfo(Context ctx, String cache_str) { this(ctx); String[] app_info_str_split = cache_str.split(SEPARATOR); - - if (app_info_str_split.length > 4) { - try { - hash = app_info_str_split[0]; - label = app_info_str_split[1]; - packageName = app_info_str_split[2]; - activityName = app_info_str_split[3]; - callCount = Integer.parseInt(app_info_str_split[4]); - - if (app_info_str_split.length > 5) { - installTime = Long.parseLong(app_info_str_split[5]); - if (app_info_str_split.length > 6) { - pinMode = Integer.parseInt(app_info_str_split[6]); - if (app_info_str_split.length > 7) { - labelMode = Integer.parseInt(app_info_str_split[7]); - if (app_info_str_split.length > 8) { - overrideLabel = app_info_str_split[8]; - if (app_info_str_split.length > 9) { - lastUpdateTime = Long.parseLong(app_info_str_split[9]); - } - } - } - } - } - isValid = true; - - if (lastUpdateTime < installTime) { - lastUpdateTime = installTime; - } - - calculateAlternateLabel(); - } catch (Exception ignored) { + int highest_index = Math.min(app_info_str_split.length - 1, 9); + try { + switch (highest_index) { + case 9: lastUpdateTime = Long.parseLong(app_info_str_split[9]); + case 8: overrideLabel = app_info_str_split[8]; + case 7: labelMode = Integer.parseInt(app_info_str_split[7]); + case 6: pinMode = Integer.parseInt(app_info_str_split[6]); + case 5: installTime = Long.parseLong(app_info_str_split[5]); + case 4: callCount = Integer.parseInt(app_info_str_split[4]); + case 3: // Minimal set of values in a valid entry + activityName = app_info_str_split[3]; + packageName = app_info_str_split[2]; + label = app_info_str_split[1]; + hash = app_info_str_split[0]; + isValid = true; + break; } + } catch (Exception ignored) { + } + if (!isValid) { + return; + } + if (lastUpdateTime < installTime) { + lastUpdateTime = installTime; } + calculateAlternateLabel(); } public AppInfo(Context _ctx, ResolveInfo ri) { From b62a7183a64b9c693764d2354a279f7129c6675e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 00:29:07 +0200 Subject: [PATCH 53/56] refactor(AppInfo): minor cleanup --- .../src/main/java/org/ligi/fast/model/AppInfo.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index 56ea8811..f87cd5ef 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -30,7 +30,7 @@ public class AppInfo { // User generated data private String overrideLabel; - private int callCount; + private int callCount = 0; private int pinMode = 0; private int labelMode = 0; @@ -82,18 +82,12 @@ public AppInfo(Context ctx, String cache_str) { public AppInfo(Context _ctx, ResolveInfo ri) { this(_ctx); - - // init attributes label = new ResolveInfoHelper(ri).getLabelSafely(_ctx); if (ri.activityInfo == null) { return; } packageName = ri.activityInfo.packageName; activityName = ri.activityInfo.name; - callCount = 0; - - installTime = 0; - try { PackageManager pm = _ctx.getPackageManager(); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.GINGERBREAD) { @@ -109,10 +103,10 @@ public AppInfo(Context _ctx, ResolveInfo ri) { } catch (NameNotFoundException e) { return; // Package does not exist } - - hash = calculateTheHash(); isValid = true; + + // All static attributes done, call everything that depends on them now calculateAlternateLabel(); iconCache.cacheIcon(ri); } From c01f672294051bb09e61df227b150c459c97dd15 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 25 Oct 2022 05:55:39 +0200 Subject: [PATCH 54/56] wip: redesign --- android/src/main/AndroidManifest.xml | 14 --- android/src/main/java/org/ligi/fast/App.java | 53 +++++++- .../AppInstallOrRemoveReceiver.java | 26 ---- .../background/BackgroundGatherAsyncTask.java | 31 ----- .../background/BaseAppGatherAsyncTask.java | 78 ++++-------- .../background/PackageChangeReceiver.java | 52 ++++++++ .../java/org/ligi/fast/model/AppInfo.java | 41 +++--- .../java/org/ligi/fast/model/AppInfoList.java | 53 +++++++- .../ligi/fast/model/DynamicAppInfoList.java | 38 +----- .../java/org/ligi/fast/ui/AppInfoAdapter.java | 8 +- .../java/org/ligi/fast/ui/LoadingDialog.java | 3 - .../java/org/ligi/fast/ui/SearchActivity.java | 78 +++++------- .../ligi/fast/util/PackageManagerUtils.java | 118 ++++++++++++++++++ android/src/main/res/values/ids.xml | 4 - 14 files changed, 347 insertions(+), 250 deletions(-) delete mode 100644 android/src/main/java/org/ligi/fast/background/AppInstallOrRemoveReceiver.java delete mode 100644 android/src/main/java/org/ligi/fast/background/BackgroundGatherAsyncTask.java create mode 100644 android/src/main/java/org/ligi/fast/background/PackageChangeReceiver.java create mode 100644 android/src/main/java/org/ligi/fast/util/PackageManagerUtils.java delete mode 100644 android/src/main/res/values/ids.xml diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index f9e12055..2409f8f7 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -80,20 +80,6 @@ - - - - - - - - - - - - diff --git a/android/src/main/java/org/ligi/fast/App.java b/android/src/main/java/org/ligi/fast/App.java index a7de96b6..3e4c86d9 100644 --- a/android/src/main/java/org/ligi/fast/App.java +++ b/android/src/main/java/org/ligi/fast/App.java @@ -2,13 +2,17 @@ import android.app.Activity; import android.app.Application; +import android.support.annotation.Nullable; +import org.ligi.fast.model.AppInfo; import org.ligi.fast.model.AppInfoList; import org.ligi.fast.settings.AndroidFASTSettings; import org.ligi.fast.settings.FASTSettings; +import org.ligi.fast.util.AppInfoListStore; import org.ligi.tracedroid.TraceDroid; import java.io.File; +import java.util.List; public class App extends Application { @@ -18,10 +22,55 @@ public class App extends Application { public static final String LOG_TAG = "FAST App Search"; public interface PackageChangedListener { - public void onPackageChange(AppInfoList appInfoList); + /** + * Update information held about one or more packages. + * The app info list is expected to be complete for every changed package. Any existing + * records will only be kept if they still apply to the new list. + * + * @param packageNames The names of all packages affected in this change + * @param appInfoList The full list or activities to track for those packages + */ + void onPackageChange(@Nullable List packageNames, @Nullable List appInfoList); } - public static PackageChangedListener packageChangedListener; + public static class OfflinePackageChangedListener implements PackageChangedListener { + @Override + public void onPackageChange(@Nullable List packageNames, @Nullable List appInfoList) { + AppInfoListStore store = new AppInfoListStore(appInstance); + AppInfoList savedList = store.load(); + savedList.onPackageChange(packageNames, appInfoList); + store.save(savedList); + } + } + + private static PackageChangedListener packageChangedListener; + + /*TODO + * The {@link OfflinePackageChangedListener} is currently an unused fallback. + * FAST no longer registers implicit broadcasts to update the app list while it isn't running + * because this is discouraged by google and on api 26+ only allowed for exempted broadcasts. + * The SearchActivity lifecycle currently ensures the following things: + * - The Activity unconditionally fetches a complete, up-to-date app list onCreate() + * - There is always a PackageChangedListener registered between onCreate() and onDestroy() + * - User-generated data is saved in onPause() + * As a result, it is redundant to update the app list while FAST isn't running. + * However, it could be desirable to update the icon cache while FAST isn't running. + * Again, this would only work below api 26. And while an argument could be made that older + * apis tend to run on older and weaker devices that need an up-to-date icon cache right on + * startup, but the argument also goes the other way in that taking up system resources in the + * background is even more an issue if it impacts other running apps. + */ + public static PackageChangedListener getPackageChangedListener() { + return packageChangedListener == null ? new OfflinePackageChangedListener() : packageChangedListener; + } + + public static void registerPackageChangedListener(PackageChangedListener packageChangedListener) { + App.packageChangedListener = packageChangedListener; + } + + public static void unregisterPackageChangedListener(PackageChangedListener packageChangedListener) { + App.packageChangedListener = null; + } @Override public void onCreate() { diff --git a/android/src/main/java/org/ligi/fast/background/AppInstallOrRemoveReceiver.java b/android/src/main/java/org/ligi/fast/background/AppInstallOrRemoveReceiver.java deleted file mode 100644 index 3ea580b8..00000000 --- a/android/src/main/java/org/ligi/fast/background/AppInstallOrRemoveReceiver.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.ligi.fast.background; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import org.ligi.fast.App; -import org.ligi.fast.model.AppInfoList; -import org.ligi.fast.util.AppInfoListStore; - -public class AppInstallOrRemoveReceiver extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - final AppInfoListStore appInfoListStore = new AppInfoListStore(context); - - if (App.packageChangedListener == null) { - App.packageChangedListener = new App.PackageChangedListener() { - @Override - public void onPackageChange(AppInfoList appInfoList) { - appInfoListStore.save(appInfoList); - } - }; - } - - new BackgroundGatherAsyncTask(context, appInfoListStore.load()).execute(); - } -} diff --git a/android/src/main/java/org/ligi/fast/background/BackgroundGatherAsyncTask.java b/android/src/main/java/org/ligi/fast/background/BackgroundGatherAsyncTask.java deleted file mode 100644 index 9be3198b..00000000 --- a/android/src/main/java/org/ligi/fast/background/BackgroundGatherAsyncTask.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ligi.fast.background; - -import android.content.Context; - -import org.ligi.fast.App; -import org.ligi.fast.model.AppInfo; -import org.ligi.fast.model.AppInfoList; -import org.ligi.fast.util.AppInfoListStore; - -import java.util.List; - -public class BackgroundGatherAsyncTask extends BaseAppGatherAsyncTask { - - public BackgroundGatherAsyncTask(Context context, AppInfoList oldAppInfoList) { - super(context, oldAppInfoList); - } - - @Override - protected void onProgressUpdate(AppInfo... values) { - super.onProgressUpdate(values); - } - - @Override - protected void onPostExecute(Void result) { - super.onPostExecute(result); - if (App.packageChangedListener != null) { - App.packageChangedListener.onPackageChange(appInfoList); - } - } - -} diff --git a/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java b/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java index 65a9e34b..26b07364 100644 --- a/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java +++ b/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java @@ -1,86 +1,50 @@ package org.ligi.fast.background; import android.content.Context; -import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.AsyncTask; +import org.ligi.fast.App; import org.ligi.fast.model.AppInfo; import org.ligi.fast.model.AppInfoList; -import org.ligi.tracedroid.logging.Log; +import org.ligi.fast.util.PackageManagerUtils; -import java.util.ArrayList; import java.util.List; /** * Async-Task to Retrieve / Store Application Info needed by this App */ public class BaseAppGatherAsyncTask extends AsyncTask { - private final Context ctx; + protected Context mContext; + protected final AppInfoList appInfoList = new AppInfoList(); + protected final List mChangedPackageNames; protected int appCount; - protected AppInfoList appInfoList; - private final AppInfoList oldAppList; public BaseAppGatherAsyncTask(Context ctx) { this(ctx, null); } - public BaseAppGatherAsyncTask(Context ctx, AppInfoList oldAppList) { - this.ctx = ctx; - appInfoList = new AppInfoList(); - this.oldAppList = oldAppList; + public BaseAppGatherAsyncTask(Context context, List changedPackages) { + this.mContext = context.getApplicationContext(); + this.mChangedPackageNames = changedPackages; } - private void processCategory(final String category) { - final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null); - mainIntent.addCategory(category); - try { - final List resolveInfoList = ctx.getPackageManager().queryIntentActivities(mainIntent, 0); - appCount += resolveInfoList.size(); - for (ResolveInfo info : resolveInfoList) { - final AppInfo actAppInfo = new AppInfo(ctx, info); - - if (!ctx.getPackageName().equals(actAppInfo.getPackageName())) { // ignore self - - // Update call count from current index that is being used. - // This is because we may have updated the call count since the last time - // we saved the package list. An alternative would be to save the package list - // each time we leave - if (oldAppList != null) { - for(AppInfo oldInfo : oldAppList) { - if (oldInfo.getActivityName().equals(actAppInfo.getActivityName())) { - if (oldInfo.getLabelMode() == 2) { - appInfoList.add(oldInfo); - } else { - actAppInfo.setCallCount(oldInfo.getCallCount()); - actAppInfo.setPinMode(oldInfo.getPinMode()); - actAppInfo.setLabelMode(oldInfo.getLabelMode()); - actAppInfo.setOverrideLabel(oldInfo.getOverrideLabel()); - } - } - } - } - appInfoList.add(actAppInfo); - publishProgress(actAppInfo); - } - } - } catch (Exception e) { - Log.d("Exception occurred when getting activities skipping...!"); - } - - } - - @Override protected Void doInBackground(Void... params) { - // TODO the progressbar could be more exact here by first querying both - calculating the - // total app-count and then process them - but as we do not expect that much launchers we - // should be OK here - appCount=0; - processCategory(Intent.CATEGORY_LAUNCHER); - processCategory(Intent.CATEGORY_HOME); + List activitiesResolveInfoList = PackageManagerUtils.getResolveInfo(mContext, mChangedPackageNames); + appCount = activitiesResolveInfoList.size(); + for (ResolveInfo info : activitiesResolveInfoList) { + AppInfo newAppInfo = new AppInfo(mContext, info); + appInfoList.add(newAppInfo); + publishProgress(newAppInfo); + } + mContext = null; return null; } - + @Override + protected void onPostExecute(Void result) { + App.getPackageChangedListener().onPackageChange(mChangedPackageNames, appInfoList); + //TODO trim icon cache + } } diff --git a/android/src/main/java/org/ligi/fast/background/PackageChangeReceiver.java b/android/src/main/java/org/ligi/fast/background/PackageChangeReceiver.java new file mode 100644 index 00000000..e771598d --- /dev/null +++ b/android/src/main/java/org/ligi/fast/background/PackageChangeReceiver.java @@ -0,0 +1,52 @@ +package org.ligi.fast.background; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.net.Uri; +import android.os.Build; + +import org.ligi.fast.App; + +import java.util.Collections; + +public class PackageChangeReceiver extends BroadcastReceiver { + public void register(Context context) { + if (Build.VERSION.SDK_INT >= 7) { + context.registerReceiver(this, new IntentFilter(Intent.ACTION_LOCALE_CHANGED)); + } + IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_PACKAGE_ADDED); + filter.addAction(Intent.ACTION_PACKAGE_CHANGED); + filter.addAction(Intent.ACTION_PACKAGE_REMOVED); + filter.addDataScheme("package"); + context.registerReceiver(this, filter); + } + + @Override + public void onReceive(Context context, Intent intent) { + Uri data = intent.getData(); + if (data == null) return; // This should never be the case + String packageName = data.getSchemeSpecificPart(); + String action = intent.getAction(); + switch (action) { + case Intent.ACTION_LOCALE_CHANGED: + new BaseAppGatherAsyncTask(context).execute(); + break; + case Intent.ACTION_PACKAGE_ADDED: + case Intent.ACTION_PACKAGE_CHANGED: + new BaseAppGatherAsyncTask(context, Collections.singletonList(packageName)).execute(); + break; + case Intent.ACTION_PACKAGE_REMOVED: + // During an upgrade there will be a PACKAGE_REMOVED, then a PACKAGE_ADDED Broadcast. + // defaultValue is false because this extra does not exist during full uninstallation. + //TODO: On MinApiLevel 14: Replace Intent.ACTION_PACKAGE_REMOVED with Intent.ACTION_PACKAGE_FULLY_REMOVED + if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { + App.getPackageChangedListener().onPackageChange(Collections.singletonList(packageName), null); + } + //TODO trim icon cache + break; + } + } +} diff --git a/android/src/main/java/org/ligi/fast/model/AppInfo.java b/android/src/main/java/org/ligi/fast/model/AppInfo.java index f87cd5ef..8db69df3 100755 --- a/android/src/main/java/org/ligi/fast/model/AppInfo.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfo.java @@ -35,7 +35,7 @@ public class AppInfo { private int labelMode = 0; // Dynamic information that can be regenerated - private final AppIconCache iconCache; + private AppIconCache iconCache; private String label; private long installTime; private long lastUpdateTime; @@ -159,6 +159,10 @@ public boolean equals(Object o) { return toCacheString().equals(other.toCacheString()); } + public boolean isSameActivity(AppInfo appInfo) { + return this.hash.equals(appInfo.hash); + } + public Drawable getIcon() { return iconCache.getIcon(); } @@ -167,10 +171,6 @@ public String getPackageName() { return packageName; } - public String getActivityName() { - return activityName; - } - /** * The label that is meant to be displayed to the user. * @@ -222,29 +222,20 @@ public String getAlternateDisplayLabel() { return alternateDisplayLabel; } - public void mergeSafe(AppInfo appInfo) { - final int localCallCount = getCallCount(); - final int remoteCallCount = appInfo.getCallCount(); - setCallCount(Math.max(localCallCount, remoteCallCount)); - if (appInfo.getPinMode() != 0) { - setPinMode(appInfo.getPinMode()); - } - else { - setPinMode(getPinMode()); - } - - if (appInfo.getLabelMode() == 1) { - setLabelMode(1); - setOverrideLabel(appInfo.getOverrideLabel()); - } - + /** + * Update activity info while preserving user generated data and settings + * + * @param currentInfo up to date info about the activity + */ + public void updateInfo(AppInfo currentInfo) { + this.iconCache = currentInfo.iconCache; // Because we fall back to lastUpdateTime when setting installTime below gingerbread our - // best bet is to just never update it value to keep it close to the first install time. + // best bet is to just never update this value to keep it close to the first install time. if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) { - installTime = appInfo.getInstallTime(); + this.installTime = currentInfo.installTime; } - lastUpdateTime = appInfo.getLastUpdateTime(); - label = appInfo.getLabel(); + this.lastUpdateTime = currentInfo.lastUpdateTime; + this.label = currentInfo.label; calculateAlternateLabel(); } diff --git a/android/src/main/java/org/ligi/fast/model/AppInfoList.java b/android/src/main/java/org/ligi/fast/model/AppInfoList.java index adc1b999..964c3ab8 100644 --- a/android/src/main/java/org/ligi/fast/model/AppInfoList.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfoList.java @@ -1,9 +1,12 @@ package org.ligi.fast.model; +import org.ligi.fast.App; + import java.util.ArrayList; +import java.util.Iterator; import java.util.List; -public class AppInfoList extends ArrayList { +public class AppInfoList extends ArrayList implements App.PackageChangedListener { public void update(List newList) { // check if building and applying a diff is better and not @@ -20,4 +23,50 @@ public AppInfo get(int position) { } return super.get(position); } -} \ No newline at end of file + + @Override + public void onPackageChange(List changedPackageNames, List newAppInfoList) { + List updatedAppInfoList = new ArrayList<>(); + List matchedAppInfoList = new ArrayList<>(); + if (changedPackageNames == null) { + matchedAppInfoList.addAll(this); + } else { + // Collect existing records of changed packages and carry over unchanged ones + next_record: + for (AppInfo existingAppInfo : this) { + for (String packageName : changedPackageNames) { + if (existingAppInfo.getPackageName().equals(packageName)) { + matchedAppInfoList.add(existingAppInfo); + continue next_record; + } + } + updatedAppInfoList.add(existingAppInfo); + } + } + + if (newAppInfoList == null) { + } else if (matchedAppInfoList.size() == 0) { // New app. Just add new records. + updatedAppInfoList.addAll(newAppInfoList); + } else { + // Update and carry over all existing records that still apply and add new records + for (AppInfo newAppInfo : newAppInfoList) { + boolean isKnownRecord = false; + for (Iterator iterator = matchedAppInfoList.iterator(); iterator.hasNext(); ) { + AppInfo existingAppInfoItem = iterator.next(); + if (existingAppInfoItem.isSameActivity(newAppInfo)) { + existingAppInfoItem.updateInfo(newAppInfo); + updatedAppInfoList.add(existingAppInfoItem); + isKnownRecord = true; + iterator.remove(); + } + } + if (!isKnownRecord) { + updatedAppInfoList.add(newAppInfo); + } + } + } + + this.clear(); + this.addAll(updatedAppInfoList); + } +} diff --git a/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java b/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java index 08391fca..da2cb50c 100755 --- a/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java +++ b/android/src/main/java/org/ligi/fast/model/DynamicAppInfoList.java @@ -3,7 +3,6 @@ import org.ligi.fast.settings.FASTSettings; import org.ligi.fast.util.StringUtils; -import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Locale; @@ -13,7 +12,7 @@ */ public class DynamicAppInfoList extends AppInfoList { - private List backingAppInfoList; + private final AppInfoList backingAppInfoList = new AppInfoList(); private String currentQuery = ""; private final FASTSettings settings; @@ -26,37 +25,8 @@ public enum SortMode { public DynamicAppInfoList(List backingAppInfoList, FASTSettings settings) { this.settings = settings; - this.backingAppInfoList=new ArrayList<>(); - update(backingAppInfoList); - } - - @Override - public void update(List pkgAppsListAll) { - final List appsToRemove = new ArrayList<>(); - for (AppInfo localApp : backingAppInfoList) { - if (getAppWithHash(localApp.getHash(), pkgAppsListAll) == null) { - appsToRemove.add(localApp); - } - } - backingAppInfoList.removeAll(appsToRemove); - - for (AppInfo app : pkgAppsListAll) { - final AppInfo appWithHash = getAppWithHash(app.getHash(), backingAppInfoList); - if (appWithHash != null) { - if (app.getLabelMode() == 2) { - final AppInfoList aliasesWithHash = getAliasesWithHash(app.getHash(), backingAppInfoList); - if (!aliasesWithHash.contains(app)) { - backingAppInfoList.add(app); - } - } else { - appWithHash.mergeSafe(app); - } - } else { - backingAppInfoList.add(app); - } - } - - setSortMode(currentSortMode); + this.backingAppInfoList.addAll(backingAppInfoList); + super.update(backingAppInfoList); } public void setSortMode(SortMode mode) { @@ -150,7 +120,7 @@ private boolean isGapSearchActivateAndTrueForQuery(AppInfo info, String query) { return false; } - public List getBackingAppInfoList() { + public AppInfoList getBackingAppInfoList() { return backingAppInfoList; } } diff --git a/android/src/main/java/org/ligi/fast/ui/AppInfoAdapter.java b/android/src/main/java/org/ligi/fast/ui/AppInfoAdapter.java index ea5035aa..37899308 100755 --- a/android/src/main/java/org/ligi/fast/ui/AppInfoAdapter.java +++ b/android/src/main/java/org/ligi/fast/ui/AppInfoAdapter.java @@ -14,7 +14,6 @@ import org.ligi.fast.App; import org.ligi.fast.R; import org.ligi.fast.model.AppInfo; -import org.ligi.fast.model.AppInfoList; import org.ligi.fast.model.DynamicAppInfoList; import org.ligi.fast.util.StringUtils; @@ -160,9 +159,4 @@ public void setSortMode(final DynamicAppInfoList.SortMode sortMode) { appInfoList.setSortMode(sortMode); notifyDataSetChanged(); } - - public void updateList(AppInfoList list) { - appInfoList.update(list); - notifyDataSetChanged(); - } -} \ No newline at end of file +} diff --git a/android/src/main/java/org/ligi/fast/ui/LoadingDialog.java b/android/src/main/java/org/ligi/fast/ui/LoadingDialog.java index faf0d1eb..f5d6a024 100644 --- a/android/src/main/java/org/ligi/fast/ui/LoadingDialog.java +++ b/android/src/main/java/org/ligi/fast/ui/LoadingDialog.java @@ -12,7 +12,6 @@ import org.ligi.fast.R; import org.ligi.fast.background.BaseAppGatherAsyncTask; import org.ligi.fast.model.AppInfo; -import org.ligi.fast.util.AppInfoListStore; /** * Dialog to make the waiting time for the initial index building nicer for the user @@ -53,11 +52,9 @@ protected void onProgressUpdate(AppInfo... values) { @Override protected void onPostExecute(Void result) { super.onPostExecute(result); - new AppInfoListStore(LoadingDialog.this).save(appInfoList); setResult(RESULT_OK); finish(); } - }.execute(); setWindowWidth(); diff --git a/android/src/main/java/org/ligi/fast/ui/SearchActivity.java b/android/src/main/java/org/ligi/fast/ui/SearchActivity.java index 18690ed2..1831a5b8 100755 --- a/android/src/main/java/org/ligi/fast/ui/SearchActivity.java +++ b/android/src/main/java/org/ligi/fast/ui/SearchActivity.java @@ -29,13 +29,15 @@ import org.ligi.axt.simplifications.SimpleTextWatcher; import org.ligi.fast.App; import org.ligi.fast.R; -import org.ligi.fast.background.BackgroundGatherAsyncTask; +import org.ligi.fast.background.PackageChangeReceiver; +import org.ligi.fast.background.BaseAppGatherAsyncTask; import org.ligi.fast.model.AppInfo; -import org.ligi.fast.model.AppInfoList; import org.ligi.fast.model.DynamicAppInfoList; import org.ligi.fast.util.AppInfoListStore; import org.ligi.tracedroid.sending.TraceDroidEmailSender; +import java.util.Collections; +import java.util.List; import java.util.Locale; /** @@ -43,6 +45,7 @@ */ public class SearchActivity extends Activity implements App.PackageChangedListener { + private PackageChangeReceiver mPackageChangeReceiver; private DynamicAppInfoList appInfoList; private AppInfoAdapter adapter; private String oldSearch = ""; @@ -65,8 +68,16 @@ public void onCreate(Bundle savedInstanceState) { appInfoListStore = new AppInfoListStore(this); - final AppInfoList loadedAppInfoList = appInfoListStore.load(); - appInfoList = new DynamicAppInfoList(loadedAppInfoList, App.getSettings()); + appInfoList = new DynamicAppInfoList(appInfoListStore.load(), App.getSettings()); + App.registerPackageChangedListener(appInfoList.getBackingAppInfoList()); + if (appInfoList.size() == 0) { + startActivity(new Intent(this, LoadingDialog.class)); + } else { + new BaseAppGatherAsyncTask(this).execute(); + } + + mPackageChangeReceiver = new PackageChangeReceiver(); + mPackageChangeReceiver.register(this); adapter = new AppInfoAdapter(this, appInfoList); @@ -111,11 +122,7 @@ public void afterTextChanged(Editable s) { @Override public void onItemClick(AdapterView arg0, View arg1, int pos, long arg3) { - try { - startItemAtPos(pos); - } catch (ActivityNotFoundException e) { - // e.g. uninstalled while app running - TODO should refresh list - } + startItemAtPos(pos); } }); @@ -135,17 +142,6 @@ public boolean onItemLongClick(AdapterView arg0, View arg1, TraceDroidEmailSender.sendStackTraces("ligi@ligi.de", this); - - if (appInfoList.size() == 0) { - startActivityForResult(new Intent(this, LoadingDialog.class), R.id.activityResultLoadingDialog); - } else { // the second time - we use the old index to be fast but - // regenerate in background to be recent - - // Use the pkgAppsListTemp in order to update data from the saved file with recent - // call count information (seeing as we may not have saved it recently). - new BackgroundGatherAsyncTask(this, appInfoList).execute(); - } - gridView.setAdapter(adapter); } @@ -175,14 +171,13 @@ public void startItemAtPos(int pos) { // set flag so that next start the search app comes up and not the last started App intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addCategory(Intent.CATEGORY_LAUNCHER); - Log.d(App.LOG_TAG, "Starting " + app.getActivityName() + " (and incremented call count to " + app.getCallCount() + ")"); try { startActivity(intent); } catch (ActivityNotFoundException e) { - e.printStackTrace(); //TODO localize - Toast.makeText(this,"cannot start: " + e,Toast.LENGTH_LONG).show(); + Toast.makeText(this, "\"" + app.getDisplayLabel() + "\"\nis no longer there - Refreshing data...", Toast.LENGTH_LONG).show(); + new BaseAppGatherAsyncTask(this, Collections.singletonList(app.getPackageName())).execute(); } if (Build.VERSION.SDK_INT > 18) { @@ -196,23 +191,12 @@ public void startItemAtPos(int pos) { } } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - switch (requestCode) { - case R.id.activityResultLoadingDialog: - onPackageChange(appInfoListStore.load()); - break; - } - } - @Override protected void onResume() { super.onResume(); - App.packageChangedListener = this; + App.unregisterPackageChangedListener(appInfoList.getBackingAppInfoList()); + App.registerPackageChangedListener(this); searchQueryEditText.setText(""); // using the app showed that we want a new search here and the old stuff is not interesting anymore @@ -310,15 +294,11 @@ private String getHomePackageName() { } @Override - public void onPackageChange(final AppInfoList newAppInfoList) { + public void onPackageChange(List changedPackages, List list) { // TODO we should also do a cleanup of cached icons here - // we might not come from UI Thread - - runOnUiThread(new Runnable() { - @Override - public void run() { - adapter.updateList(newAppInfoList); - } + runOnUiThread(() -> { + appInfoList.getBackingAppInfoList().onPackageChange(changedPackages, list); + configureAdapter(); }); } @@ -328,10 +308,18 @@ protected void onPause() { // will not work next time we open this activity. appInfoListStore.save(appInfoList.getBackingAppInfoList()); - App.packageChangedListener = null; + App.unregisterPackageChangedListener(this); + App.registerPackageChangedListener(appInfoList.getBackingAppInfoList()); super.onPause(); } + @Override + protected void onDestroy() { + unregisterReceiver(mPackageChangeReceiver); + mPackageChangeReceiver = null; + super.onDestroy(); + } + public void addEntry(AppInfo new_entry) { appInfoList.getBackingAppInfoList().add(new_entry); } diff --git a/android/src/main/java/org/ligi/fast/util/PackageManagerUtils.java b/android/src/main/java/org/ligi/fast/util/PackageManagerUtils.java new file mode 100644 index 00000000..4e59a6ad --- /dev/null +++ b/android/src/main/java/org/ligi/fast/util/PackageManagerUtils.java @@ -0,0 +1,118 @@ +package org.ligi.fast.util; + +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +public class PackageManagerUtils { + /** + * Get a ResolveInfoList with all activities that are relevant to FAST. + * In addition to all activities with ACTION_MAIN and CATEGORY_LAUNCHER, FAST also considers + * any other Launcher on the device. This list will never contain FAST's own activities. + *

+ * Optionally, the query can be limited to a custom set of packages. + * + * @param context A reference to the application context + * @param packageNames The package names to query. If this is null, all packages are considered. + * @return Relevant activities from the given packages or all packages if packageNames is null. + * The return value will never be null. + */ + @NonNull + public static List getResolveInfo(Context context, @Nullable List packageNames) { + List ignoredPackages = new ArrayList<>(Arrays.asList( + context.getPackageName() + )); + List ignoredLaunchers = new ArrayList<>(Arrays.asList( + "com.android.settings" + )); + ignoredLaunchers.addAll(ignoredPackages); + List activitiesResolveInfoList = new ArrayList<>(); + Intent activitiesIntent = new Intent(Intent.ACTION_MAIN); + Intent launchersIntent = new Intent(Intent.ACTION_MAIN); + activitiesIntent.addCategory(Intent.CATEGORY_LAUNCHER); + launchersIntent.addCategory(Intent.CATEGORY_HOME); + PackageManager pm = context.getPackageManager(); + + if (packageNames == null) { + activitiesResolveInfoList.addAll(mergeWithoutDuplicates( + ignorePackages(pm.queryIntentActivities(activitiesIntent, 0), ignoredPackages), + ignorePackages(pm.queryIntentActivities(launchersIntent, 0), ignoredLaunchers))); + } else { + next_package: + for (String packageName : packageNames) { + for (String ignore : ignoredPackages) { + if (packageName.equals(ignore)) { + continue next_package; + } + } + activitiesIntent.setPackage(packageName); + for (String ignore : ignoredLaunchers) { + if (packageName.equals(ignore)) { + activitiesResolveInfoList.addAll(pm.queryIntentActivities(activitiesIntent, 0)); + continue next_package; + } + } + launchersIntent.setPackage(packageName); + activitiesResolveInfoList.addAll(mergeWithoutDuplicates( + pm.queryIntentActivities(activitiesIntent, 0), + pm.queryIntentActivities(launchersIntent, 0))); + } + } + + return activitiesResolveInfoList; + } + + /** + * Remove packages from a ResolveInfo list. + * + * @param resolveInfoList ResolveInfo items to filter + * @param ignoredPackages List of packages to remove + * @return The same resolveInfoList for method chaining + */ + private static List ignorePackages(List resolveInfoList, List ignoredPackages) { + Iterator resolveInfoIterator = resolveInfoList.iterator(); + while (resolveInfoIterator.hasNext()) { + ResolveInfo resolveInfo = resolveInfoIterator.next(); + for (String ignore : ignoredPackages) { + if (resolveInfo.activityInfo.packageName.equals(ignore)) { + resolveInfoIterator.remove(); + break; + } + } + } + return resolveInfoList; + } + + /** + * Merge a secondary ResolveInfoList into another one if it doesn't already contain an entry + * with the same activity name. This is useful because an activity can have both the LAUNCHER + * and the HOME category and thus show up in both listings. FAST's own SearchActivity is one + * example for this. + * + * @param main Include all activities from this list + * @param secondary Include all unique activities from this list + * @return A new list that contains all merged activities + */ + private static List mergeWithoutDuplicates(List main, List secondary) { + List merged = new ArrayList<>(main); + outer_loop: + for (ResolveInfo secondInfo : secondary) { + for (ResolveInfo mainInfo : main) { + if (mainInfo.activityInfo.packageName.equals(secondInfo.activityInfo.packageName) + && mainInfo.activityInfo.name.equals(secondInfo.activityInfo.name)) { + continue outer_loop; + } + } + merged.add(secondInfo); + } + return merged; + } +} diff --git a/android/src/main/res/values/ids.xml b/android/src/main/res/values/ids.xml deleted file mode 100644 index 0cc7b878..00000000 --- a/android/src/main/res/values/ids.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file From 43e3af7379814101278ba6152104b77a1c54ea08 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 29 Oct 2022 01:03:21 +0200 Subject: [PATCH 55/56] feat: detect adaptive icon change --- .../AndroidTestMutableFastSettings.java | 11 +++++++ .../background/BaseAppGatherAsyncTask.java | 30 ++++++++++++++++++- .../fast/settings/AndroidFASTSettings.java | 11 +++++++ .../org/ligi/fast/settings/FASTSettings.java | 4 +++ .../fast/testing/MutableFastSettings.java | 11 +++++++ 5 files changed, 66 insertions(+), 1 deletion(-) diff --git a/android/src/androidTest/java/org/ligi/fast/testing/AndroidTestMutableFastSettings.java b/android/src/androidTest/java/org/ligi/fast/testing/AndroidTestMutableFastSettings.java index 3e84b5aa..8d6a92f2 100644 --- a/android/src/androidTest/java/org/ligi/fast/testing/AndroidTestMutableFastSettings.java +++ b/android/src/androidTest/java/org/ligi/fast/testing/AndroidTestMutableFastSettings.java @@ -11,6 +11,7 @@ public class AndroidTestMutableFastSettings implements FASTSettings { public boolean ignoreSpace = false; public boolean gapSearch = false; public String theme = "light"; + public String lastIconShape = ""; @Override public boolean isLaunchSingleActivated() { @@ -87,4 +88,14 @@ public int getIconResolution() { public boolean isShowHiddenActivated() { return false; } + + @Override + public String getLastIconShape() { + return lastIconShape; + } + + @Override + public void putLastIconShape(String v) { + lastIconShape = v; + } } diff --git a/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java b/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java index 26b07364..2394102c 100644 --- a/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java +++ b/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java @@ -1,10 +1,14 @@ package org.ligi.fast.background; import android.content.Context; +import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.content.res.Resources; import android.os.AsyncTask; +import android.os.Build; import org.ligi.fast.App; +import org.ligi.fast.model.AppIconCache; import org.ligi.fast.model.AppInfo; import org.ligi.fast.model.AppInfoList; import org.ligi.fast.util.PackageManagerUtils; @@ -17,7 +21,7 @@ public class BaseAppGatherAsyncTask extends AsyncTask { protected Context mContext; protected final AppInfoList appInfoList = new AppInfoList(); - protected final List mChangedPackageNames; + protected List mChangedPackageNames; protected int appCount; public BaseAppGatherAsyncTask(Context ctx) { @@ -31,6 +35,7 @@ public BaseAppGatherAsyncTask(Context context, List changedPackages) { @Override protected Void doInBackground(Void... params) { + invalidateCacheIfIconMaskChanged(); List activitiesResolveInfoList = PackageManagerUtils.getResolveInfo(mContext, mChangedPackageNames); appCount = activitiesResolveInfoList.size(); for (ResolveInfo info : activitiesResolveInfoList) { @@ -47,4 +52,27 @@ protected void onPostExecute(Void result) { App.getPackageChangedListener().onPackageChange(mChangedPackageNames, appInfoList); //TODO trim icon cache } + + /** + * Check if the adaptive icons shape that was last used to generate the icon cache still applies + * If it changed, invalidate the icon cache and record the current shape. + */ + private void invalidateCacheIfIconMaskChanged() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + try { + Resources r = mContext.getPackageManager().getResourcesForApplication("android"); + int resId = r.getIdentifier("config_icon_mask", "string", "android"); + if (resId != 0) { + String mask = r.getString(resId); + if (mask.equals(App.getSettings().getLastIconShape())) { + return; + } + AppIconCache.invalidateIconCache(); + mChangedPackageNames = null; + App.getSettings().putLastIconShape(mask); + } + } catch (PackageManager.NameNotFoundException e) { /*no android package, help*/ + } + } + } } diff --git a/android/src/main/java/org/ligi/fast/settings/AndroidFASTSettings.java b/android/src/main/java/org/ligi/fast/settings/AndroidFASTSettings.java index f6b9ca2a..0cf3d614 100644 --- a/android/src/main/java/org/ligi/fast/settings/AndroidFASTSettings.java +++ b/android/src/main/java/org/ligi/fast/settings/AndroidFASTSettings.java @@ -1,5 +1,6 @@ package org.ligi.fast.settings; +import android.annotation.TargetApi; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; @@ -82,4 +83,14 @@ public boolean isShowHiddenActivated() { return mSharedPreferences.getBoolean(KEY_SHOW_HIDDEN, false); } + public String getLastIconShape() { + return mSharedPreferences.getString(KEY_LAST_ICON_MASK, null); + } + + @TargetApi(26) + public void putLastIconShape(String value) { + SharedPreferences.Editor editor = mSharedPreferences.edit(); + editor.putString(FASTSettings.KEY_LAST_ICON_MASK, value); + editor.apply(); + } } diff --git a/android/src/main/java/org/ligi/fast/settings/FASTSettings.java b/android/src/main/java/org/ligi/fast/settings/FASTSettings.java index b4f312c8..a0a9cb30 100644 --- a/android/src/main/java/org/ligi/fast/settings/FASTSettings.java +++ b/android/src/main/java/org/ligi/fast/settings/FASTSettings.java @@ -20,6 +20,7 @@ public interface FASTSettings { static final String KEY_GAP_SEARCH = "gap_search"; static final String KEY_ICONRES = "icon_res"; static final String KEY_SHOW_HIDDEN = "show_hidden"; + static final String KEY_LAST_ICON_MASK = "last_icon_mask"; boolean isLaunchSingleActivated(); @@ -51,4 +52,7 @@ public interface FASTSettings { boolean isShowHiddenActivated(); + String getLastIconShape(); + + void putLastIconShape(String v); } diff --git a/android/src/test/java/org/ligi/fast/testing/MutableFastSettings.java b/android/src/test/java/org/ligi/fast/testing/MutableFastSettings.java index 65179255..376f8615 100644 --- a/android/src/test/java/org/ligi/fast/testing/MutableFastSettings.java +++ b/android/src/test/java/org/ligi/fast/testing/MutableFastSettings.java @@ -11,6 +11,7 @@ public class MutableFastSettings implements FASTSettings { public boolean ignoreSpace = false; public boolean gapSearch = false; public String theme = "light"; + public String lastIconShape = ""; @Override public boolean isLaunchSingleActivated() { @@ -87,4 +88,14 @@ public int getIconResolution() { public boolean isShowHiddenActivated() { return false; } + + @Override + public String getLastIconShape() { + return lastIconShape; + } + + @Override + public void putLastIconShape(String v) { + lastIconShape = v; + } } From ac59acef824010bade2169a0f3f66586b07e5419 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 29 Oct 2022 00:52:10 +0200 Subject: [PATCH 56/56] feat: trim the icon cache after refreshing --- .../background/BaseAppGatherAsyncTask.java | 1 - .../background/PackageChangeReceiver.java | 1 - .../org/ligi/fast/model/AppIconCache.java | 33 +++++++++++++++++++ .../java/org/ligi/fast/model/AppInfoList.java | 1 + .../java/org/ligi/fast/ui/SearchActivity.java | 1 - 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java b/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java index 2394102c..22af6d12 100644 --- a/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java +++ b/android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java @@ -50,7 +50,6 @@ protected Void doInBackground(Void... params) { @Override protected void onPostExecute(Void result) { App.getPackageChangedListener().onPackageChange(mChangedPackageNames, appInfoList); - //TODO trim icon cache } /** diff --git a/android/src/main/java/org/ligi/fast/background/PackageChangeReceiver.java b/android/src/main/java/org/ligi/fast/background/PackageChangeReceiver.java index e771598d..c643b630 100644 --- a/android/src/main/java/org/ligi/fast/background/PackageChangeReceiver.java +++ b/android/src/main/java/org/ligi/fast/background/PackageChangeReceiver.java @@ -45,7 +45,6 @@ public void onReceive(Context context, Intent intent) { if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { App.getPackageChangedListener().onPackageChange(Collections.singletonList(packageName), null); } - //TODO trim icon cache break; } } diff --git a/android/src/main/java/org/ligi/fast/model/AppIconCache.java b/android/src/main/java/org/ligi/fast/model/AppIconCache.java index cc328379..5f6477a4 100644 --- a/android/src/main/java/org/ligi/fast/model/AppIconCache.java +++ b/android/src/main/java/org/ligi/fast/model/AppIconCache.java @@ -6,6 +6,7 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; +import android.support.annotation.Nullable; import org.ligi.fast.App; import org.ligi.tracedroid.logging.Log; @@ -14,6 +15,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.lang.ref.SoftReference; +import java.util.Iterator; +import java.util.List; public class AppIconCache { private static final Bitmap.CompressFormat COMPRESS_FORMAT = Bitmap.CompressFormat.PNG; @@ -56,6 +59,36 @@ public static void invalidateIconCache() { } } + /** + * Delete all icon cache files that are not referenced in the current app info list. + * If no app info list is provided all currently cached icons will be deleted. + * + * @param currentAppInfo The complete and up-to-date app info list. Treated as empty if null. + */ + public static void trimIconCache(@Nullable List currentAppInfo) { + if (App.getBaseDir().exists()) { + File[] iconFiles = App.getBaseDir().listFiles(pathname -> pathname.getName().endsWith(CACHE_FILE_ENDING)); + if (iconFiles != null) { + next_file: + for (File iconFile : iconFiles) { + if (currentAppInfo != null) { + for (Iterator iterator = currentAppInfo.iterator(); iterator.hasNext(); ) { + String referencedPath = getIconCacheFile(iterator.next()).getAbsolutePath(); + String cachedPath = iconFile.getAbsolutePath(); + if (cachedPath.equals(referencedPath)) { + iterator.remove(); + continue next_file; + } + } + } + if (!iconFile.delete()) { + Log.w("Unable to delete " + iconFile.getAbsolutePath()); + } + } + } + } + } + public void cacheIcon(ResolveInfo ri) { final PackageManager packageManager = ctx.getPackageManager(); diff --git a/android/src/main/java/org/ligi/fast/model/AppInfoList.java b/android/src/main/java/org/ligi/fast/model/AppInfoList.java index 964c3ab8..5336aa12 100644 --- a/android/src/main/java/org/ligi/fast/model/AppInfoList.java +++ b/android/src/main/java/org/ligi/fast/model/AppInfoList.java @@ -68,5 +68,6 @@ public void onPackageChange(List changedPackageNames, List newA this.clear(); this.addAll(updatedAppInfoList); + new Thread(() -> AppIconCache.trimIconCache(updatedAppInfoList)).start(); } } diff --git a/android/src/main/java/org/ligi/fast/ui/SearchActivity.java b/android/src/main/java/org/ligi/fast/ui/SearchActivity.java index 1831a5b8..5822e391 100755 --- a/android/src/main/java/org/ligi/fast/ui/SearchActivity.java +++ b/android/src/main/java/org/ligi/fast/ui/SearchActivity.java @@ -295,7 +295,6 @@ private String getHomePackageName() { @Override public void onPackageChange(List changedPackages, List list) { - // TODO we should also do a cleanup of cached icons here runOnUiThread(() -> { appInfoList.getBackingAppInfoList().onPackageChange(changedPackages, list); configureAdapter();