diff --git a/android/build.gradle b/android/build.gradle index f97cafda..f1ae66c4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,14 +5,14 @@ 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 { - compileSdkVersion 26 - buildToolsVersion "25.0.3" + namespace 'org.ligi.fast' + compileSdkVersion 33 defaultConfig { versionCode 68 @@ -20,8 +20,8 @@ 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 - applicationId "org.ligi.fast" + targetSdkVersion 32 + applicationId "org.ligi" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" archivesBaseName = "Fast-$versionName" } @@ -32,6 +32,9 @@ android { shrinkResources true proguardFile 'proguard-project.txt' } + debug { + applicationIdSuffix '.debug' + } } flavorDimensions "market", "size" @@ -51,12 +54,12 @@ android { withExtras { dimension "size" - applicationId "org.ligi.fast" + applicationIdSuffix ".fast" } noExtras { dimension "size" - applicationId "org.ligi.faster" + applicationIdSuffix ".faster" } } @@ -66,43 +69,40 @@ android { variant.setIgnore(project.hasProperty("singleFlavor") && ((market != 'forGooglePlay') || (size != 'noExtras'))) } - // ugly but the best workaround I found for getting the permission for spoon screenshot writing to SD-Card - // http://stackoverflow.com/questions/25276537/how-do-i-change-android-permission-settings-when-running-tests - sourceSets { - debug { - manifest.srcFile 'src/androidTest/AndroidManifest.xml' - } - } - - 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 { debug = true grantAllPermissions = true -} \ No newline at end of file +} 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/debug/res/values/strings.xml b/android/src/debug/res/values/strings.xml new file mode 100644 index 00000000..0d73ff8f --- /dev/null +++ b/android/src/debug/res/values/strings.xml @@ -0,0 +1,4 @@ + + + FAST (Debug) + 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/org/ligi/fast/TargetStore.java similarity index 65% rename from android/src/forFDroid/java/fast/TargetStore.java rename to android/src/forFDroid/java/org/ligi/fast/TargetStore.java index fe1ac9e4..ac72e321 100644 --- a/android/src/forFDroid/java/fast/TargetStore.java +++ b/android/src/forFDroid/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"; } 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"; } diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index a8127b9d..2409f8f7 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + + + + + + + + + + + + + - - - - - - - - - - - - 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 955b433f..00000000 --- a/android/src/main/java/org/ligi/axt/helpers/ActivityHelper.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.ligi.axt.helpers; - -import android.annotation.SuppressLint; -import android.annotation.TargetApi; -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 - */ - // @TargetApi(5) - // TODO find out why the above is not working and I need to use SupressLint to get rid of the error - @SuppressLint("newApi") - 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 ;-) - } - } -} 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..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,19 +14,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) { - 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) { @@ -36,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); - } - }); - } - - } 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..22af6d12 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,77 @@ package org.ligi.fast.background; import android.content.Context; -import android.content.Intent; +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.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 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); + @Override + protected Void doInBackground(Void... params) { + invalidateCacheIfIconMaskChanged(); + 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; + } - if (!ctx.getPackageName().equals(actAppInfo.getPackageName())) { // ignore self + @Override + protected void onPostExecute(Void result) { + App.getPackageChangedListener().onPackageChange(mChangedPackageNames, appInfoList); + } - // 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()); - } - } - } + /** + * 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; } - appInfoList.add(actAppInfo); - publishProgress(actAppInfo); + AppIconCache.invalidateIconCache(); + mChangedPackageNames = null; + App.getSettings().putLastIconShape(mask); } + } catch (PackageManager.NameNotFoundException e) { /*no android package, help*/ } - } 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); - return null; - } - - } 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..c643b630 --- /dev/null +++ b/android/src/main/java/org/ligi/fast/background/PackageChangeReceiver.java @@ -0,0 +1,51 @@ +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); + } + 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 90bef536..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; @@ -13,10 +14,14 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.IOException; 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; + private static final String CACHE_FILE_ENDING = ".png"; + private final IconConverter iconConverter = new IconConverter(); private final Context ctx; @@ -29,6 +34,61 @@ 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); + } + } + } + } + + /** + * 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(); @@ -70,40 +130,31 @@ class IconCacheSpec { public int quality = 100; } - - @SuppressWarnings("ResultOfMethodCallIgnored") // as we do not care if it is new or old - private boolean createIconCacheFile() throws IOException { - return getIconCacheFile().createNewFile(); - } - private File getIconCacheFile() { - final File file = new File(App.getBaseDir() + "/" + appInfo.getHash() + ".png"); - Log.i("returning " + file.exists()); - 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; } @@ -116,6 +167,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) { 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..8db69df3 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; @@ -20,20 +23,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; - private int callCount; - private boolean isValid = true; + + // User generated data + private String overrideLabel; + private int callCount = 0; private int pinMode = 0; private int labelMode = 0; - private final AppIconCache iconCache; + // Dynamic information that can be regenerated + private AppIconCache iconCache; + private String label; + private long installTime; + private long lastUpdateTime; + + // Runtime state + private String alternateDisplayLabel; + private boolean isValid = false; private AppInfo(Context ctx) { iconCache = new AppIconCache(ctx, this); @@ -43,94 +52,75 @@ 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]; - } - } - } - } - - calculateAlternateLabelAndPackageName(); - return; - } 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) { } - isValid = false; + if (!isValid) { + return; + } + if (lastUpdateTime < installTime) { + lastUpdateTime = installTime; + } + calculateAlternateLabel(); } public AppInfo(Context _ctx, ResolveInfo ri) { this(_ctx); - - // 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; - } else { - packageName = "unknown"; - activityName = "unknown"; + if (ri.activityInfo == null) { + return; } - callCount = 0; - - final PackageManager pmManager = _ctx.getPackageManager(); - - installTime = 0; - + packageName = ri.activityInfo.packageName; + activityName = ri.activityInfo.name; try { - final PackageInfo pi = pmManager.getPackageInfo(packageName, 0); - if (Build.VERSION.SDK_INT >= 9) { - installTime = pi.lastUpdateTime; + 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; } } catch (NameNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + return; // Package does not exist } - - hash = calculateTheHash(); - calculateAlternateLabelAndPackageName(); + isValid = true; + + // All static attributes done, call everything that depends on them now + calculateAlternateLabel(); iconCache.cacheIcon(ri); } - private void calculateAlternateLabelAndPackageName() { - alternateLabel = UmlautConverter.replaceAllUmlautsReturnNullIfEqual(label); - alternatePackageName = UmlautConverter.replaceAllUmlautsReturnNullIfEqual(packageName); + private void calculateAlternateLabel() { + alternateDisplayLabel = UmlautConverter.replaceAllUmlautsReturnNullIfEqual(getDisplayLabel()); } 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() { @@ -169,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(); } @@ -177,16 +171,13 @@ public String getPackageName() { return packageName; } - public String getActivityName() { - return activityName; - } - /** - * 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; @@ -205,8 +196,8 @@ public long getInstallTime() { return installTime; } - public void setCallCount(int count) { - callCount = count; + public long getLastUpdateTime() { + return lastUpdateTime; } public void incrementCallCount() { @@ -222,43 +213,30 @@ 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; - } + return alternateDisplayLabel; } - public String getAlternateLabel() { - return alternateLabel; - } - - public String getAlternatePackageName() { - return alternatePackageName; - } - - 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 this value to keep it close to the first install time. + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) { + this.installTime = currentInfo.installTime; } - - label = appInfo.getLabel(); - calculateAlternateLabelAndPackageName(); + this.lastUpdateTime = currentInfo.lastUpdateTime; + this.label = currentInfo.label; + calculateAlternateLabel(); } public int getPinMode() { @@ -269,19 +247,31 @@ 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; } - public String getOverrideLabel() { - return overrideLabel; - } - public void setOverrideLabel(String label) { this.overrideLabel = 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..5336aa12 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,51 @@ 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); + new Thread(() -> AppIconCache.trimIconCache(updatedAppInfoList)).start(); + } +} 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..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,18 +5,22 @@ 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); } 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; 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 40e4381b..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; @@ -24,40 +23,10 @@ public enum SortMode { UNSORTED, ALPHABETICAL, MOST_USED, LAST_INSTALLED } - @SuppressWarnings("unchecked") 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) { @@ -131,12 +100,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); } @@ -157,26 +120,7 @@ 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() { + public AppInfoList getBackingAppInfoList() { return backingAppInfoList; } } 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/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java index eb663299..53d5173b 100644 --- a/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java +++ b/android/src/main/java/org/ligi/fast/ui/AppActionDialogBuilder.java @@ -1,6 +1,5 @@ package org.ligi.fast.ui; -import android.annotation.SuppressLint; import android.app.AlertDialog; import android.app.Notification; import android.app.NotificationManager; @@ -60,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(); } })); @@ -135,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() { @@ -153,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); @@ -187,18 +188,23 @@ public void onClick(DialogInterface dialog, int which) { } - // @TargetApi(5) - // TODO find out why the above is not working and I need to use SupressLint to get rid of the error - @SuppressLint("newApi") 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); @@ -236,12 +242,13 @@ private boolean isMarketApp() { } } + //TODO adjust for notification channel requirement on api 26+ private class OpenAsNotificationRunnable implements Runnable { @Override 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); 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/FASTSettingsActivity.java b/android/src/main/java/org/ligi/fast/ui/FASTSettingsActivity.java index 46a93a5f..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; /** @@ -37,7 +38,6 @@ protected void onCreate(Bundle savedInstanceState) { } private PreferenceScreen createPreferenceHierarchy() { - @SuppressWarnings("deprecation") PreferenceScreen root = getPreferenceManager().createPreferenceScreen( this); @@ -73,6 +73,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); @@ -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; } }); 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 266b903c..f5d6a024 100644 --- a/android/src/main/java/org/ligi/fast/ui/LoadingDialog.java +++ b/android/src/main/java/org/ligi/fast/ui/LoadingDialog.java @@ -9,11 +9,9 @@ import android.widget.ProgressBar; import android.widget.TextView; -import org.ligi.axt.helpers.ActivityHelper; 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 @@ -54,18 +52,14 @@ 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(); - new ActivityHelper(this).disableRotation(); } - @SuppressWarnings("deprecation") // we cannot use the new getSize function - or we would get a NoSuchMethod error on newer devices private void setWindowWidth() { WindowManager.LayoutParams params = getWindow().getAttributes(); 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..5822e391 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,13 +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(); - Toast.makeText(this,"cannot start: " + e,Toast.LENGTH_LONG).show(); + //TODO localize + 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) { @@ -195,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 @@ -309,15 +294,10 @@ private String getHomePackageName() { } @Override - public void onPackageChange(final AppInfoList newAppInfoList) { - // 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); - } + public void onPackageChange(List changedPackages, List list) { + runOnUiThread(() -> { + appInfoList.getBackingAppInfoList().onPackageChange(changedPackages, list); + configureAdapter(); }); } @@ -327,10 +307,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/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; - } -} 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/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; } 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" /> + 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 diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index f27e5f57..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 @@ -48,30 +48,29 @@ 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 Unpin + Tiny Small Medium Large - Dark Light Transparent dark Transparent light - Unsorted Alphabetical By usage By installation time - + 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/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; + } } 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; 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 + + + + diff --git a/android/src/withExtras/res/values-de/strings.xml b/android/src/withExtras/res/values-de/strings.xml index 732d8fc7..f3f8945e 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? + 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 + 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 + Appliste und Icons löschen + Setzt Icons, Benutzungsdaten und Anpassungen zurück + 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 diff --git a/build.gradle b/build.gradle index a9db8a04..9728f7b2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,23 @@ buildscript { ext { - kotlin_version = '1.2.60' + kotlin_version = '1.7.20' } repositories { - jcenter() + mavenCentral() + google() + maven { url "https://plugins.gradle.org/m2/" } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'de.mobilej.unmock:UnMockPlugin:0.6.4' + classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.github.bjoernq:unmockplugin:0.7.9' + //TODO deprecated? classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2' - - classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.43.0' } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd..249e5832 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7dc503f1..ae04661e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d5..a69d9cb6 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@"