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

handle install broadcasts after InstallManagerService was killed

Browse Source 
If InstallManagerService was killed, it'll forget all of its state.  If it
is killed while an install process is running, and that install fails,
InstallManagerService will receive a broadcast about the error but then it
can't find anything about the app in question besides its download URL.
That is enough to control the notification, but not enough to get the name
of the app in question.  This is a workaround by showing the APK filename
when the app name cannot be found. Ideally, the packageName would somehow
magically be delivered to InstallManagerService in this case, but the
Installer stuff doesn't always have it to send.

With android-23, there is getActiveNotifications(), which we might be able
to use to stash the packageName and fetch it as needed.
This commit is contained in:
Hans-Christoph Steiner 2016-08-31 21:52:52 +02:00
parent 3aa58bc005
commit c9a6cc3051
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ import android.support.v4.app.TaskStackBuilder;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils; import android.text.TextUtils;
import org.acra.ACRA;
import org.fdroid.fdroid.AppDetails; import org.fdroid.fdroid.AppDetails;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
@ -249,22 +248,12 @@ public class InstallManagerService extends Service {
// show notification if app details is not visible // show notification if app details is not visible
if (!TextUtils.isEmpty(errorMessage)) { if (!TextUtils.isEmpty(errorMessage)) {
try {
// temp setup to debug https://gitlab.com/fdroid/fdroidclient/issues/698
App app = getAppFromActive(downloadUrl); App app = getAppFromActive(downloadUrl);
// show notification if app details is not visible // show notification if app details is not visible
if (AppDetails.isAppVisible(app.packageName)) { if (app != null && AppDetails.isAppVisible(app.packageName)) {
cancelNotification(downloadUrl); cancelNotification(downloadUrl);
} else { } else {
String title = String.format( notifyError(downloadUrl, app, errorMessage);
getString(R.string.install_error_notify_title),
app.name);
notifyError(downloadUrl, title, errorMessage);
}
} catch (NullPointerException e) { //NOPMD
ACRA.getErrorReporter().handleException(
new IllegalStateException(errorMessage, e));
} }
} }
removeFromActive(downloadUrl); removeFromActive(downloadUrl);
@ -358,9 +347,19 @@ public class InstallManagerService extends Service {
notificationManager.notify(downloadUrlId, notification); notificationManager.notify(downloadUrlId, notification);
} }
private void notifyError(String urlString, String title, String text) { private void notifyError(String urlString, App app, String text) {
int downloadUrlId = urlString.hashCode(); int downloadUrlId = urlString.hashCode();
String name;
if (app == null) {
// if we have nothing else, show the APK filename
String path = Uri.parse(urlString).getPath();
name = path.substring(path.lastIndexOf('/'), path.length());
} else {
name = app.name;
}
String title = String.format(getString(R.string.install_error_notify_title), name);
Intent errorDialogIntent = new Intent(this, ErrorDialogActivity.class); Intent errorDialogIntent = new Intent(this, ErrorDialogActivity.class);
errorDialogIntent.putExtra( errorDialogIntent.putExtra(
ErrorDialogActivity.EXTRA_TITLE, title); ErrorDialogActivity.EXTRA_TITLE, title);
@ -397,8 +396,16 @@ public class InstallManagerService extends Service {
ACTIVE_APPS.put(app.packageName, app); ACTIVE_APPS.put(app.packageName, app);
} }
/**
* Always returns an {@link Apk} instance to avoid annoying null guards.
*/
private static Apk getApkFromActive(String urlString) { private static Apk getApkFromActive(String urlString) {
return ACTIVE_APKS.get(urlString); Apk apk = ACTIVE_APKS.get(urlString);
if (apk == null) {
return new Apk();
} else {
return apk;
}
} }
/** /**