Support new tunnel state API in the Android frontend.

Remove `get_current_location` from jni.

1 files changed, 9 insertions, 63 deletions

diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
index dae3bf2ed3..3838bdc7a0 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
@@ -79,7 +79,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.TunnelStateBlocked,
@@ -115,7 +114,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.TunnelStateBlocked,
@@ -149,7 +147,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -182,7 +179,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -216,7 +212,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = true,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -245,12 +240,11 @@ class ConnectScreenTest {
                     ConnectUiState(
                         location = null,
                         relayLocation = mockRelayLocation,
-                        tunnelUiState = TunnelState.Disconnected,
-                        tunnelRealState = TunnelState.Disconnected,
+                        tunnelUiState = TunnelState.Disconnected(),
+                        tunnelRealState = TunnelState.Disconnected(),
                         inAddress = null,
                         outAddress = "",
                         showLocation = true,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -286,7 +280,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = true,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification =
@@ -326,7 +319,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = true,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification =
@@ -363,7 +355,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.TunnelStateBlocked,
@@ -399,7 +390,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = true,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.TunnelStateBlocked,
@@ -430,12 +420,11 @@ class ConnectScreenTest {
                     ConnectUiState(
                         location = null,
                         relayLocation = mockRelayLocation,
-                        tunnelUiState = TunnelState.Disconnected,
-                        tunnelRealState = TunnelState.Disconnected,
+                        tunnelUiState = TunnelState.Disconnected(),
+                        tunnelRealState = TunnelState.Disconnected(),
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -468,7 +457,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -501,7 +489,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -528,12 +515,11 @@ class ConnectScreenTest {
                     ConnectUiState(
                         location = null,
                         relayLocation = null,
-                        tunnelUiState = TunnelState.Disconnected,
-                        tunnelRealState = TunnelState.Disconnected,
+                        tunnelUiState = TunnelState.Disconnected(),
+                        tunnelRealState = TunnelState.Disconnected(),
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -565,7 +551,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -583,39 +568,6 @@ class ConnectScreenTest {
     }
 
     @Test
-    fun testToggleTunnelInfo() {
-        // Arrange
-        val mockedClickHandler: () -> Unit = mockk(relaxed = true)
-        val dummyLocation = GeoIpLocation(null, null, "dummy country", null, "dummy hostname")
-        composeTestRule.setContentWithTheme {
-            ConnectScreen(
-                uiState =
-                    ConnectUiState(
-                        location = dummyLocation,
-                        relayLocation = null,
-                        tunnelUiState = TunnelState.Connecting(null, null),
-                        tunnelRealState = TunnelState.Connecting(null, null),
-                        inAddress = null,
-                        outAddress = "",
-                        showLocation = false,
-                        isTunnelInfoExpanded = false,
-                        deviceName = "",
-                        daysLeftUntilExpiry = null,
-                        inAppNotification = null,
-                        isPlayBuild = false
-                    ),
-                onToggleTunnelInfo = mockedClickHandler
-            )
-        }
-
-        // Act
-        composeTestRule.onNodeWithTag(LOCATION_INFO_TEST_TAG).performClick()
-
-        // Assert
-        verify { mockedClickHandler.invoke() }
-    }
-
-    @Test
     fun showLocationInfo() {
         // Arrange
         val mockLocation: GeoIpLocation = mockk(relaxed = true)
@@ -638,7 +590,6 @@ class ConnectScreenTest {
                         inAddress = mockInAddress,
                         outAddress = mockOutAddress,
                         showLocation = false,
-                        isTunnelInfoExpanded = true,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = null,
@@ -647,6 +598,8 @@ class ConnectScreenTest {
             )
         }
 
+        composeTestRule.onNodeWithTag(LOCATION_INFO_TEST_TAG).performClick()
+
         // Assert
         composeTestRule.apply {
             onNodeWithText(mockHostName).assertExists()
@@ -677,7 +630,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.UpdateAvailable(versionInfo),
@@ -714,7 +666,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.UnsupportedVersion(versionInfo),
@@ -748,7 +699,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.AccountExpiry(expiryDate),
@@ -787,7 +737,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.UnsupportedVersion(versionInfo),
@@ -820,7 +769,6 @@ class ConnectScreenTest {
                         inAddress = null,
                         outAddress = "",
                         showLocation = false,
-                        isTunnelInfoExpanded = false,
                         deviceName = "",
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.AccountExpiry(expiryDate),
@@ -838,10 +786,8 @@ class ConnectScreenTest {
 
     @Test
     fun testOpenAccountView() {
-
-        val onAccountClickMockk: () -> Unit = mockk(relaxed = true)
-
         // Arrange
+        val onAccountClickMockk: () -> Unit = mockk(relaxed = true)
         composeTestRule.setContentWithTheme {
             ConnectScreen(uiState = ConnectUiState.INITIAL, onAccountClick = onAccountClickMockk)
         }