Skip to content

Commit fc8a845

Browse files
SebiderSushiSebiderSushi
committed
Redesign the app (un)install receiver
- Packages will be refreshed individually whenever neccesary - Refreshing directly modifies SearchActivity.appInfoList.backingAppInfoList if it's available at WeakReference App.backingAppInfoList - LocaleChangeReceiver triggers a full refresh when changing the system language - In the preferences' title bar there is now a refresh button, just in case - IconCache.tryIconCaching() no longer returns true if icon already exists instead the icon gets refreshed anyway - IconCache.getIconCacheFile() has been centralized into AppInfo
1 parent b8d7742 commit fc8a845

16 files changed

+470
-316
lines changed

‎android/src/main/AndroidManifest.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,18 @@
7070

7171
<receiver android:name=".background.AppInstallOrRemoveReceiver">
7272
<intent-filter>
73-
<action android:name="android.intent.action.PACKAGE_INSTALL" />
7473
<action android:name="android.intent.action.PACKAGE_ADDED" />
75-
<action android:name="android.intent.action.PACKAGE_REMOVED" />
76-
<action android:name="android.intent.action.PACKAGE_REPLACED" />
7774
<action android:name="android.intent.action.PACKAGE_CHANGED" />
7875
<action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
7976
<data android:scheme="package" />
8077
</intent-filter>
8178
</receiver>
79+
80+
<receiver android:name=".background.LocaleChangeReceiver">
81+
<intent-filter>
82+
<action android:name="android.intent.action.LOCALE_CHANGED" />
83+
</intent-filter>
84+
</receiver>
8285
</application>
8386

8487
</manifest>

‎android/src/main/java/org/ligi/fast/App.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.ligi.tracedroid.TraceDroid;
1010

1111
import java.io.File;
12+
import java.lang.ref.WeakReference;
1213

1314
public class App extends Application {
1415

@@ -22,6 +23,7 @@ public interface PackageChangedListener {
2223
}
2324

2425
public static PackageChangedListener packageChangedListener;
26+
public static WeakReference<AppInfoList> backingAppInfoList;
2527

2628
@Override
2729
public void onCreate() {

‎android/src/main/java/org/ligi/fast/background/AppInstallOrRemoveReceiver.java

Lines changed: 138 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,153 @@
33
import android.content.BroadcastReceiver;
44
import android.content.Context;
55
import android.content.Intent;
6+
import android.content.pm.ResolveInfo;
7+
import android.net.Uri;
8+
69
import org.ligi.fast.App;
10+
import org.ligi.fast.model.AppInfo;
711
import org.ligi.fast.model.AppInfoList;
812
import org.ligi.fast.util.AppInfoListStore;
913

14+
import java.io.File;
15+
import java.util.Iterator;
16+
import java.util.List;
17+
18+
/**
19+
* Whenever an app is installed, uninstalled or components change
20+
* (e.g. the app disabled one of it's activities to hide it from the launcher)
21+
* this receiver takes care of removing or updating corresponding entries
22+
* (namely all activities and aliases) from AppInfoList and deletes their icons
23+
* from cache to clean up when uninstalling or to cause a refresh when updating.
24+
*/
1025
public class AppInstallOrRemoveReceiver extends BroadcastReceiver {
26+
//public final static String LOG_TAG = "FAST.AppInstallOrRemoveReceiver";
27+
1128
@Override
1229
public void onReceive(Context context, Intent intent) {
13-
final AppInfoListStore appInfoListStore = new AppInfoListStore(context);
30+
Uri data = intent.getData();
31+
if (data == null) return; // This should never be the case but...just to be sure...
32+
String packageName = data.getSchemeSpecificPart();
33+
String action = intent.getAction();
34+
AppInfoListStore appInfoListStore = new AppInfoListStore(context);
35+
AppInfoList appInfoList = null;
36+
if (App.backingAppInfoList != null) {
37+
appInfoList = App.backingAppInfoList.get();
38+
}
39+
if (appInfoList == null) {
40+
appInfoList = appInfoListStore.load();
41+
}
42+
// Check the package is newly installed or not
43+
// getBooleanExtra defaultValue is true so that in case of doubt the
44+
// presence of old information is checked anyway
45+
boolean newInstall = Intent.ACTION_PACKAGE_ADDED.equals(action) && !intent.getBooleanExtra(Intent.EXTRA_REPLACING, true);
46+
AppInfoList matchedAppInfoList = new AppInfoList();
47+
if (!newInstall) {
48+
// Collect all information concerning the changed package
49+
Iterator<AppInfo> appInfoIterator = appInfoList.iterator();
50+
while (appInfoIterator.hasNext()) {
51+
AppInfo appInfo = appInfoIterator.next();
52+
if (appInfo.getPackageName().equals(packageName)) {
53+
matchedAppInfoList.add(appInfo);
54+
appInfoIterator.remove();
55+
File icon = appInfo.getIconCacheFile();
56+
icon.delete();
57+
/*
58+
if (!icon.delete()) {
59+
Log.d(App.LOG_TAG, "AppInstallOrRemoveReceiver: Icon deletion failed for hash: " + appInfo.getHash());
60+
Log.d(AppInstallOrRemoveReceiver.LOG_TAG, "Icon deletion failed for hash: " + appInfo.getHash());
61+
}
62+
*/
63+
}
64+
}
65+
// Just to be sure; If this is the case there is no old information
66+
// to update and we can continue to simply add the new information
67+
newInstall = matchedAppInfoList.size() == 0;
68+
}
1469

15-
if (App.packageChangedListener == null) {
16-
App.packageChangedListener = new App.PackageChangedListener() {
17-
@Override
18-
public void onPackageChange(AppInfoList appInfoList) {
19-
appInfoListStore.save(appInfoList);
70+
if (!Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(action)) {
71+
Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
72+
launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
73+
launcherIntent.setPackage(packageName);
74+
List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentActivities(launcherIntent, 0);
75+
76+
Intent homeIntent = new Intent(Intent.ACTION_MAIN);
77+
homeIntent.addCategory(Intent.CATEGORY_HOME);
78+
homeIntent.setPackage(packageName);
79+
List<ResolveInfo> homeInfoList = context.getPackageManager().queryIntentActivities(homeIntent, 0);
80+
81+
// If there are no activities that should be displayed on the launcher we can quit here
82+
if (resolveInfoList.size() == 0 && homeInfoList.size() == 0) {
83+
//Log.d(App.LOG_TAG, "AppInstallOrRemoveReceiver: No launcher Activities"
84+
// + "\n\tPackage: " + packageName);
85+
return;
86+
}
87+
88+
// Deduplicate Resolve Info of activities with both categories - like SearchActivity (see manifest)
89+
for (ResolveInfo info : resolveInfoList) {
90+
Iterator<ResolveInfo> homeIterator = homeInfoList.iterator();
91+
while (homeIterator.hasNext()) {
92+
ResolveInfo homeInfo = homeIterator.next();
93+
if (homeInfo.activityInfo.name.equals(info.activityInfo.name)) {
94+
homeIterator.remove();
95+
break;
96+
}
97+
}
98+
if (!homeIterator.hasNext()) {
99+
break;
100+
}
101+
}
102+
resolveInfoList.addAll(homeInfoList);
103+
104+
/*
105+
String log =
106+
"AppInstallOrRemoveReceiver: Updating info:"
107+
+ "\n\tAction: " + action
108+
+ "\n\tPackage: " + packageName
109+
+ "\n\tLabel: " + resolveInfoList.get(0).activityInfo.loadLabel(context.getPackageManager())
110+
+ "\n\tActivities: " + String.valueOf(resolveInfoList.size());
111+
Log.d(App.LOG_TAG, log);
112+
Log.d(AppInstallOrRemoveReceiver.LOG_TAG, log);
113+
for (ResolveInfo i : resolveInfoList) {
114+
Log.d(App.LOG_TAG, "\t " + i.activityInfo.name);
115+
Log.d(AppInstallOrRemoveReceiver.LOG_TAG, "\t " + i.activityInfo.name);
116+
}
117+
*/
118+
119+
if (newInstall) { // New app, simple adding
120+
for (ResolveInfo info : resolveInfoList) {
121+
appInfoList.add(new AppInfo(context, info));
122+
}
123+
} else { // Update, merge data
124+
for (ResolveInfo info : resolveInfoList) {
125+
AppInfo actAppInfo = new AppInfo(context, info);
126+
127+
Iterator<AppInfo> oldInfoIterator = matchedAppInfoList.iterator();
128+
while (oldInfoIterator.hasNext()) {
129+
AppInfo oldInfo = oldInfoIterator.next();
130+
if (oldInfo.getActivityName().equals(actAppInfo.getActivityName())) {
131+
if (oldInfo.getLabelMode() == 2) { // AppInfo is alias
132+
oldInfo.setLabel(actAppInfo.getLabel());
133+
oldInfo.setInstallTime(actAppInfo.getInstallTime());
134+
appInfoList.add(oldInfo);
135+
} else {
136+
actAppInfo.setCallCount(oldInfo.getCallCount());
137+
actAppInfo.setPinMode(oldInfo.getPinMode());
138+
actAppInfo.setLabelMode(oldInfo.getLabelMode());
139+
actAppInfo.setOverrideLabel(oldInfo.getOverrideLabel());
140+
}
141+
oldInfoIterator.remove();
142+
}
143+
}
144+
appInfoList.add(actAppInfo);
20145
}
21-
};
146+
}
22147
}
23148

24-
new BackgroundGatherAsyncTask(context, appInfoListStore.load()).execute();
149+
if (App.packageChangedListener == null) {
150+
appInfoListStore.save(appInfoList);
151+
} else {
152+
App.packageChangedListener.onPackageChange(appInfoList);
153+
}
25154
}
26-
}
155+
}

‎android/src/main/java/org/ligi/fast/background/BackgroundGatherAsyncTask.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import org.ligi.fast.model.AppInfoList;
88
import org.ligi.fast.util.AppInfoListStore;
99

10-
import java.util.List;
11-
1210
public class BackgroundGatherAsyncTask extends BaseAppGatherAsyncTask {
1311

14-
public BackgroundGatherAsyncTask(Context context, AppInfoList oldAppInfoList) {
15-
super(context, oldAppInfoList);
12+
private Context context;
13+
14+
public BackgroundGatherAsyncTask(Context context) {
15+
super(context);
1616
}
1717

1818
@Override
@@ -25,7 +25,9 @@ protected void onPostExecute(Void result) {
2525
super.onPostExecute(result);
2626
if (App.packageChangedListener != null) {
2727
App.packageChangedListener.onPackageChange(appInfoList);
28+
} else {
29+
new AppInfoListStore(context).save(appInfoList);
2830
}
31+
context = null;
2932
}
30-
3133
}

‎android/src/main/java/org/ligi/fast/background/BaseAppGatherAsyncTask.java

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,80 +5,81 @@
55
import android.content.pm.ResolveInfo;
66
import android.os.AsyncTask;
77

8+
import org.ligi.fast.App;
89
import org.ligi.fast.model.AppInfo;
910
import org.ligi.fast.model.AppInfoList;
10-
import org.ligi.tracedroid.logging.Log;
11+
import org.ligi.fast.util.AppInfoListStore;
1112

12-
import java.util.ArrayList;
13+
import java.util.Iterator;
1314
import java.util.List;
1415

1516
/**
1617
* Async-Task to Retrieve / Store Application Info needed by this App
1718
*/
1819
public class BaseAppGatherAsyncTask extends AsyncTask<Void, AppInfo, Void> {
19-
private final Context ctx;
20+
private Context ctx;
21+
private AppInfoList oldAppList;
2022
protected int appCount;
2123
protected AppInfoList appInfoList;
22-
private final AppInfoList oldAppList;
2324

2425
public BaseAppGatherAsyncTask(Context ctx) {
25-
this(ctx, null);
26-
}
27-
28-
public BaseAppGatherAsyncTask(Context ctx, AppInfoList oldAppList) {
2926
this.ctx = ctx;
3027
appInfoList = new AppInfoList();
31-
this.oldAppList = oldAppList;
28+
if (App.backingAppInfoList != null) {
29+
this.oldAppList = App.backingAppInfoList.get();
30+
}
31+
if (this.appInfoList == null) {
32+
this.appInfoList = new AppInfoListStore(ctx).load();
33+
}
3234
}
3335

34-
private void processCategory(final String category) {
35-
final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
36-
mainIntent.addCategory(category);
37-
try {
38-
final List<ResolveInfo> resolveInfoList = ctx.getPackageManager().queryIntentActivities(mainIntent, 0);
39-
appCount += resolveInfoList.size();
40-
for (ResolveInfo info : resolveInfoList) {
41-
final AppInfo actAppInfo = new AppInfo(ctx, info);
36+
@Override
37+
protected Void doInBackground(Void... params) {
38+
Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
39+
launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
40+
List<ResolveInfo> resolveInfoList = ctx.getPackageManager().queryIntentActivities(launcherIntent, 0);
41+
42+
Intent homeIntent = new Intent(Intent.ACTION_MAIN);
43+
homeIntent.addCategory(Intent.CATEGORY_HOME);
44+
resolveInfoList.addAll(ctx.getPackageManager().queryIntentActivities(homeIntent, 0));
4245

43-
if (!ctx.getPackageName().equals(actAppInfo.getPackageName())) { // ignore self
46+
appCount = resolveInfoList.size();
4447

45-
// Update call count from current index that is being used.
46-
// This is because we may have updated the call count since the last time
47-
// we saved the package list. An alternative would be to save the package list
48-
// each time we leave
49-
if (oldAppList != null) {
50-
for(AppInfo oldInfo : oldAppList) {
51-
if (oldInfo.getActivityName().equals(actAppInfo.getActivityName())) {
52-
if (oldInfo.getLabelMode() == 2) {
53-
appInfoList.add(oldInfo);
54-
} else {
55-
actAppInfo.setCallCount(oldInfo.getCallCount());
56-
actAppInfo.setPinMode(oldInfo.getPinMode());
57-
actAppInfo.setLabelMode(oldInfo.getLabelMode());
58-
actAppInfo.setOverrideLabel(oldInfo.getOverrideLabel());
59-
}
48+
for (ResolveInfo info : resolveInfoList) {
49+
if (!ctx.getPackageName().equals(info.activityInfo.packageName)) { // ignore self
50+
AppInfo actAppInfo = new AppInfo(ctx, info);
51+
52+
// Update call count from current index that is being used.
53+
// This is because we may have updated the call count since the last time
54+
// we saved the package list. An alternative would be to save the package list
55+
// each time we leave
56+
if (oldAppList != null) {
57+
Iterator<AppInfo> oldInfoIterator = oldAppList.iterator();
58+
while (oldInfoIterator.hasNext()) {
59+
AppInfo oldInfo = oldInfoIterator.next();
60+
if (oldInfo.getActivityName().equals(actAppInfo.getActivityName())) {
61+
if (oldInfo.getLabelMode() == 2) { // AppInfo is alias
62+
oldInfo.setLabel(actAppInfo.getLabel());
63+
oldInfo.setInstallTime(actAppInfo.getInstallTime());
64+
appInfoList.add(oldInfo);
65+
} else {
66+
actAppInfo.setCallCount(oldInfo.getCallCount());
67+
actAppInfo.setPinMode(oldInfo.getPinMode());
68+
actAppInfo.setLabelMode(oldInfo.getLabelMode());
69+
actAppInfo.setOverrideLabel(oldInfo.getOverrideLabel());
6070
}
71+
oldInfoIterator.remove();
72+
// Can't break here anymore because of aliases
73+
// So instead this removes entries after processing
6174
}
6275
}
63-
appInfoList.add(actAppInfo);
64-
publishProgress(actAppInfo);
6576
}
77+
appInfoList.add(actAppInfo);
78+
publishProgress(actAppInfo);
6679
}
67-
} catch (Exception e) {
68-
Log.d("Exception occurred when getting activities skipping...!");
6980
}
7081

71-
}
72-
73-
74-
@Override
75-
protected Void doInBackground(Void... params) {
76-
// TODO the progressbar could be more exact here by first querying both - calculating the
77-
// total app-count and then process them - but as we do not expect that much launchers we
78-
// should be OK here
79-
appCount=0;
80-
processCategory(Intent.CATEGORY_LAUNCHER);
81-
processCategory(Intent.CATEGORY_HOME);
82+
ctx = null;
8283
return null;
8384
}
8485

‎android/src/main/java/org/ligi/fast/background/LocaleChangeReceiver.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package org.ligi.fast.background;
2+
3+
import android.content.BroadcastReceiver;
4+
import android.content.Context;
5+
import android.content.Intent;
6+
7+
import org.ligi.fast.App;
8+
import org.ligi.fast.model.AppInfoList;
9+
import org.ligi.fast.util.AppInfoListStore;
10+
11+
/**
12+
* Refreshes the whole AppInfoList to update labels when the user changes the system language
13+
*/
14+
public class LocaleChangeReceiver extends BroadcastReceiver {
15+
@Override
16+
public void onReceive(Context context, Intent intent) {
17+
new BackgroundGatherAsyncTask(context).execute();
18+
}
19+
}

0 commit comments

Comments
 (0)