Rename members for clarity

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt

@@ -140,8 +140,8 @@ class AdvancedSettingsPresenter @Inject constructor(
             isSharePresenceEnabled = isSharePresenceEnabled,
             theme = theme,
             showChangeThemeDialog = showChangeThemeDialog,
-            pushDistributor = currentDistributorName,
+            currentPushDistributor = currentDistributorName,
-            pushDistributors = distributorNames.toImmutableList(),
+            availablePushDistributors = distributorNames.toImmutableList(),
             showChangePushProviderDialog = showChangePushProviderDialog,
             eventSink = { handleEvents(it) }
         )

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsState.kt

@@ -25,8 +25,8 @@ data class AdvancedSettingsState(
     val isSharePresenceEnabled: Boolean,
     val theme: Theme,
     val showChangeThemeDialog: Boolean,
-    val pushDistributor: AsyncAction<String>,
+    val currentPushDistributor: AsyncAction<String>,
-    val pushDistributors: ImmutableList<String>,
+    val availablePushDistributors: ImmutableList<String>,
     val showChangePushProviderDialog: Boolean,
     val eventSink: (AdvancedSettingsEvents) -> Unit
 )

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsStateProvider.kt

@@ -29,8 +29,8 @@ open class AdvancedSettingsStateProvider : PreviewParameterProvider<AdvancedSett
             aAdvancedSettingsState(showChangeThemeDialog = true),
             aAdvancedSettingsState(isSendPublicReadReceiptsEnabled = true),
             aAdvancedSettingsState(showChangePushProviderDialog = true),
-            aAdvancedSettingsState(pushDistributor = AsyncAction.Loading),
+            aAdvancedSettingsState(currentPushDistributor = AsyncAction.Loading),
-            aAdvancedSettingsState(pushDistributor = AsyncAction.Failure(Exception("Failed to change distributor"))),
+            aAdvancedSettingsState(currentPushDistributor = AsyncAction.Failure(Exception("Failed to change distributor"))),
         )
 }
 
@@ -38,16 +38,16 @@ fun aAdvancedSettingsState(
     isDeveloperModeEnabled: Boolean = false,
     isSendPublicReadReceiptsEnabled: Boolean = false,
     showChangeThemeDialog: Boolean = false,
-    pushDistributor: AsyncAction<String> = AsyncAction.Success("Firebase"),
+    currentPushDistributor: AsyncAction<String> = AsyncAction.Success("Firebase"),
-    pushDistributors: List<String> = listOf("Firebase", "ntfy"),
+    availablePushDistributors: List<String> = listOf("Firebase", "ntfy"),
     showChangePushProviderDialog: Boolean = false,
 ) = AdvancedSettingsState(
     isDeveloperModeEnabled = isDeveloperModeEnabled,
     isSharePresenceEnabled = isSendPublicReadReceiptsEnabled,
     theme = Theme.System,
     showChangeThemeDialog = showChangeThemeDialog,
-    pushDistributor = pushDistributor,
+    currentPushDistributor = currentPushDistributor,
-    pushDistributors = pushDistributors.toImmutableList(),
+    availablePushDistributors = availablePushDistributors.toImmutableList(),
     showChangePushProviderDialog = showChangePushProviderDialog,
     eventSink = {}
 )

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt

@@ -90,7 +90,7 @@ fun AdvancedSettingsView(
             headlineContent = {
                 Text(text = stringResource(id = R.string.screen_advanced_settings_push_provider_android))
             },
-            trailingContent = when (state.pushDistributor) {
+            trailingContent = when (state.currentPushDistributor) {
                 AsyncAction.Uninitialized,
                 AsyncAction.Confirming,
                 AsyncAction.Loading -> ListItemContent.Custom {
@@ -105,11 +105,11 @@ fun AdvancedSettingsView(
                     stringResource(id = CommonStrings.common_error)
                 )
                 is AsyncAction.Success -> ListItemContent.Text(
-                    state.pushDistributor.dataOrNull() ?: ""
+                    state.currentPushDistributor.dataOrNull() ?: ""
                 )
             },
             onClick = {
-                if (state.pushDistributor.isReady()) {
+                if (state.currentPushDistributor.isReady()) {
                     state.eventSink(AdvancedSettingsEvents.ChangePushProvider)
                 }
             }
@@ -134,10 +134,10 @@ fun AdvancedSettingsView(
     if (state.showChangePushProviderDialog) {
         SingleSelectionDialog(
             title = stringResource(id = R.string.screen_advanced_settings_choose_distributor_dialog_title_android),
-            options = state.pushDistributors.map {
+            options = state.availablePushDistributors.map {
                 ListOption(title = it)
             }.toImmutableList(),
-            initialSelection = state.pushDistributors.indexOf(state.pushDistributor.dataOrNull()),
+            initialSelection = state.availablePushDistributors.indexOf(state.currentPushDistributor.dataOrNull()),
             onOptionSelected = { index ->
                 state.eventSink(
                     AdvancedSettingsEvents.SetPushProvider(index)

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenterTest.kt

@@ -117,8 +117,8 @@ class AdvancedSettingsPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitLastSequentialItem()
-            assertThat(initialState.pushDistributor).isEqualTo(AsyncAction.Success("aDistributorName0"))
+            assertThat(initialState.currentPushDistributor).isEqualTo(AsyncAction.Success("aDistributorName0"))
-            assertThat(initialState.pushDistributors).containsExactly("aDistributorName0", "aDistributorName1")
+            assertThat(initialState.availablePushDistributors).containsExactly("aDistributorName0", "aDistributorName1")
             initialState.eventSink.invoke(AdvancedSettingsEvents.ChangePushProvider)
             val withDialog = awaitItem()
             assertThat(withDialog.showChangePushProviderDialog).isTrue()
@@ -131,9 +131,9 @@ class AdvancedSettingsPresenterTest {
             withDialog.eventSink(AdvancedSettingsEvents.SetPushProvider(1))
             val withNewProvider = awaitItem()
             assertThat(withNewProvider.showChangePushProviderDialog).isFalse()
-            assertThat(withNewProvider.pushDistributor).isEqualTo(AsyncAction.Loading)
+            assertThat(withNewProvider.currentPushDistributor).isEqualTo(AsyncAction.Loading)
             val lastItem = awaitItem()
-            assertThat(lastItem.pushDistributor).isEqualTo(AsyncAction.Success("aDistributorName1"))
+            assertThat(lastItem.currentPushDistributor).isEqualTo(AsyncAction.Success("aDistributorName1"))
             cancelAndIgnoreRemainingEvents()
         }
     }
@@ -157,9 +157,9 @@ class AdvancedSettingsPresenterTest {
             withDialog.eventSink(AdvancedSettingsEvents.SetPushProvider(1))
             val withNewProvider = awaitItem()
             assertThat(withNewProvider.showChangePushProviderDialog).isFalse()
-            assertThat(withNewProvider.pushDistributor).isEqualTo(AsyncAction.Loading)
+            assertThat(withNewProvider.currentPushDistributor).isEqualTo(AsyncAction.Loading)
             val lastItem = awaitItem()
-            assertThat(lastItem.pushDistributor).isInstanceOf(AsyncAction.Failure::class.java)
+            assertThat(lastItem.currentPushDistributor).isInstanceOf(AsyncAction.Failure::class.java)
         }
     }