Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manage InstallManagerService queue with methods

Browse Source 
This should hopefully make it a bit clearer how the list of active APKs is
managed.
This commit is contained in:
Hans-Christoph Steiner 2016-05-12 11:25:43 +02:00
parent 80ed1e7180
commit cad7a9687d
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
View File

@ -209,8 +209,7 @@ public class InstallManagerService extends Service {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String urlString = intent.getDataString(); String urlString = intent.getDataString();
// TODO these need to be removed based on whether they are fed to InstallerService or not // TODO these need to be removed based on whether they are fed to InstallerService or not
Apk apk = ACTIVE_APKS.remove(urlString); Apk apk = removeFromActive(urlString);
ACTIVE_APPS.remove(apk.packageName);
if (AppDetails.isAppVisible(apk.packageName)) { if (AppDetails.isAppVisible(apk.packageName)) {
cancelNotification(urlString); cancelNotification(urlString);
} else { } else {
@ -223,8 +222,7 @@ public class InstallManagerService extends Service {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String urlString = intent.getDataString(); String urlString = intent.getDataString();
Apk apk = ACTIVE_APKS.remove(urlString); Apk apk = removeFromActive(urlString);
ACTIVE_APPS.remove(apk.packageName);
unregisterDownloaderReceivers(urlString); unregisterDownloaderReceivers(urlString);
cancelNotification(urlString); cancelNotification(urlString);
} }
@ -319,6 +317,18 @@ public class InstallManagerService extends Service {
notificationManager.cancel(urlString.hashCode()); notificationManager.cancel(urlString.hashCode());
} }
private static void addToActive(String urlString, App app, Apk apk) {
ACTIVE_APKS.put(urlString, apk);
ACTIVE_APPS.put(app.packageName, app);
TEMP_HACK_APP_NAMES.put(urlString, app.name); // TODO delete me once InstallerService exists
}
private static Apk removeFromActive(String urlString) {
Apk apk = ACTIVE_APKS.remove(urlString);
ACTIVE_APPS.remove(apk.packageName);
return apk;
}
/** /**
* Install an APK, checking the cache and downloading if necessary before starting the process. * Install an APK, checking the cache and downloading if necessary before starting the process.
* All notifications are sent as an {@link Intent} via local broadcasts to be received by * All notifications are sent as an {@link Intent} via local broadcasts to be received by
@ -328,9 +338,7 @@ public class InstallManagerService extends Service {
public static void queue(Context context, App app, Apk apk) { public static void queue(Context context, App app, Apk apk) {
String urlString = apk.getUrl(); String urlString = apk.getUrl();
Utils.debugLog(TAG, "queue " + app.packageName + " " + apk.versionCode + " from " + urlString); Utils.debugLog(TAG, "queue " + app.packageName + " " + apk.versionCode + " from " + urlString);
ACTIVE_APKS.put(urlString, apk); addToActive(urlString, app, apk);
ACTIVE_APPS.put(app.packageName, app);
TEMP_HACK_APP_NAMES.put(urlString, app.name); // TODO delete me once InstallerService exists
Intent intent = new Intent(context, InstallManagerService.class); Intent intent = new Intent(context, InstallManagerService.class);
intent.setAction(ACTION_INSTALL); intent.setAction(ACTION_INSTALL);
intent.setData(Uri.parse(urlString)); intent.setData(Uri.parse(urlString));