diff --git a/app/src/org/commcare/activities/CommCareSetupActivity.java b/app/src/org/commcare/activities/CommCareSetupActivity.java index 920c4bf69e..3b363901dd 100644 --- a/app/src/org/commcare/activities/CommCareSetupActivity.java +++ b/app/src/org/commcare/activities/CommCareSetupActivity.java @@ -46,8 +46,8 @@ import org.commcare.tasks.ResourceEngineListener; import org.commcare.tasks.RetrieveParseVerifyMessageListener; import org.commcare.tasks.RetrieveParseVerifyMessageTask; -import org.commcare.utils.ConsumerAppsUtil; import org.commcare.utils.ApkDependenciesUtils; +import org.commcare.utils.ConsumerAppsUtil; import org.commcare.utils.MultipleAppsUtil; import org.commcare.utils.Permissions; import org.commcare.views.ManagedUi; diff --git a/app/src/org/commcare/engine/resource/ResourceInstallUtils.java b/app/src/org/commcare/engine/resource/ResourceInstallUtils.java index 3c753a27ff..0f645999ca 100644 --- a/app/src/org/commcare/engine/resource/ResourceInstallUtils.java +++ b/app/src/org/commcare/engine/resource/ResourceInstallUtils.java @@ -8,9 +8,9 @@ import org.commcare.core.network.CaptivePortalRedirectException; import org.commcare.engine.resource.installers.SingleAppInstallation; import org.commcare.network.RateLimitedException; -import org.commcare.preferences.ServerUrls; import org.commcare.preferences.HiddenPreferences; import org.commcare.preferences.MainConfigurablePreferences; +import org.commcare.preferences.ServerUrls; import org.commcare.resources.ResourceManager; import org.commcare.resources.model.Resource; import org.commcare.resources.model.ResourceTable; @@ -57,7 +57,7 @@ public static boolean isUpdateReadyToInstall() { * Creates a new application record in db * @return newly created CommCare App */ - public static CommCareApp getNewCommCareApp() { + private static CommCareApp getNewCommCareApp() { ApplicationRecord newRecord = new ApplicationRecord(PropertyUtils.genUUID().replace("-", ""), ApplicationRecord.STATUS_UNINITIALIZED); diff --git a/app/src/org/commcare/engine/resource/installers/SingleAppInstallation.java b/app/src/org/commcare/engine/resource/installers/SingleAppInstallation.java index 7ef5e51a72..9a7c0e9d89 100644 --- a/app/src/org/commcare/engine/resource/installers/SingleAppInstallation.java +++ b/app/src/org/commcare/engine/resource/installers/SingleAppInstallation.java @@ -1,13 +1,7 @@ package org.commcare.engine.resource.installers; -import org.commcare.CommCareApp; import org.commcare.activities.CommCareSetupActivity; -import org.commcare.engine.resource.AppInstallStatus; import org.commcare.engine.resource.ResourceInstallUtils; -import org.commcare.tasks.ResourceEngineTask; - -import static org.commcare.engine.resource.ResourceInstallUtils.getNewCommCareApp; -import static org.commcare.engine.resource.ResourceInstallUtils.handleAppInstallResult; /** * Install CC app from the APK's asset directory