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

rename InstallManagerService Receivers for clarity and consistency

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-07-11 15:27:47 +02:00
parent 0952f3ba71
commit 6996bb6968
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ public class InstallManagerService extends Service {
appUpdateStatusManager.addApk(apk, AppUpdateStatusManager.Status.Downloading, null); appUpdateStatusManager.addApk(apk, AppUpdateStatusManager.Status.Downloading, null);
registerApkDownloaderReceivers(urlString); registerPackageDownloaderReceivers(urlString);
getObb(urlString, apk.getMainObbUrl(), apk.getMainObbFile(), apk.obbMainFileSha256); getObb(urlString, apk.getMainObbUrl(), apk.getMainObbFile(), apk.obbMainFileSha256);
getObb(urlString, apk.getPatchObbUrl(), apk.getPatchObbFile(), apk.obbPatchFileSha256); getObb(urlString, apk.getPatchObbUrl(), apk.getPatchObbFile(), apk.obbPatchFileSha256);
@ -313,7 +313,11 @@ public class InstallManagerService extends Service {
DownloaderService.getIntentFilter(obbUrlString)); DownloaderService.getIntentFilter(obbUrlString));
} }
private void registerApkDownloaderReceivers(String urlString) { /**
* Register a {@link BroadcastReceiver} for tracking download progress for a
* give {@code urlString}. There can be multiple of these registered at a time.
*/
private void registerPackageDownloaderReceivers(String urlString) {
BroadcastReceiver downloadReceiver = new BroadcastReceiver() { BroadcastReceiver downloadReceiver = new BroadcastReceiver() {
@Override @Override
@ -349,7 +353,7 @@ public class InstallManagerService extends Service {
appUpdateStatusManager.updateApk(urlString, AppUpdateStatusManager.Status.ReadyToInstall, null); appUpdateStatusManager.updateApk(urlString, AppUpdateStatusManager.Status.ReadyToInstall, null);
localBroadcastManager.unregisterReceiver(this); localBroadcastManager.unregisterReceiver(this);
registerInstallerReceivers(downloadUri); registerInstallReceiver(downloadUri);
Apk apk = appUpdateStatusManager.getApk(urlString); Apk apk = appUpdateStatusManager.getApk(urlString);
if (apk != null) { if (apk != null) {
@ -379,7 +383,11 @@ public class InstallManagerService extends Service {
DownloaderService.getIntentFilter(urlString)); DownloaderService.getIntentFilter(urlString));
} }
private void registerInstallerReceivers(Uri downloadUri) { /**
* Register a {@link BroadcastReceiver} for tracking install progress for a
* give {@link Uri}. There can be multiple of these registered at a time.
*/
private void registerInstallReceiver(Uri downloadUri) {
BroadcastReceiver installReceiver = new BroadcastReceiver() { BroadcastReceiver installReceiver = new BroadcastReceiver() {
@Override @Override