diff options
3 files changed, 14 insertions, 4 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt index 9a2a9ce86d..44338c3989 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt @@ -149,7 +149,6 @@ class RedeemVoucherDialogTest { } companion object { - private const val REDEEM_BUTTON_TEXT = "Redeem" private const val CANCEL_BUTTON_TEXT = "Cancel" private const val GOT_IT_BUTTON_TEXT = "Got it!" private const val DUMMY_VOUCHER = "DUMMY____VOUCHER" diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSourceTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSourceTest.kt index d4fd349438..8f17f37bbd 100644 --- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSourceTest.kt +++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionDeviceDataSourceTest.kt @@ -13,7 +13,6 @@ import io.mockk.mockkObject import io.mockk.mockkStatic import io.mockk.unmockkAll import kotlin.reflect.KClass -import net.mullvad.mullvadvpn.lib.common.util.JobTracker import net.mullvad.mullvadvpn.lib.ipc.Event import net.mullvad.mullvadvpn.lib.ipc.EventDispatcher import net.mullvad.mullvadvpn.lib.ipc.Request @@ -22,8 +21,6 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test class ServiceConnectionDeviceDataSourceTest { - private val tracker = JobTracker() - @MockK private lateinit var mockedMainLooper: Looper @MockK private lateinit var mockedDispatchingHandler: EventDispatcher diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt index 107f5d35fe..52e662c771 100644 --- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt +++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt @@ -296,30 +296,44 @@ class MullvadDaemon( quantumResistant: QuantumResistantState ) + // Used by JNI + @Suppress("unused") private fun notifyAppVersionInfoEvent(appVersionInfo: AppVersionInfo) { onAppVersionInfoChange?.invoke(appVersionInfo) } + // Used by JNI + @Suppress("unused") private fun notifyRelayListEvent(relayList: RelayList) { onRelayListChange?.invoke(relayList) } + // Used by JNI + @Suppress("unused") private fun notifySettingsEvent(settings: Settings) { onSettingsChange.notify(settings) } + // Used by JNI + @Suppress("unused") private fun notifyTunnelStateEvent(event: TunnelState) { onTunnelStateChange.notify(event) } + // Used by JNI + @Suppress("unused") private fun notifyDaemonStopped() { onDaemonStopped?.invoke() } + // Used by JNI + @Suppress("unused") private fun notifyDeviceEvent(event: DeviceEvent) { _deviceStateUpdates.tryEmit(event.newState) } + // Used by JNI + @Suppress("unused") private fun notifyRemoveDeviceEvent(event: RemoveDeviceEvent) { _deviceListUpdates.tryEmit(DeviceListEvent.Available(event.accountToken, event.newDevices)) } |