diff options
| author | Albin <albin@mullvad.net> | 2023-02-09 08:00:49 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-02-09 12:03:58 +0100 |
| commit | ebaa207a6e9238e67596a0fe3eddb1f2abba375d (patch) | |
| tree | e052b87e79f14243cfe499c96fac950b7be4aa8b /android/app/src | |
| parent | 42601333b012406005d10a6be3ce992eb31cc9ad (diff) | |
| download | mullvadvpn-ebaa207a6e9238e67596a0fe3eddb1f2abba375d.tar.xz mullvadvpn-ebaa207a6e9238e67596a0fe3eddb1f2abba375d.zip | |
Move oot fragment to fragment package
Diffstat (limited to 'android/app/src')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 1 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt | 1 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt (renamed from android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt) | 5 |
3 files changed, 3 insertions, 4 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index 63a3f5dcab..41621f5017 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -41,6 +41,7 @@ import net.mullvad.mullvadvpn.repository.DeviceRepository import net.mullvad.mullvadvpn.ui.fragment.ConnectFragment import net.mullvad.mullvadvpn.ui.fragment.DeviceRevokedFragment import net.mullvad.mullvadvpn.ui.fragment.LaunchFragment +import net.mullvad.mullvadvpn.ui.fragment.OutOfTimeFragment import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager import net.mullvad.mullvadvpn.util.SdkUtils.isNotificationPermissionGranted import net.mullvad.mullvadvpn.util.UNKNOWN_STATE_DEBOUNCE_DELAY_MILLISECONDS diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt index 626f1fb486..f06f420158 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt @@ -28,7 +28,6 @@ import net.mullvad.mullvadvpn.ui.ConnectActionButton import net.mullvad.mullvadvpn.ui.ConnectionStatus import net.mullvad.mullvadvpn.ui.LocationInfo import net.mullvad.mullvadvpn.ui.NavigationBarPainter -import net.mullvad.mullvadvpn.ui.OutOfTimeFragment import net.mullvad.mullvadvpn.ui.SelectLocationFragment import net.mullvad.mullvadvpn.ui.extension.requireMainActivity import net.mullvad.mullvadvpn.ui.notification.AccountExpiryNotification diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt index c5a1f3f398..2d64b465b8 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.ui +package net.mullvad.mullvadvpn.ui.fragment import android.os.Bundle import android.view.LayoutInflater @@ -18,9 +18,8 @@ import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.model.TunnelState import net.mullvad.mullvadvpn.repository.AccountRepository +import net.mullvad.mullvadvpn.ui.POLL_INTERVAL import net.mullvad.mullvadvpn.ui.extension.openAccountPageInBrowser -import net.mullvad.mullvadvpn.ui.fragment.BaseFragment -import net.mullvad.mullvadvpn.ui.fragment.ConnectFragment import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState import net.mullvad.mullvadvpn.ui.serviceconnection.authTokenCache |