Skip to content

Commit ed6d0fe

Browse files
committed
Fix remaining Copilot review issues: ktlint formatting and KDoc alignment
- Fix import ordering in SettingsFragment.kt and SettingsPresenterImpl.kt - Fix argument wrapping for Toast.makeText call in SettingsFragment.kt - Fix constructor parameter formatting in FcmPushProvider.kt - Clarify PushProvider KDoc: explicitly note user-configurable selection with no automatic "best provider" logic
1 parent 751bba3 commit ed6d0fe

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

app/src/full/kotlin/io/homeassistant/companion/android/push/FcmPushProvider.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import timber.log.Timber
1414
* Only available in the "full" build flavor.
1515
*/
1616
@Singleton
17-
class FcmPushProvider @Inject constructor(
18-
private val messagingTokenProvider: MessagingTokenProvider,
19-
) : PushProvider {
17+
class FcmPushProvider @Inject constructor(private val messagingTokenProvider: MessagingTokenProvider) : PushProvider {
2018

2119
override val name: String = NAME
2220

app/src/main/kotlin/io/homeassistant/companion/android/settings/SettingsFragment.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package io.homeassistant.companion.android.settings
22

33
import android.app.UiModeManager
44
import android.content.Intent
5-
import android.widget.Toast
65
import android.content.pm.PackageManager
76
import android.content.res.Configuration
87
import android.os.Build
98
import android.os.Bundle
109
import android.provider.Settings
1110
import android.view.View
11+
import android.widget.Toast
1212
import androidx.activity.result.contract.ActivityResultContracts
1313
import androidx.appcompat.content.res.AppCompatResources
1414
import androidx.core.app.NotificationManagerCompat
@@ -53,8 +53,8 @@ import io.homeassistant.companion.android.settings.wear.SettingsWearActivity
5353
import io.homeassistant.companion.android.settings.wear.SettingsWearDetection
5454
import io.homeassistant.companion.android.settings.widgets.ManageWidgetsSettingsFragment
5555
import io.homeassistant.companion.android.util.QuestUtil
56-
import io.homeassistant.companion.android.websocket.WebsocketManager
5756
import io.homeassistant.companion.android.util.applyBottomSafeDrawingInsets
57+
import io.homeassistant.companion.android.websocket.WebsocketManager
5858
import io.homeassistant.companion.android.webview.WebViewActivity
5959
import java.time.Instant
6060
import java.time.ZoneId
@@ -63,8 +63,8 @@ import java.time.format.FormatStyle
6363
import kotlinx.coroutines.Dispatchers
6464
import kotlinx.coroutines.launch
6565
import kotlinx.coroutines.sync.Mutex
66-
import kotlinx.coroutines.withContext
6766
import kotlinx.coroutines.sync.withLock
67+
import kotlinx.coroutines.withContext
6868
import timber.log.Timber
6969

7070
class SettingsFragment(
@@ -557,7 +557,11 @@ class SettingsFragment(
557557
presenter.handlePushProviderChange(value)
558558
}
559559
if (value == "WebSocket") {
560-
Toast.makeText(requireContext(), commonR.string.push_provider_websocket_enabled, Toast.LENGTH_SHORT).show()
560+
Toast.makeText(
561+
requireContext(),
562+
commonR.string.push_provider_websocket_enabled,
563+
Toast.LENGTH_SHORT,
564+
).show()
561565
WebsocketManager.restart(requireContext())
562566
}
563567
true

app/src/main/kotlin/io/homeassistant/companion/android/settings/SettingsPresenterImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import io.homeassistant.companion.android.common.data.prefs.PrefsRepository
1515
import io.homeassistant.companion.android.common.data.servers.ServerManager
1616
import io.homeassistant.companion.android.common.push.PushProviderManager
1717
import io.homeassistant.companion.android.database.server.Server
18-
import io.homeassistant.companion.android.push.WebSocketPushProvider
1918
import io.homeassistant.companion.android.database.settings.SettingsDao
19+
import io.homeassistant.companion.android.push.WebSocketPushProvider
2020
import io.homeassistant.companion.android.settings.assist.DefaultAssistantManager
2121
import io.homeassistant.companion.android.settings.language.LanguagesManager
2222
import io.homeassistant.companion.android.themes.NightModeManager

common/src/main/kotlin/io/homeassistant/companion/android/common/push/PushProvider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ package io.homeassistant.companion.android.common.push
1010
*
1111
* Implementations should be registered via Dagger multibinding so that
1212
* [PushProviderManager] can discover all available providers and expose them
13-
* for user selection.
13+
* for user selection. Provider choice is currently user-configurable; there is
14+
* no automatic "best provider" selection.
1415
*/
1516
interface PushProvider {
1617

0 commit comments

Comments
 (0)