From 6996bb6968111ca75e8a39c26039f0106409e0d2 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 11 Jul 2018 15:27:47 +0200
Subject: [PATCH] rename InstallManagerService Receivers for clarity and
 consistency

---
 .../fdroid/installer/InstallManagerService.java  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
index 90052b031..2c5440dee 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
@@ -215,7 +215,7 @@ public class InstallManagerService extends Service {
 
         appUpdateStatusManager.addApk(apk, AppUpdateStatusManager.Status.Downloading, null);
 
-        registerApkDownloaderReceivers(urlString);
+        registerPackageDownloaderReceivers(urlString);
         getObb(urlString, apk.getMainObbUrl(), apk.getMainObbFile(), apk.obbMainFileSha256);
         getObb(urlString, apk.getPatchObbUrl(), apk.getPatchObbFile(), apk.obbPatchFileSha256);
 
@@ -313,7 +313,11 @@ public class InstallManagerService extends Service {
                 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() {
             @Override
@@ -349,7 +353,7 @@ public class InstallManagerService extends Service {
                         appUpdateStatusManager.updateApk(urlString, AppUpdateStatusManager.Status.ReadyToInstall, null);
 
                         localBroadcastManager.unregisterReceiver(this);
-                        registerInstallerReceivers(downloadUri);
+                        registerInstallReceiver(downloadUri);
 
                         Apk apk = appUpdateStatusManager.getApk(urlString);
                         if (apk != null) {
@@ -379,7 +383,11 @@ public class InstallManagerService extends Service {
                 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() {
             @Override