refactor(sync): replace conditional branches with when expressions (3ad93193) · Commits · e / os / AccountManager

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/SyncAdapterComponentManager.kt

+42 −34

Original line number	Diff line number	Diff line
		@@ -101,11 +101,12 @@ object SyncAdapterComponentManager {
		}

		val updateDecision = decideComponentStateUpdate(currentState, desiredState)
		if (updateDecision == ComponentStateUpdateDecision.SKIP_ALREADY_ALIGNED) {
		when (updateDecision) {
		ComponentStateUpdateDecision.SKIP_ALREADY_ALIGNED -> {
		return
		}

		if (updateDecision == ComponentStateUpdateDecision.SKIP_POLICY_CONTROLLED) {
		ComponentStateUpdateDecision.SKIP_POLICY_CONTROLLED -> {
		Logger.log.log(
		Level.INFO,
		"Skipping ${serviceClass.simpleName}: preserving ${stateName(currentState)} (authority=$authority)"
		@@ -113,6 +114,7 @@ object SyncAdapterComponentManager {
		return
		}

		ComponentStateUpdateDecision.UPDATE_REQUIRED -> {
		val changed = setComponentEnabledSetting(packageManager, component, serviceClass, desiredState)
		if (!changed) {
		return
		@@ -123,6 +125,8 @@ object SyncAdapterComponentManager {
		"Set ${serviceClass.simpleName} to ${stateName(desiredState)} (authority=$authority)"
		)
		}
		}
		}

		private fun getManifestServiceEnabled(
		packageManager: PackageManager,
		@@ -230,26 +234,30 @@ object SyncAdapterComponentManager {
		}

		private fun stateName(state: Int): String {
		if (state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) {
		return "ENABLED"
		return when (state) {
		PackageManager.COMPONENT_ENABLED_STATE_ENABLED -> {
		"ENABLED"
		}

		if (state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
		return "DISABLED"
		PackageManager.COMPONENT_ENABLED_STATE_DISABLED -> {
		"DISABLED"
		}

		if (state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
		return "DEFAULT"
		PackageManager.COMPONENT_ENABLED_STATE_DEFAULT -> {
		"DEFAULT"
		}

		if (state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
		return "DISABLED_USER"
		PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER -> {
		"DISABLED_USER"
		}

		if (state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) {
		return "DISABLED_UNTIL_USED"
		PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED -> {
		"DISABLED_UNTIL_USED"
		}

		return "UNKNOWN($state)"
		else -> {
		"UNKNOWN($state)"
		}
		}
		}
		}