summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/android-xml-tidy.yml2
-rw-r--r--.github/workflows/translations.yml4
-rw-r--r--android/app/build.gradle171
-rw-r--r--android/app/src/androidTest/AndroidManifest.xml (renamed from android/src/androidTest/AndroidManifest.xml)0
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/RecyclerViewMatcher.kt (renamed from android/src/androidTest/kotlin/net/mullvad/mullvadvpn/RecyclerViewMatcher.kt)0
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlowTest.kt (renamed from android/src/androidTest/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlowTest.kt)0
-rw-r--r--android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragmentTest.kt (renamed from android/src/androidTest/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragmentTest.kt)0
-rw-r--r--android/app/src/main/AndroidManifest.xml (renamed from android/src/main/AndroidManifest.xml)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppData.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppData.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManager.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManager.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/ViewIntent.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ViewIntent.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/DispatchingHandler.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/DispatchingHandler.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlow.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlow.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/MessageDispatcher.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/MessageDispatcher.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/ServiceConnection.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/ServiceConnection.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountData.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountData.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DnsOptions.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/DnsOptions.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/GeoIpLocation.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/GeoIpLocation.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/ListItemData.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/ListItemData.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/LoginStatus.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/LoginStatus.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/PublicKey.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/PublicKey.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/ServiceResult.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/ServiceResult.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmission.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmission.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionError.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionError.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WidgetState.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/WidgetState.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/GetItemResult.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/GetItemResult.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemType.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemType.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapterPosition.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapterPosition.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileMigrator.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileMigrator.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AppVersionInfoCache.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AppVersionInfoCache.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AuthTokenCache.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AuthTokenCache.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/KeyStatusListener.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/KeyStatusListener.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/LocationInfoCache.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/LocationInfoCache.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VoucherRedeemer.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VoucherRedeemer.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotificationAction.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotificationAction.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/persistence/SplitTunnelingPersistence.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/service/persistence/SplitTunnelingPersistence.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/BlockingController.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/BlockingController.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemListener.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemListener.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemsAdapter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemsAdapter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginState.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginState.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/NavigationBarPainter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NavigationBarPainter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/StatusBarPainter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/StatusBarPainter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SystemPainter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SystemPainter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/UnderNotificationBannerBehavior.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/UnderNotificationBannerBehavior.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsFooterHolder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsFooterHolder.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsItemHolder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsItemHolder.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/BaseFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/BaseFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragment.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragment.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ActionListItemView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ActionListItemView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ApplicationListItemView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ApplicationListItemView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/DividerGroupListItemView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/DividerGroupListItemView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ListItemView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ListItemView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/PlainListItemView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/PlainListItemView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ProgressListItemView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ProgressListItemView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/WidgetViewController.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/WidgetViewController.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotification.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotification.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/StatusLevel.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/StatusLevel.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoCache.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoCache.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AuthTokenCache.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AuthTokenCache.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ConnectionProxy.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ConnectionProxy.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/KeyStatusListener.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/KeyStatusListener.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/LocationInfoCache.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/LocationInfoCache.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SplitTunneling.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SplitTunneling.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VoucherRedeemer.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VoucherRedeemer.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VpnPermission.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VpnPermission.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryHolder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryHolder.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/BackButton.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/BackButton.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CellSwitch.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CellSwitch.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomItemAnimator.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomItemAnimator.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomRecyclerView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomRecyclerView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ListenableScrollView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ListenableScrollView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NotificationBanner.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NotificationBanner.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/RedeemVoucherButton.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/RedeemVoucherButton.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SitePaymentButton.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SitePaymentButton.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ToggleCell.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ToggleCell.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/AdapterWithHeader.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/AdapterWithHeader.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangeMonitor.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangeMonitor.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/Debouncer.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/Debouncer.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/DispatchingFlow.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/DispatchingFlow.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/EditTextExt.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/EditTextExt.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ExponentialBackoff.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/ExponentialBackoff.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/HeaderOrHolder.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/HeaderOrHolder.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/Intermittent.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/Intermittent.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/JobTracker.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/JobTracker.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ListenableScrollableView.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/ListenableScrollableView.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedTextFormatter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedTextFormatter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SmartDeferred.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/SmartDeferred.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeAgoFormatter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeAgoFormatter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeLeftFormatter.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeLeftFormatter.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ViewKtx.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/util/ViewKtx.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt)0
-rw-r--r--android/app/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt (renamed from android/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt)0
-rw-r--r--android/app/src/main/play/contact-email.txt (renamed from android/src/main/play/contact-email.txt)0
-rw-r--r--android/app/src/main/play/contact-website.txt (renamed from android/src/main/play/contact-website.txt)0
-rw-r--r--android/app/src/main/play/default-language.txt (renamed from android/src/main/play/default-language.txt)0
-rw-r--r--android/app/src/main/play/listings/en-US/full-description.txt (renamed from android/src/main/play/listings/en-US/full-description.txt)0
-rw-r--r--android/app/src/main/play/listings/en-US/graphics/feature-graphic/Android-feature-graphics.png (renamed from android/src/main/play/listings/en-US/graphics/feature-graphic/Android-feature-graphics.png)bin197879 -> 197879 bytes
-rw-r--r--android/app/src/main/play/listings/en-US/graphics/icon/icon.png (renamed from android/src/main/play/listings/en-US/graphics/icon/icon.png)bin19582 -> 19582 bytes
-rw-r--r--android/app/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.png (renamed from android/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.png)bin73841 -> 73841 bytes
-rw-r--r--android/app/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.png (renamed from android/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.png)bin65910 -> 65910 bytes
-rw-r--r--android/app/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.png (renamed from android/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.png)bin77371 -> 77371 bytes
-rw-r--r--android/app/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.png (renamed from android/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.png)bin77378 -> 77378 bytes
-rw-r--r--android/app/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.png (renamed from android/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.png)bin58620 -> 58620 bytes
-rw-r--r--android/app/src/main/play/listings/en-US/short-description.txt (renamed from android/src/main/play/listings/en-US/short-description.txt)0
-rw-r--r--android/app/src/main/play/listings/en-US/title.txt (renamed from android/src/main/play/listings/en-US/title.txt)0
-rw-r--r--android/app/src/main/play/release-notes/en-US/default.txt (renamed from android/src/main/play/release-notes/en-US/default.txt)0
-rw-r--r--android/app/src/main/res/anim/do_nothing.xml (renamed from android/src/main/res/anim/do_nothing.xml)0
-rw-r--r--android/app/src/main/res/anim/fade_in.xml (renamed from android/src/main/res/anim/fade_in.xml)0
-rw-r--r--android/app/src/main/res/anim/fade_out.xml (renamed from android/src/main/res/anim/fade_out.xml)0
-rw-r--r--android/app/src/main/res/anim/fragment_enter_from_bottom.xml (renamed from android/src/main/res/anim/fragment_enter_from_bottom.xml)0
-rw-r--r--android/app/src/main/res/anim/fragment_enter_from_right.xml (renamed from android/src/main/res/anim/fragment_enter_from_right.xml)0
-rw-r--r--android/app/src/main/res/anim/fragment_exit_to_bottom.xml (renamed from android/src/main/res/anim/fragment_exit_to_bottom.xml)0
-rw-r--r--android/app/src/main/res/anim/fragment_exit_to_right.xml (renamed from android/src/main/res/anim/fragment_exit_to_right.xml)0
-rw-r--r--android/app/src/main/res/anim/fragment_half_enter_from_left.xml (renamed from android/src/main/res/anim/fragment_half_enter_from_left.xml)0
-rw-r--r--android/app/src/main/res/anim/fragment_half_exit_to_left.xml (renamed from android/src/main/res/anim/fragment_half_exit_to_left.xml)0
-rw-r--r--android/app/src/main/res/color/switch_thumb_fill_selector.xml (renamed from android/src/main/res/color/switch_thumb_fill_selector.xml)0
-rw-r--r--android/app/src/main/res/drawable-hdpi/launch_logo.png (renamed from android/src/main/res/drawable-hdpi/launch_logo.png)bin10439 -> 10439 bytes
-rw-r--r--android/app/src/main/res/drawable-hdpi/logo_icon.png (renamed from android/src/main/res/drawable-hdpi/logo_icon.png)bin3962 -> 3962 bytes
-rw-r--r--android/app/src/main/res/drawable-hdpi/small_logo_black.png (renamed from android/src/main/res/drawable-hdpi/small_logo_black.png)bin632 -> 632 bytes
-rw-r--r--android/app/src/main/res/drawable-hdpi/small_logo_white.png (renamed from android/src/main/res/drawable-hdpi/small_logo_white.png)bin704 -> 704 bytes
-rw-r--r--android/app/src/main/res/drawable-mdpi/launch_logo.png (renamed from android/src/main/res/drawable-mdpi/launch_logo.png)bin6592 -> 6592 bytes
-rw-r--r--android/app/src/main/res/drawable-mdpi/logo_icon.png (renamed from android/src/main/res/drawable-mdpi/logo_icon.png)bin2476 -> 2476 bytes
-rw-r--r--android/app/src/main/res/drawable-mdpi/small_logo_black.png (renamed from android/src/main/res/drawable-mdpi/small_logo_black.png)bin428 -> 428 bytes
-rw-r--r--android/app/src/main/res/drawable-mdpi/small_logo_white.png (renamed from android/src/main/res/drawable-mdpi/small_logo_white.png)bin467 -> 467 bytes
-rw-r--r--android/app/src/main/res/drawable-xhdpi/banner.png (renamed from android/src/main/res/drawable-xhdpi/banner.png)bin10264 -> 10264 bytes
-rw-r--r--android/app/src/main/res/drawable-xhdpi/launch_logo.png (renamed from android/src/main/res/drawable-xhdpi/launch_logo.png)bin14447 -> 14447 bytes
-rw-r--r--android/app/src/main/res/drawable-xhdpi/logo_icon.png (renamed from android/src/main/res/drawable-xhdpi/logo_icon.png)bin5465 -> 5465 bytes
-rw-r--r--android/app/src/main/res/drawable-xhdpi/small_logo_black.png (renamed from android/src/main/res/drawable-xhdpi/small_logo_black.png)bin833 -> 833 bytes
-rw-r--r--android/app/src/main/res/drawable-xhdpi/small_logo_white.png (renamed from android/src/main/res/drawable-xhdpi/small_logo_white.png)bin917 -> 917 bytes
-rw-r--r--android/app/src/main/res/drawable-xxhdpi/launch_logo.png (renamed from android/src/main/res/drawable-xxhdpi/launch_logo.png)bin22242 -> 22242 bytes
-rw-r--r--android/app/src/main/res/drawable-xxhdpi/logo_icon.png (renamed from android/src/main/res/drawable-xxhdpi/logo_icon.png)bin8575 -> 8575 bytes
-rw-r--r--android/app/src/main/res/drawable-xxhdpi/small_logo_black.png (renamed from android/src/main/res/drawable-xxhdpi/small_logo_black.png)bin1317 -> 1317 bytes
-rw-r--r--android/app/src/main/res/drawable-xxhdpi/small_logo_white.png (renamed from android/src/main/res/drawable-xxhdpi/small_logo_white.png)bin1483 -> 1483 bytes
-rw-r--r--android/app/src/main/res/drawable-xxxhdpi/launch_logo.png (renamed from android/src/main/res/drawable-xxxhdpi/launch_logo.png)bin30277 -> 30277 bytes
-rw-r--r--android/app/src/main/res/drawable-xxxhdpi/logo_icon.png (renamed from android/src/main/res/drawable-xxxhdpi/logo_icon.png)bin11778 -> 11778 bytes
-rw-r--r--android/app/src/main/res/drawable-xxxhdpi/small_logo_black.png (renamed from android/src/main/res/drawable-xxxhdpi/small_logo_black.png)bin1837 -> 1837 bytes
-rw-r--r--android/app/src/main/res/drawable-xxxhdpi/small_logo_white.png (renamed from android/src/main/res/drawable-xxxhdpi/small_logo_white.png)bin2078 -> 2078 bytes
-rw-r--r--android/app/src/main/res/drawable/account_history_entry_background.xml (renamed from android/src/main/res/drawable/account_history_entry_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_history_remove.xml (renamed from android/src/main/res/drawable/account_history_remove.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_history_remove_normal.xml (renamed from android/src/main/res/drawable/account_history_remove_normal.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_history_remove_pressed.xml (renamed from android/src/main/res/drawable/account_history_remove_pressed.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_input_background.xml (renamed from android/src/main/res/drawable/account_input_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_login_border.xml (renamed from android/src/main/res/drawable/account_login_border.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_login_border_error.xml (renamed from android/src/main/res/drawable/account_login_border_error.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_login_border_focused.xml (renamed from android/src/main/res/drawable/account_login_border_focused.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_login_corner.xml (renamed from android/src/main/res/drawable/account_login_corner.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_login_corner_error.xml (renamed from android/src/main/res/drawable/account_login_corner_error.xml)0
-rw-r--r--android/app/src/main/res/drawable/account_login_corner_focused.xml (renamed from android/src/main/res/drawable/account_login_corner_focused.xml)0
-rw-r--r--android/app/src/main/res/drawable/app_list_item_background.xml (renamed from android/src/main/res/drawable/app_list_item_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/blue_button_background.xml (renamed from android/src/main/res/drawable/blue_button_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/cell_button_background.xml (renamed from android/src/main/res/drawable/cell_button_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/cell_input_background.xml (renamed from android/src/main/res/drawable/cell_input_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/cell_input_cursor.xml (renamed from android/src/main/res/drawable/cell_input_cursor.xml)0
-rw-r--r--android/app/src/main/res/drawable/cell_switch_background.xml (renamed from android/src/main/res/drawable/cell_switch_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/dialog_background.xml (renamed from android/src/main/res/drawable/dialog_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/edit_text_background.xml (renamed from android/src/main/res/drawable/edit_text_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/green_button_background.xml (renamed from android/src/main/res/drawable/green_button_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/ic_icons_add.xml (renamed from android/src/main/res/drawable/ic_icons_add.xml)0
-rw-r--r--android/app/src/main/res/drawable/ic_icons_missing.xml (renamed from android/src/main/res/drawable/ic_icons_missing.xml)0
-rw-r--r--android/app/src/main/res/drawable/ic_icons_remove.xml (renamed from android/src/main/res/drawable/ic_icons_remove.xml)0
-rw-r--r--android/app/src/main/res/drawable/ic_launcher_foreground.xml (renamed from android/src/main/res/drawable/ic_launcher_foreground.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_add.xml (renamed from android/src/main/res/drawable/icon_add.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_alert.xml (renamed from android/src/main/res/drawable/icon_alert.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_arrow_blue20.xml (renamed from android/src/main/res/drawable/icon_arrow_blue20.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_arrow_white.xml (renamed from android/src/main/res/drawable/icon_arrow_white.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_back.xml (renamed from android/src/main/res/drawable/icon_back.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_chevron.xml (renamed from android/src/main/res/drawable/icon_chevron.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_chevron_expand.xml (renamed from android/src/main/res/drawable/icon_chevron_expand.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_close.xml (renamed from android/src/main/res/drawable/icon_close.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_extlink.xml (renamed from android/src/main/res/drawable/icon_extlink.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_fail.xml (renamed from android/src/main/res/drawable/icon_fail.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_notification_connect.xml (renamed from android/src/main/res/drawable/icon_notification_connect.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_notification_disconnect.xml (renamed from android/src/main/res/drawable/icon_notification_disconnect.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_notification_error.xml (renamed from android/src/main/res/drawable/icon_notification_error.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_notification_warning.xml (renamed from android/src/main/res/drawable/icon_notification_warning.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_relay_active.xml (renamed from android/src/main/res/drawable/icon_relay_active.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_relay_inactive.xml (renamed from android/src/main/res/drawable/icon_relay_inactive.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_reload.xml (renamed from android/src/main/res/drawable/icon_reload.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_settings.xml (renamed from android/src/main/res/drawable/icon_settings.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_spinner.xml (renamed from android/src/main/res/drawable/icon_spinner.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_success.xml (renamed from android/src/main/res/drawable/icon_success.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_tick.xml (renamed from android/src/main/res/drawable/icon_tick.xml)0
-rw-r--r--android/app/src/main/res/drawable/icon_tick_green.xml (renamed from android/src/main/res/drawable/icon_tick_green.xml)0
-rw-r--r--android/app/src/main/res/drawable/input_text_background.xml (renamed from android/src/main/res/drawable/input_text_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/login_button_arrow.xml (renamed from android/src/main/res/drawable/login_button_arrow.xml)0
-rw-r--r--android/app/src/main/res/drawable/login_button_background.xml (renamed from android/src/main/res/drawable/login_button_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/red_button_background.xml (renamed from android/src/main/res/drawable/red_button_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/switch_thumb.xml (renamed from android/src/main/res/drawable/switch_thumb.xml)0
-rw-r--r--android/app/src/main/res/drawable/switch_track.xml (renamed from android/src/main/res/drawable/switch_track.xml)0
-rw-r--r--android/app/src/main/res/drawable/text_input_cursor.xml (renamed from android/src/main/res/drawable/text_input_cursor.xml)0
-rw-r--r--android/app/src/main/res/drawable/transparent_red_button_background.xml (renamed from android/src/main/res/drawable/transparent_red_button_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/transparent_red_left_half_button_background.xml (renamed from android/src/main/res/drawable/transparent_red_left_half_button_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/transparent_red_right_half_button_background.xml (renamed from android/src/main/res/drawable/transparent_red_right_half_button_background.xml)0
-rw-r--r--android/app/src/main/res/drawable/white20_button_background.xml (renamed from android/src/main/res/drawable/white20_button_background.xml)0
-rw-r--r--android/app/src/main/res/layout/account.xml (renamed from android/src/main/res/layout/account.xml)0
-rw-r--r--android/app/src/main/res/layout/account_history_entry.xml (renamed from android/src/main/res/layout/account_history_entry.xml)0
-rw-r--r--android/app/src/main/res/layout/account_input.xml (renamed from android/src/main/res/layout/account_input.xml)0
-rw-r--r--android/app/src/main/res/layout/account_login.xml (renamed from android/src/main/res/layout/account_login.xml)0
-rw-r--r--android/app/src/main/res/layout/account_login_border.xml (renamed from android/src/main/res/layout/account_login_border.xml)0
-rw-r--r--android/app/src/main/res/layout/add_custom_dns_server.xml (renamed from android/src/main/res/layout/add_custom_dns_server.xml)0
-rw-r--r--android/app/src/main/res/layout/advanced.xml (renamed from android/src/main/res/layout/advanced.xml)0
-rw-r--r--android/app/src/main/res/layout/advanced_header.xml (renamed from android/src/main/res/layout/advanced_header.xml)0
-rw-r--r--android/app/src/main/res/layout/app_list_item.xml (renamed from android/src/main/res/layout/app_list_item.xml)0
-rw-r--r--android/app/src/main/res/layout/button.xml (renamed from android/src/main/res/layout/button.xml)0
-rw-r--r--android/app/src/main/res/layout/collapsed_title_layout.xml (renamed from android/src/main/res/layout/collapsed_title_layout.xml)0
-rw-r--r--android/app/src/main/res/layout/confirm_dns.xml (renamed from android/src/main/res/layout/confirm_dns.xml)0
-rw-r--r--android/app/src/main/res/layout/confirm_no_email.xml (renamed from android/src/main/res/layout/confirm_no_email.xml)0
-rw-r--r--android/app/src/main/res/layout/connect.xml (renamed from android/src/main/res/layout/connect.xml)0
-rw-r--r--android/app/src/main/res/layout/custom_dns_footer.xml (renamed from android/src/main/res/layout/custom_dns_footer.xml)0
-rw-r--r--android/app/src/main/res/layout/custom_dns_server.xml (renamed from android/src/main/res/layout/custom_dns_server.xml)0
-rw-r--r--android/app/src/main/res/layout/edit_custom_dns_server.xml (renamed from android/src/main/res/layout/edit_custom_dns_server.xml)0
-rw-r--r--android/app/src/main/res/layout/header_bar.xml (renamed from android/src/main/res/layout/header_bar.xml)0
-rw-r--r--android/app/src/main/res/layout/information_view.xml (renamed from android/src/main/res/layout/information_view.xml)0
-rw-r--r--android/app/src/main/res/layout/launch.xml (renamed from android/src/main/res/layout/launch.xml)0
-rw-r--r--android/app/src/main/res/layout/list_item_action.xml (renamed from android/src/main/res/layout/list_item_action.xml)0
-rw-r--r--android/app/src/main/res/layout/list_item_base.xml (renamed from android/src/main/res/layout/list_item_base.xml)0
-rw-r--r--android/app/src/main/res/layout/list_item_group_divider.xml (renamed from android/src/main/res/layout/list_item_group_divider.xml)0
-rw-r--r--android/app/src/main/res/layout/list_item_plain_text.xml (renamed from android/src/main/res/layout/list_item_plain_text.xml)0
-rw-r--r--android/app/src/main/res/layout/list_item_progress.xml (renamed from android/src/main/res/layout/list_item_progress.xml)0
-rw-r--r--android/app/src/main/res/layout/list_item_two_action.xml (renamed from android/src/main/res/layout/list_item_two_action.xml)0
-rw-r--r--android/app/src/main/res/layout/list_item_widget_image.xml (renamed from android/src/main/res/layout/list_item_widget_image.xml)0
-rw-r--r--android/app/src/main/res/layout/list_item_widget_switch.xml (renamed from android/src/main/res/layout/list_item_widget_switch.xml)0
-rw-r--r--android/app/src/main/res/layout/login.xml (renamed from android/src/main/res/layout/login.xml)0
-rw-r--r--android/app/src/main/res/layout/main.xml (renamed from android/src/main/res/layout/main.xml)0
-rw-r--r--android/app/src/main/res/layout/missing_service.xml (renamed from android/src/main/res/layout/missing_service.xml)0
-rw-r--r--android/app/src/main/res/layout/mtu_edit_text.xml (renamed from android/src/main/res/layout/mtu_edit_text.xml)0
-rw-r--r--android/app/src/main/res/layout/notification_banner.xml (renamed from android/src/main/res/layout/notification_banner.xml)0
-rw-r--r--android/app/src/main/res/layout/out_of_time.xml (renamed from android/src/main/res/layout/out_of_time.xml)0
-rw-r--r--android/app/src/main/res/layout/payment_buttons.xml (renamed from android/src/main/res/layout/payment_buttons.xml)0
-rw-r--r--android/app/src/main/res/layout/preferences.xml (renamed from android/src/main/res/layout/preferences.xml)0
-rw-r--r--android/app/src/main/res/layout/problem_report.xml (renamed from android/src/main/res/layout/problem_report.xml)0
-rw-r--r--android/app/src/main/res/layout/redeem_voucher.xml (renamed from android/src/main/res/layout/redeem_voucher.xml)0
-rw-r--r--android/app/src/main/res/layout/relay_list_item.xml (renamed from android/src/main/res/layout/relay_list_item.xml)0
-rw-r--r--android/app/src/main/res/layout/select_location.xml (renamed from android/src/main/res/layout/select_location.xml)0
-rw-r--r--android/app/src/main/res/layout/select_location_header.xml (renamed from android/src/main/res/layout/select_location_header.xml)0
-rw-r--r--android/app/src/main/res/layout/settings.xml (renamed from android/src/main/res/layout/settings.xml)0
-rw-r--r--android/app/src/main/res/layout/settings_back_button.xml (renamed from android/src/main/res/layout/settings_back_button.xml)0
-rw-r--r--android/app/src/main/res/layout/split_tunneling.xml (renamed from android/src/main/res/layout/split_tunneling.xml)0
-rw-r--r--android/app/src/main/res/layout/split_tunneling_header.xml (renamed from android/src/main/res/layout/split_tunneling_header.xml)0
-rw-r--r--android/app/src/main/res/layout/switch_location_button.xml (renamed from android/src/main/res/layout/switch_location_button.xml)0
-rw-r--r--android/app/src/main/res/layout/view_logs.xml (renamed from android/src/main/res/layout/view_logs.xml)0
-rw-r--r--android/app/src/main/res/layout/welcome.xml (renamed from android/src/main/res/layout/welcome.xml)0
-rw-r--r--android/app/src/main/res/layout/wireguard_key.xml (renamed from android/src/main/res/layout/wireguard_key.xml)0
-rw-r--r--android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (renamed from android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml)0
-rw-r--r--android/app/src/main/res/mipmap-hdpi/ic_launcher.png (renamed from android/src/main/res/mipmap-hdpi/ic_launcher.png)bin3832 -> 3832 bytes
-rw-r--r--android/app/src/main/res/mipmap-mdpi/ic_launcher.png (renamed from android/src/main/res/mipmap-mdpi/ic_launcher.png)bin2371 -> 2371 bytes
-rw-r--r--android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (renamed from android/src/main/res/mipmap-xhdpi/ic_launcher.png)bin5333 -> 5333 bytes
-rw-r--r--android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (renamed from android/src/main/res/mipmap-xxhdpi/ic_launcher.png)bin8116 -> 8116 bytes
-rw-r--r--android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (renamed from android/src/main/res/mipmap-xxxhdpi/ic_launcher.png)bin11169 -> 11169 bytes
-rw-r--r--android/app/src/main/res/values-da/plurals.xml (renamed from android/src/main/res/values-da/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-da/strings.xml (renamed from android/src/main/res/values-da/strings.xml)0
-rw-r--r--android/app/src/main/res/values-de/plurals.xml (renamed from android/src/main/res/values-de/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-de/strings.xml (renamed from android/src/main/res/values-de/strings.xml)0
-rw-r--r--android/app/src/main/res/values-es/plurals.xml (renamed from android/src/main/res/values-es/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-es/strings.xml (renamed from android/src/main/res/values-es/strings.xml)0
-rw-r--r--android/app/src/main/res/values-fi/plurals.xml (renamed from android/src/main/res/values-fi/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-fi/strings.xml (renamed from android/src/main/res/values-fi/strings.xml)0
-rw-r--r--android/app/src/main/res/values-fr/plurals.xml (renamed from android/src/main/res/values-fr/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-fr/strings.xml (renamed from android/src/main/res/values-fr/strings.xml)0
-rw-r--r--android/app/src/main/res/values-it/plurals.xml (renamed from android/src/main/res/values-it/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-it/strings.xml (renamed from android/src/main/res/values-it/strings.xml)0
-rw-r--r--android/app/src/main/res/values-ja/plurals.xml (renamed from android/src/main/res/values-ja/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-ja/strings.xml (renamed from android/src/main/res/values-ja/strings.xml)0
-rw-r--r--android/app/src/main/res/values-ko/plurals.xml (renamed from android/src/main/res/values-ko/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-ko/strings.xml (renamed from android/src/main/res/values-ko/strings.xml)0
-rw-r--r--android/app/src/main/res/values-my/plurals.xml (renamed from android/src/main/res/values-my/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-my/strings.xml (renamed from android/src/main/res/values-my/strings.xml)0
-rw-r--r--android/app/src/main/res/values-nb/plurals.xml (renamed from android/src/main/res/values-nb/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-nb/strings.xml (renamed from android/src/main/res/values-nb/strings.xml)0
-rw-r--r--android/app/src/main/res/values-nl/plurals.xml (renamed from android/src/main/res/values-nl/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-nl/strings.xml (renamed from android/src/main/res/values-nl/strings.xml)0
-rw-r--r--android/app/src/main/res/values-pl/plurals.xml (renamed from android/src/main/res/values-pl/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-pl/strings.xml (renamed from android/src/main/res/values-pl/strings.xml)0
-rw-r--r--android/app/src/main/res/values-pt/plurals.xml (renamed from android/src/main/res/values-pt/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-pt/strings.xml (renamed from android/src/main/res/values-pt/strings.xml)0
-rw-r--r--android/app/src/main/res/values-ru/plurals.xml (renamed from android/src/main/res/values-ru/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-ru/strings.xml (renamed from android/src/main/res/values-ru/strings.xml)0
-rw-r--r--android/app/src/main/res/values-sv/plurals.xml (renamed from android/src/main/res/values-sv/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-sv/strings.xml (renamed from android/src/main/res/values-sv/strings.xml)0
-rw-r--r--android/app/src/main/res/values-th/plurals.xml (renamed from android/src/main/res/values-th/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-th/strings.xml (renamed from android/src/main/res/values-th/strings.xml)0
-rw-r--r--android/app/src/main/res/values-tr/plurals.xml (renamed from android/src/main/res/values-tr/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-tr/strings.xml (renamed from android/src/main/res/values-tr/strings.xml)0
-rw-r--r--android/app/src/main/res/values-zh-rCN/plurals.xml (renamed from android/src/main/res/values-zh-rCN/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-zh-rCN/strings.xml (renamed from android/src/main/res/values-zh-rCN/strings.xml)0
-rw-r--r--android/app/src/main/res/values-zh-rTW/plurals.xml (renamed from android/src/main/res/values-zh-rTW/plurals.xml)0
-rw-r--r--android/app/src/main/res/values-zh-rTW/strings.xml (renamed from android/src/main/res/values-zh-rTW/strings.xml)0
-rw-r--r--android/app/src/main/res/values/attrs.xml (renamed from android/src/main/res/values/attrs.xml)0
-rw-r--r--android/app/src/main/res/values/colors.xml (renamed from android/src/main/res/values/colors.xml)0
-rw-r--r--android/app/src/main/res/values/dimensions.xml (renamed from android/src/main/res/values/dimensions.xml)0
-rw-r--r--android/app/src/main/res/values/integers.xml (renamed from android/src/main/res/values/integers.xml)0
-rw-r--r--android/app/src/main/res/values/plurals.xml (renamed from android/src/main/res/values/plurals.xml)0
-rw-r--r--android/app/src/main/res/values/strings.xml (renamed from android/src/main/res/values/strings.xml)0
-rw-r--r--android/app/src/main/res/values/strings_non_translatable.xml (renamed from android/src/main/res/values/strings_non_translatable.xml)0
-rw-r--r--android/app/src/main/res/values/styles.xml (renamed from android/src/main/res/values/styles.xml)0
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/TestCoroutineRule.kt (renamed from android/src/test/kotlin/net/mullvad/mullvadvpn/TestCoroutineRule.kt)0
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/TestUtils.kt (renamed from android/src/test/kotlin/net/mullvad/mullvadvpn/TestUtils.kt)0
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManagerTest.kt (renamed from android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManagerTest.kt)0
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt (renamed from android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt)0
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/di/AppModuleTest.kt (renamed from android/src/test/kotlin/net/mullvad/mullvadvpn/di/AppModuleTest.kt)0
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt (renamed from android/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt)0
-rw-r--r--android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt (renamed from android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt)0
-rw-r--r--android/build.gradle183
-rwxr-xr-xandroid/generate-pngs.sh8
-rw-r--r--android/settings.gradle1
-rw-r--r--android/translations-converter/src/main.rs2
-rwxr-xr-xbuild-apk.sh10
-rw-r--r--ci/ci-android-xml.sh16
-rw-r--r--graphics/README.md6
-rwxr-xr-xwireguard/libwg/build-android.sh2
438 files changed, 206 insertions, 199 deletions
diff --git a/.github/workflows/android-xml-tidy.yml b/.github/workflows/android-xml-tidy.yml
index e733df4378..8cce8aae6d 100644
--- a/.github/workflows/android-xml-tidy.yml
+++ b/.github/workflows/android-xml-tidy.yml
@@ -4,7 +4,7 @@ on:
push:
paths:
- .github/workflows/android-xml-tidy.yml
- - android/src/main/**/*.xml
+ - android/app/src/main/**/*.xml
# Run verifier if requested manually from the Actions tab
workflow_dispatch:
jobs:
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index adebf29d49..537ad375bf 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -5,8 +5,8 @@ on:
paths:
- .github/workflows/translations.yml
- android/translations-converter/**
- - android/src/**/plurals.xml
- - android/src/**/strings.xml
+ - android/app/src/**/plurals.xml
+ - android/app/src/**/strings.xml
- gui/**
# Check if requested manually from the Actions tab
workflow_dispatch:
diff --git a/android/app/build.gradle b/android/app/build.gradle
new file mode 100644
index 0000000000..6af629ec56
--- /dev/null
+++ b/android/app/build.gradle
@@ -0,0 +1,171 @@
+apply plugin: 'com.android.application'
+apply plugin: 'com.github.triplet.play'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
+
+def repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath
+def extraAssetsDirectory = "$project.buildDir/extraAssets"
+def extraJniDirectory = "$project.buildDir/extraJni"
+
+def keystorePropertiesFile = file('keystore.properties')
+def keystoreProperties = new Properties()
+
+if (keystorePropertiesFile.exists()) {
+ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
+android {
+ compileSdkVersion 30
+ buildToolsVersion '30.0.3'
+
+ defaultConfig {
+ applicationId "net.mullvad.mullvadvpn"
+ minSdkVersion 26
+ targetSdkVersion 30
+ versionCode 21010099
+ versionName "2021.1"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ }
+
+ if (keystorePropertiesFile.exists()) {
+ signingConfigs {
+ release {
+ keyAlias keystoreProperties['keyAlias']
+ keyPassword keystoreProperties['keyPassword']
+ storeFile file(keystoreProperties['storeFile'])
+ storePassword keystoreProperties['storePassword']
+ }
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ signingConfig signingConfigs.release
+ }
+ }
+ }
+
+ buildTypes {
+ fdroid {
+ initWith release
+ minifyEnabled false
+ signingConfig null
+ }
+ }
+
+ sourceSets {
+ main {
+ assets {
+ srcDirs = files(extraAssetsDirectory)
+ }
+
+ jniLibs {
+ srcDirs = files(extraJniDirectory)
+ }
+
+ java {
+ srcDirs += 'src/main/kotlin/'
+ }
+ }
+
+ test {
+ java {
+ srcDirs += 'src/test/kotlin/'
+ }
+ }
+
+ androidTest {
+ java {
+ srcDirs += 'src/androidTest/kotlin/'
+ }
+ }
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ kotlinOptions {
+ jvmTarget = '1.8'
+ freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+ // Opt-in option for Koin annotation of KoinComponent.
+ }
+
+ applicationVariants.all { variant ->
+ variant.mergeAssetsProvider.configure {
+ dependsOn copyExtraAssets
+ }
+ }
+
+ testOptions {
+ unitTests.all {
+ testLogging {
+ outputs.upToDateWhen { false }
+ events "passed", "skipped", "failed", "standardOut", "standardError"
+ showCauses true
+ showExceptions true
+ }
+ }
+ }
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+ kotlinOptions {
+ allWarningsAsErrors = false
+
+ kotlinOptions.freeCompilerArgs += [
+ "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+ "-Xuse-experimental=kotlinx.coroutines.ObsoleteCoroutinesApi",
+ ]
+ }
+}
+
+task copyExtraAssets(type: Copy) {
+ from "$repoRootPath/dist-assets"
+ include "relays.json"
+ include "api-ip-address.txt"
+ into extraAssetsDirectory
+}
+
+play {
+ serviceAccountCredentials = file("play-api-key.json")
+}
+
+dependencies {
+ implementation "androidx.appcompat:appcompat:1.3.1"
+ implementation "androidx.constraintlayout:constraintlayout:2.1.0"
+ implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
+ implementation "androidx.core:core-ktx:1.6.0"
+ implementation "androidx.fragment:fragment-ktx:$fragmentVersion"
+ implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
+ implementation "androidx.recyclerview:recyclerview:1.2.1"
+ implementation "com.google.android.material:material:1.4.0"
+ implementation "commons-validator:commons-validator:1.7"
+ implementation "io.insert-koin:koin-core:$koinVersion"
+ implementation "io.insert-koin:koin-core-ext:$koinVersion"
+ implementation "io.insert-koin:koin-androidx-fragment:$koinVersion"
+ implementation "io.insert-koin:koin-androidx-scope:$koinVersion"
+ implementation "io.insert-koin:koin-androidx-viewmodel:$koinVersion"
+ implementation "joda-time:joda-time:2.10.2"
+ implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+ implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1"
+
+ /* Test dependencies */
+ testImplementation "io.insert-koin:koin-test:$koinVersion"
+ testImplementation "io.mockk:mockk:$mockkVersion"
+ testImplementation "junit:junit:4.13"
+ testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
+ testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.1"
+
+ /* UI test dependencies */
+ debugImplementation "androidx.fragment:fragment-testing:$fragmentVersion"
+ androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
+ androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
+ androidTestImplementation "androidx.test.ext:junit:1.1.3"
+ androidTestImplementation "io.mockk:mockk-android:$mockkVersion"
+ androidTestImplementation "io.insert-koin:koin-test:$koinVersion"
+ androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
+}
diff --git a/android/src/androidTest/AndroidManifest.xml b/android/app/src/androidTest/AndroidManifest.xml
index 41b8daf8c8..41b8daf8c8 100644
--- a/android/src/androidTest/AndroidManifest.xml
+++ b/android/app/src/androidTest/AndroidManifest.xml
diff --git a/android/src/androidTest/kotlin/net/mullvad/mullvadvpn/RecyclerViewMatcher.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/RecyclerViewMatcher.kt
index 2e87df9720..2e87df9720 100644
--- a/android/src/androidTest/kotlin/net/mullvad/mullvadvpn/RecyclerViewMatcher.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/RecyclerViewMatcher.kt
diff --git a/android/src/androidTest/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlowTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlowTest.kt
index 709f330b0d..709f330b0d 100644
--- a/android/src/androidTest/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlowTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlowTest.kt
diff --git a/android/src/androidTest/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragmentTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragmentTest.kt
index 8bd3cc70b8..8bd3cc70b8 100644
--- a/android/src/androidTest/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragmentTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragmentTest.kt
diff --git a/android/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 66edb7dc33..66edb7dc33 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt
index 0c3a0d8640..0c3a0d8640 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppData.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppData.kt
index ec5912c244..ec5912c244 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppData.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppData.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManager.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManager.kt
index ebfbc1f379..ebfbc1f379 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManager.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManager.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt
index 774392f1a6..774392f1a6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProvider.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ViewIntent.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/ViewIntent.kt
index 47391f2971..47391f2971 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/ViewIntent.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/applist/ViewIntent.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
index 52795f0964..52795f0964 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/MullvadProblemReport.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt
index 03b8c1f09a..03b8c1f09a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/DispatchingHandler.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/DispatchingHandler.kt
index 93c79a1ab9..93c79a1ab9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/DispatchingHandler.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/DispatchingHandler.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt
index a5854232a8..a5854232a8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Event.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlow.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlow.kt
index 943c55eeff..943c55eeff 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlow.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/HandlerFlow.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt
index 7758f6c926..7758f6c926 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Message.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/MessageDispatcher.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/MessageDispatcher.kt
index 8a681b2ce4..8a681b2ce4 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/MessageDispatcher.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/MessageDispatcher.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt
index 27a93b0a2d..27a93b0a2d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/ServiceConnection.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/ServiceConnection.kt
index 66ac88c91d..66ac88c91d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ipc/ServiceConnection.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/ServiceConnection.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountData.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountData.kt
index 6dda6b8352..6dda6b8352 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountData.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/AccountData.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt
index cc1127d026..cc1127d026 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt
index 37b98298ab..37b98298ab 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt
index 05dd38a80b..05dd38a80b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/DnsOptions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DnsOptions.kt
index 6cef280b61..6cef280b61 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/DnsOptions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DnsOptions.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GeoIpLocation.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/GeoIpLocation.kt
index e15ab20376..e15ab20376 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GeoIpLocation.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/GeoIpLocation.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
index cbed622df6..cbed622df6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/GetAccountDataResult.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt
index ced83db74a..ced83db74a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/KeygenEvent.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/ListItemData.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/ListItemData.kt
index 465669a08f..465669a08f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/ListItemData.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/ListItemData.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
index 6734ff418e..6734ff418e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/LocationConstraint.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LoginStatus.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/LoginStatus.kt
index e143cc630c..e143cc630c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/LoginStatus.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/LoginStatus.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/PublicKey.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/PublicKey.kt
index 4ee6ad51df..4ee6ad51df 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/PublicKey.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/PublicKey.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt
index 23f9d87f77..23f9d87f77 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt
index cd36577dae..cd36577dae 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraints.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt
index 94aa58c56a..94aa58c56a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayConstraintsUpdate.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt
index 2373eba536..2373eba536 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayList.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt
index d4b3e21f58..d4b3e21f58 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCity.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt
index 20fdd7de71..20fdd7de71 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayListCountry.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
index 6a247997db..6a247997db 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettings.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
index 85f5de2a32..85f5de2a32 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelaySettingsUpdate.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt
index 5691932888..5691932888 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/RelayTunnels.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/ServiceResult.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/ServiceResult.kt
index b1d9f5be4c..b1d9f5be4c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/ServiceResult.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/ServiceResult.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
index 03ef69c638..03ef69c638 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt
index 944a98b0b8..944a98b0b8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
index 918396a263..918396a263 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmission.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmission.kt
index bf96646516..bf96646516 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmission.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmission.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionError.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionError.kt
index 1cf778400a..1cf778400a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionError.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionError.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
index b78957d5c0..b78957d5c0 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/VoucherSubmissionResult.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WidgetState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WidgetState.kt
index 3877c2d564..3877c2d564 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WidgetState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WidgetState.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt
index aee9b56082..aee9b56082 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardEndpointData.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt
index 251571021a..251571021a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/WireguardTunnelOptions.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/GetItemResult.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/GetItemResult.kt
index d443d30cfe..d443d30cfe 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/GetItemResult.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/GetItemResult.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt
index 080236cff9..080236cff9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt
index 2c8493de8a..2c8493de8a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt
index 197387d1c2..197387d1c2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt
index e5f28acee6..e5f28acee6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt
index a16313f797..a16313f797 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemType.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemType.kt
index cdbd58b291..cdbd58b291 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemType.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemType.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt
index aed15f9508..aed15f9508 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapter.kt
index 0937592399..0937592399 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapterPosition.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapterPosition.kt
index 09dfafebc8..09dfafebc8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapterPosition.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayListAdapterPosition.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt
index 32f473b194..32f473b194 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparator.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
index 23b127addf..23b127addf 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileMigrator.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileMigrator.kt
index cd325d8a6f..cd325d8a6f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileMigrator.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileMigrator.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
index 34ca0eaa89..34ca0eaa89 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/FileResourceExtractor.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
index 92c4fcd078..92c4fcd078 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index 4565844daa..4565844daa 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt
index 4c15559912..4c15559912 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadTileService.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 71067c44d7..71067c44d7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
index 768b00e1b5..768b00e1b5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AppVersionInfoCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AppVersionInfoCache.kt
index 0c95293ae7..0c95293ae7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AppVersionInfoCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AppVersionInfoCache.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AuthTokenCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AuthTokenCache.kt
index 1ea2acec39..1ea2acec39 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AuthTokenCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AuthTokenCache.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt
index 94cc9f05b8..94cc9f05b8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ConnectionProxy.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt
index 7c22cef50c..7c22cef50c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/KeyStatusListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/KeyStatusListener.kt
index 70ac7ef827..70ac7ef827 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/KeyStatusListener.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/KeyStatusListener.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/LocationInfoCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/LocationInfoCache.kt
index df769abad9..df769abad9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/LocationInfoCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/LocationInfoCache.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
index a65c313f54..a65c313f54 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/RelayListListener.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
index 0a0c41b42e..0a0c41b42e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/ServiceEndpoint.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt
index c903fc9e37..c903fc9e37 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SettingsListener.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt
index d6455ea9a3..d6455ea9a3 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VoucherRedeemer.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VoucherRedeemer.kt
index 6b83b0d333..6b83b0d333 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VoucherRedeemer.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VoucherRedeemer.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt
index 9602ec7a3b..9602ec7a3b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/VpnPermission.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt
index 049dd68d0a..049dd68d0a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/AccountExpiryNotification.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt
index e251e5b4de..e251e5b4de 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt
index 10f929ab97..10f929ab97 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotification.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotificationAction.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotificationAction.kt
index 714264efbf..714264efbf 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotificationAction.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/TunnelStateNotificationAction.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/persistence/SplitTunnelingPersistence.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/persistence/SplitTunnelingPersistence.kt
index 425aec8836..425aec8836 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/persistence/SplitTunnelingPersistence.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/persistence/SplitTunnelingPersistence.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
index 2b8d9341cf..2b8d9341cf 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
index 33fbd295ea..33fbd295ea 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/BlockingController.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/BlockingController.kt
index a98394001e..a98394001e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/BlockingController.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/BlockingController.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt
index dcde70b923..dcde70b923 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/CollapsibleTitleController.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
index ef2aa1667b..ef2aa1667b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmDnsDialogFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt
index 8271e8141d..8271e8141d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt
index 7fbc0875f5..7fbc0875f5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectActionButton.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
index 6f701c9ba7..6f701c9ba7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt
index d2b413f1d0..d2b413f1d0 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt
index c6ce330128..c6ce330128 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt
index 4fcde0e314..4fcde0e314 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemListener.kt
index 72cc32196c..72cc32196c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemListener.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemListener.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemsAdapter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemsAdapter.kt
index 1e39d45235..1e39d45235 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemsAdapter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemsAdapter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt
index d5bbba1915..d5bbba1915 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
index 399490f04b..399490f04b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginState.kt
index cece178267..cece178267 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginState.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index dfc541d8d5..dfc541d8d5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NavigationBarPainter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/NavigationBarPainter.kt
index 1047793f6f..1047793f6f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NavigationBarPainter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/NavigationBarPainter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
index 1de849529e..1de849529e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt
index b3e85a94cc..b3e85a94cc 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt
index d97e3a9ac9..d97e3a9ac9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ProblemReportFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
index a25ac6a1d8..a25ac6a1d8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/RedeemVoucherDialogFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
index 73d5e9d3f5..73d5e9d3f5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt
index 5788c60ad8..5788c60ad8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceAwareFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
index 114b465391..114b465391 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index 7204c1084c..7204c1084c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/StatusBarPainter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/StatusBarPainter.kt
index 48f94e17b5..48f94e17b5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/StatusBarPainter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/StatusBarPainter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SystemPainter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SystemPainter.kt
index 2f0fc32775..2f0fc32775 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SystemPainter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/SystemPainter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/UnderNotificationBannerBehavior.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/UnderNotificationBannerBehavior.kt
index 2b28f21ff1..2b28f21ff1 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/UnderNotificationBannerBehavior.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/UnderNotificationBannerBehavior.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt
index 994f432a80..994f432a80 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/ViewLogsFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
index 9aadce014b..9aadce014b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
index 4e5601c2c3..4e5601c2c3 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt
index c83c47e7cd..c83c47e7cd 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/activities/TVActivity.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt
index 1d0f940d4b..1d0f940d4b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/AddCustomDnsServerHolder.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt
index 1ab1429b49..1ab1429b49 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsFooterHolder.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsFooterHolder.kt
index d09beffbce..d09beffbce 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsFooterHolder.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsFooterHolder.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsItemHolder.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsItemHolder.kt
index cfaf9399cc..cfaf9399cc 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsItemHolder.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsItemHolder.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt
index 49efad9310..49efad9310 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt
index 5e62f47209..5e62f47209 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/BaseFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/BaseFragment.kt
index 17bcc740a5..17bcc740a5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/BaseFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/BaseFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragment.kt
index 494753845f..494753845f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/SplitTunnelingFragment.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ActionListItemView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ActionListItemView.kt
index 69581c245f..69581c245f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ActionListItemView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ActionListItemView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ApplicationListItemView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ApplicationListItemView.kt
index 798d812802..798d812802 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ApplicationListItemView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ApplicationListItemView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/DividerGroupListItemView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/DividerGroupListItemView.kt
index 61bb5bf400..61bb5bf400 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/DividerGroupListItemView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/DividerGroupListItemView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ListItemView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ListItemView.kt
index d1149d1afd..d1149d1afd 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ListItemView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ListItemView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/PlainListItemView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/PlainListItemView.kt
index f472c444df..f472c444df 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/PlainListItemView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/PlainListItemView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ProgressListItemView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ProgressListItemView.kt
index 724caf0c61..724caf0c61 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ProgressListItemView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/ProgressListItemView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt
index 8f349c0548..8f349c0548 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/WidgetViewController.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/WidgetViewController.kt
index f1ec04bd1d..f1ec04bd1d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/WidgetViewController.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/WidgetViewController.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt
index b959a06607..b959a06607 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotification.kt
index aa58b0bbf5..aa58b0bbf5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotification.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt
index aada1847a9..aada1847a9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt
index 93bd4f4cb3..93bd4f4cb3 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt
index 4257f8d2a6..4257f8d2a6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrl.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt
index 6c761f47b2..6c761f47b2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/StatusLevel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/StatusLevel.kt
index 6960fd656b..6960fd656b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/StatusLevel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/StatusLevel.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt
index 8c26c5dc1e..8c26c5dc1e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt
index 8a8104290f..8a8104290f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/VersionInfoNotification.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt
index 9bf5942f4c..9bf5942f4c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountCache.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoCache.kt
index b921063c24..b921063c24 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoCache.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AuthTokenCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AuthTokenCache.kt
index 2078de671a..2078de671a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AuthTokenCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AuthTokenCache.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ConnectionProxy.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ConnectionProxy.kt
index 5b4b88ad94..5b4b88ad94 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ConnectionProxy.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ConnectionProxy.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt
index f33c2967fa..f33c2967fa 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/KeyStatusListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/KeyStatusListener.kt
index 96e7c852aa..96e7c852aa 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/KeyStatusListener.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/KeyStatusListener.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/LocationInfoCache.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/LocationInfoCache.kt
index 8eee6503c7..8eee6503c7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/LocationInfoCache.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/LocationInfoCache.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt
index 13c1c3dabe..13c1c3dabe 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/RelayListListener.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt
index 861a54a561..861a54a561 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt
index cb8fac65c4..cb8fac65c4 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SettingsListener.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SplitTunneling.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SplitTunneling.kt
index 7800661b21..7800661b21 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SplitTunneling.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/SplitTunneling.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VoucherRedeemer.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VoucherRedeemer.kt
index d2378100ea..d2378100ea 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VoucherRedeemer.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VoucherRedeemer.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VpnPermission.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VpnPermission.kt
index 30b672364d..30b672364d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VpnPermission.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/VpnPermission.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt
index c70233c8aa..c70233c8aa 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountCell.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt
index 48a05dd63e..48a05dd63e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryAdapter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryHolder.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryHolder.kt
index 4a87f4f601..4a87f4f601 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryHolder.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountHistoryHolder.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
index d2de7c4334..d2de7c4334 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountInput.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
index aa3463eb94..aa3463eb94 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLogin.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt
index e5ee732e08..e5ee732e08 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AccountLoginBorder.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt
index 978a8b1505..978a8b1505 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/BackButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/BackButton.kt
index b0833fd49d..b0833fd49d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/BackButton.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/BackButton.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt
index 307a2c65a4..307a2c65a4 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt
index 54f35fd519..54f35fd519 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CellSwitch.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CellSwitch.kt
index e3dfc81314..e3dfc81314 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CellSwitch.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CellSwitch.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
index 348c8a2530..348c8a2530 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CopyableInformationView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomItemAnimator.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomItemAnimator.kt
index ef8caf7e7c..ef8caf7e7c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomItemAnimator.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomItemAnimator.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomRecyclerView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomRecyclerView.kt
index 4684d50871..4684d50871 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomRecyclerView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CustomRecyclerView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt
index 877fcd9c66..877fcd9c66 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/HeaderBar.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
index d80506a5dd..d80506a5dd 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ListenableScrollView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ListenableScrollView.kt
index b436df903a..b436df903a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ListenableScrollView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ListenableScrollView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt
index 93daba0856..93daba0856 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/MtuCell.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt
index 1080e4e3fb..1080e4e3fb 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NavigateCell.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NotificationBanner.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NotificationBanner.kt
index bd4974be1e..bd4974be1e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NotificationBanner.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/NotificationBanner.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/RedeemVoucherButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/RedeemVoucherButton.kt
index f1e27e7b1b..f1e27e7b1b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/RedeemVoucherButton.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/RedeemVoucherButton.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SitePaymentButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SitePaymentButton.kt
index 0f377013d6..0f377013d6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SitePaymentButton.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SitePaymentButton.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt
index fb10816edc..fb10816edc 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/SwitchLocationButton.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ToggleCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ToggleCell.kt
index cde050bbc2..cde050bbc2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ToggleCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/ToggleCell.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
index 613f65524e..613f65524e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt
index 50727f74a6..50727f74a6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlCell.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/AdapterWithHeader.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/AdapterWithHeader.kt
index cbf96457ef..cbf96457ef 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/AdapterWithHeader.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/AdapterWithHeader.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangeMonitor.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangeMonitor.kt
index 398177db99..398177db99 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangeMonitor.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangeMonitor.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/Debouncer.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/Debouncer.kt
index 7afb4c508f..7afb4c508f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/Debouncer.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/Debouncer.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/DispatchingFlow.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/DispatchingFlow.kt
index af66a092ba..af66a092ba 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/DispatchingFlow.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/DispatchingFlow.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/EditTextExt.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/EditTextExt.kt
index b90201edfe..b90201edfe 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/EditTextExt.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/EditTextExt.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/ExponentialBackoff.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ExponentialBackoff.kt
index 1117b0b749..1117b0b749 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/ExponentialBackoff.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ExponentialBackoff.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt
index 588f2ecfd1..588f2ecfd1 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/HeaderOrHolder.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/HeaderOrHolder.kt
index 308298443a..308298443a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/HeaderOrHolder.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/HeaderOrHolder.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/Intermittent.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/Intermittent.kt
index 864667700c..864667700c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/Intermittent.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/Intermittent.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/JobTracker.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/JobTracker.kt
index 0b950d9a55..0b950d9a55 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/JobTracker.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/JobTracker.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt
index 750780aa6a..750780aa6a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/ListenableScrollableView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ListenableScrollableView.kt
index 61deecacb2..61deecacb2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/ListenableScrollableView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ListenableScrollableView.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt
index 9154f102ef..9154f102ef 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedInputFormatter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedTextFormatter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedTextFormatter.kt
index 8e08f3c742..8e08f3c742 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedTextFormatter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SegmentedTextFormatter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SmartDeferred.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SmartDeferred.kt
index 61050bc894..61050bc894 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/SmartDeferred.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/SmartDeferred.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeAgoFormatter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeAgoFormatter.kt
index 1136a21814..1136a21814 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeAgoFormatter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeAgoFormatter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeLeftFormatter.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeLeftFormatter.kt
index c3a6aaa1cb..c3a6aaa1cb 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeLeftFormatter.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/TimeLeftFormatter.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/ViewKtx.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ViewKtx.kt
index fb4a4c65b6..fb4a4c65b6 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/ViewKtx.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ViewKtx.kt
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt
index 71db6686ca..71db6686ca 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt b/android/app/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
index 51ed63bd0a..51ed63bd0a 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/ConnectivityListener.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt b/android/app/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
index 150382bb1a..150382bb1a 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/CreateTunResult.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/app/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index 0dd94749c5..0dd94749c5 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt b/android/app/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt
index 8937bd0122..8937bd0122 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt b/android/app/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt
index 5efb1bcb1c..5efb1bcb1c 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/net/TransportProtocol.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt b/android/app/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt
index db9c2c4391..db9c2c4391 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt b/android/app/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt
index f5c5811c67..f5c5811c67 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/net/wireguard/TunnelOptions.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt b/android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt
index a8490b48bf..a8490b48bf 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt b/android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt
index 761462013e..761462013e 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt b/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt
index 365ac0811b..365ac0811b 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ActionAfterDisconnect.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt b/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt
index 2c5ba00bf5..2c5ba00bf5 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorState.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt b/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt
index f5b79bdfd5..f5b79bdfd5 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt b/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt
index 51fa8ac461..51fa8ac461 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt b/android/app/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt
index 444dd54f42..444dd54f42 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/util/EventNotifier.kt
diff --git a/android/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt b/android/app/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt
index d310deb884..d310deb884 100644
--- a/android/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt
+++ b/android/app/src/main/kotlin/net/mullvad/talpid/util/InetAddressExt.kt
diff --git a/android/src/main/play/contact-email.txt b/android/app/src/main/play/contact-email.txt
index 001a8c0cf1..001a8c0cf1 100644
--- a/android/src/main/play/contact-email.txt
+++ b/android/app/src/main/play/contact-email.txt
diff --git a/android/src/main/play/contact-website.txt b/android/app/src/main/play/contact-website.txt
index 08ee598e0f..08ee598e0f 100644
--- a/android/src/main/play/contact-website.txt
+++ b/android/app/src/main/play/contact-website.txt
diff --git a/android/src/main/play/default-language.txt b/android/app/src/main/play/default-language.txt
index beb9970be0..beb9970be0 100644
--- a/android/src/main/play/default-language.txt
+++ b/android/app/src/main/play/default-language.txt
diff --git a/android/src/main/play/listings/en-US/full-description.txt b/android/app/src/main/play/listings/en-US/full-description.txt
index 63b51cf557..63b51cf557 100644
--- a/android/src/main/play/listings/en-US/full-description.txt
+++ b/android/app/src/main/play/listings/en-US/full-description.txt
diff --git a/android/src/main/play/listings/en-US/graphics/feature-graphic/Android-feature-graphics.png b/android/app/src/main/play/listings/en-US/graphics/feature-graphic/Android-feature-graphics.png
index 14504d0f5a..14504d0f5a 100644
--- a/android/src/main/play/listings/en-US/graphics/feature-graphic/Android-feature-graphics.png
+++ b/android/app/src/main/play/listings/en-US/graphics/feature-graphic/Android-feature-graphics.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/icon/icon.png b/android/app/src/main/play/listings/en-US/graphics/icon/icon.png
index 23a1bb5fe3..23a1bb5fe3 100644
--- a/android/src/main/play/listings/en-US/graphics/icon/icon.png
+++ b/android/app/src/main/play/listings/en-US/graphics/icon/icon.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.png b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.png
index 77e1011acd..77e1011acd 100644
--- a/android/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.png
+++ b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/01_connect.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.png b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.png
index 66112856cf..66112856cf 100644
--- a/android/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.png
+++ b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/02_settings.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.png b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.png
index 3b39482ad1..3b39482ad1 100644
--- a/android/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.png
+++ b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/03_wireguard_key.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.png b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.png
index 4f01b14a20..4f01b14a20 100644
--- a/android/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.png
+++ b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/04_report_a_problem.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.png b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.png
index 85272d086a..85272d086a 100644
--- a/android/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.png
+++ b/android/app/src/main/play/listings/en-US/graphics/phone-screenshots/05_login.png
Binary files differ
diff --git a/android/src/main/play/listings/en-US/short-description.txt b/android/app/src/main/play/listings/en-US/short-description.txt
index 69cbdafac8..69cbdafac8 100644
--- a/android/src/main/play/listings/en-US/short-description.txt
+++ b/android/app/src/main/play/listings/en-US/short-description.txt
diff --git a/android/src/main/play/listings/en-US/title.txt b/android/app/src/main/play/listings/en-US/title.txt
index ece3daab0a..ece3daab0a 100644
--- a/android/src/main/play/listings/en-US/title.txt
+++ b/android/app/src/main/play/listings/en-US/title.txt
diff --git a/android/src/main/play/release-notes/en-US/default.txt b/android/app/src/main/play/release-notes/en-US/default.txt
index 528895e331..528895e331 100644
--- a/android/src/main/play/release-notes/en-US/default.txt
+++ b/android/app/src/main/play/release-notes/en-US/default.txt
diff --git a/android/src/main/res/anim/do_nothing.xml b/android/app/src/main/res/anim/do_nothing.xml
index 8cb6866d6d..8cb6866d6d 100644
--- a/android/src/main/res/anim/do_nothing.xml
+++ b/android/app/src/main/res/anim/do_nothing.xml
diff --git a/android/src/main/res/anim/fade_in.xml b/android/app/src/main/res/anim/fade_in.xml
index d9b78f9197..d9b78f9197 100644
--- a/android/src/main/res/anim/fade_in.xml
+++ b/android/app/src/main/res/anim/fade_in.xml
diff --git a/android/src/main/res/anim/fade_out.xml b/android/app/src/main/res/anim/fade_out.xml
index 7c164cb338..7c164cb338 100644
--- a/android/src/main/res/anim/fade_out.xml
+++ b/android/app/src/main/res/anim/fade_out.xml
diff --git a/android/src/main/res/anim/fragment_enter_from_bottom.xml b/android/app/src/main/res/anim/fragment_enter_from_bottom.xml
index 337392e881..337392e881 100644
--- a/android/src/main/res/anim/fragment_enter_from_bottom.xml
+++ b/android/app/src/main/res/anim/fragment_enter_from_bottom.xml
diff --git a/android/src/main/res/anim/fragment_enter_from_right.xml b/android/app/src/main/res/anim/fragment_enter_from_right.xml
index 5ba3b5c3f8..5ba3b5c3f8 100644
--- a/android/src/main/res/anim/fragment_enter_from_right.xml
+++ b/android/app/src/main/res/anim/fragment_enter_from_right.xml
diff --git a/android/src/main/res/anim/fragment_exit_to_bottom.xml b/android/app/src/main/res/anim/fragment_exit_to_bottom.xml
index dc1261114a..dc1261114a 100644
--- a/android/src/main/res/anim/fragment_exit_to_bottom.xml
+++ b/android/app/src/main/res/anim/fragment_exit_to_bottom.xml
diff --git a/android/src/main/res/anim/fragment_exit_to_right.xml b/android/app/src/main/res/anim/fragment_exit_to_right.xml
index d794200982..d794200982 100644
--- a/android/src/main/res/anim/fragment_exit_to_right.xml
+++ b/android/app/src/main/res/anim/fragment_exit_to_right.xml
diff --git a/android/src/main/res/anim/fragment_half_enter_from_left.xml b/android/app/src/main/res/anim/fragment_half_enter_from_left.xml
index 67e7b7364e..67e7b7364e 100644
--- a/android/src/main/res/anim/fragment_half_enter_from_left.xml
+++ b/android/app/src/main/res/anim/fragment_half_enter_from_left.xml
diff --git a/android/src/main/res/anim/fragment_half_exit_to_left.xml b/android/app/src/main/res/anim/fragment_half_exit_to_left.xml
index bfac81df2e..bfac81df2e 100644
--- a/android/src/main/res/anim/fragment_half_exit_to_left.xml
+++ b/android/app/src/main/res/anim/fragment_half_exit_to_left.xml
diff --git a/android/src/main/res/color/switch_thumb_fill_selector.xml b/android/app/src/main/res/color/switch_thumb_fill_selector.xml
index b294ee1038..b294ee1038 100644
--- a/android/src/main/res/color/switch_thumb_fill_selector.xml
+++ b/android/app/src/main/res/color/switch_thumb_fill_selector.xml
diff --git a/android/src/main/res/drawable-hdpi/launch_logo.png b/android/app/src/main/res/drawable-hdpi/launch_logo.png
index 4b9b739061..4b9b739061 100644
--- a/android/src/main/res/drawable-hdpi/launch_logo.png
+++ b/android/app/src/main/res/drawable-hdpi/launch_logo.png
Binary files differ
diff --git a/android/src/main/res/drawable-hdpi/logo_icon.png b/android/app/src/main/res/drawable-hdpi/logo_icon.png
index fef2b8ce1f..fef2b8ce1f 100644
--- a/android/src/main/res/drawable-hdpi/logo_icon.png
+++ b/android/app/src/main/res/drawable-hdpi/logo_icon.png
Binary files differ
diff --git a/android/src/main/res/drawable-hdpi/small_logo_black.png b/android/app/src/main/res/drawable-hdpi/small_logo_black.png
index f335f411f8..f335f411f8 100644
--- a/android/src/main/res/drawable-hdpi/small_logo_black.png
+++ b/android/app/src/main/res/drawable-hdpi/small_logo_black.png
Binary files differ
diff --git a/android/src/main/res/drawable-hdpi/small_logo_white.png b/android/app/src/main/res/drawable-hdpi/small_logo_white.png
index b975e81ede..b975e81ede 100644
--- a/android/src/main/res/drawable-hdpi/small_logo_white.png
+++ b/android/app/src/main/res/drawable-hdpi/small_logo_white.png
Binary files differ
diff --git a/android/src/main/res/drawable-mdpi/launch_logo.png b/android/app/src/main/res/drawable-mdpi/launch_logo.png
index bb9d166f6c..bb9d166f6c 100644
--- a/android/src/main/res/drawable-mdpi/launch_logo.png
+++ b/android/app/src/main/res/drawable-mdpi/launch_logo.png
Binary files differ
diff --git a/android/src/main/res/drawable-mdpi/logo_icon.png b/android/app/src/main/res/drawable-mdpi/logo_icon.png
index 08f807d7a3..08f807d7a3 100644
--- a/android/src/main/res/drawable-mdpi/logo_icon.png
+++ b/android/app/src/main/res/drawable-mdpi/logo_icon.png
Binary files differ
diff --git a/android/src/main/res/drawable-mdpi/small_logo_black.png b/android/app/src/main/res/drawable-mdpi/small_logo_black.png
index 0613f65cc6..0613f65cc6 100644
--- a/android/src/main/res/drawable-mdpi/small_logo_black.png
+++ b/android/app/src/main/res/drawable-mdpi/small_logo_black.png
Binary files differ
diff --git a/android/src/main/res/drawable-mdpi/small_logo_white.png b/android/app/src/main/res/drawable-mdpi/small_logo_white.png
index 4d05b81186..4d05b81186 100644
--- a/android/src/main/res/drawable-mdpi/small_logo_white.png
+++ b/android/app/src/main/res/drawable-mdpi/small_logo_white.png
Binary files differ
diff --git a/android/src/main/res/drawable-xhdpi/banner.png b/android/app/src/main/res/drawable-xhdpi/banner.png
index da8eee678d..da8eee678d 100644
--- a/android/src/main/res/drawable-xhdpi/banner.png
+++ b/android/app/src/main/res/drawable-xhdpi/banner.png
Binary files differ
diff --git a/android/src/main/res/drawable-xhdpi/launch_logo.png b/android/app/src/main/res/drawable-xhdpi/launch_logo.png
index 876cb32f32..876cb32f32 100644
--- a/android/src/main/res/drawable-xhdpi/launch_logo.png
+++ b/android/app/src/main/res/drawable-xhdpi/launch_logo.png
Binary files differ
diff --git a/android/src/main/res/drawable-xhdpi/logo_icon.png b/android/app/src/main/res/drawable-xhdpi/logo_icon.png
index 28ed381da3..28ed381da3 100644
--- a/android/src/main/res/drawable-xhdpi/logo_icon.png
+++ b/android/app/src/main/res/drawable-xhdpi/logo_icon.png
Binary files differ
diff --git a/android/src/main/res/drawable-xhdpi/small_logo_black.png b/android/app/src/main/res/drawable-xhdpi/small_logo_black.png
index fd681d9c6a..fd681d9c6a 100644
--- a/android/src/main/res/drawable-xhdpi/small_logo_black.png
+++ b/android/app/src/main/res/drawable-xhdpi/small_logo_black.png
Binary files differ
diff --git a/android/src/main/res/drawable-xhdpi/small_logo_white.png b/android/app/src/main/res/drawable-xhdpi/small_logo_white.png
index b40c5b59dd..b40c5b59dd 100644
--- a/android/src/main/res/drawable-xhdpi/small_logo_white.png
+++ b/android/app/src/main/res/drawable-xhdpi/small_logo_white.png
Binary files differ
diff --git a/android/src/main/res/drawable-xxhdpi/launch_logo.png b/android/app/src/main/res/drawable-xxhdpi/launch_logo.png
index 3ea8cbe15a..3ea8cbe15a 100644
--- a/android/src/main/res/drawable-xxhdpi/launch_logo.png
+++ b/android/app/src/main/res/drawable-xxhdpi/launch_logo.png
Binary files differ
diff --git a/android/src/main/res/drawable-xxhdpi/logo_icon.png b/android/app/src/main/res/drawable-xxhdpi/logo_icon.png
index 0be79bef01..0be79bef01 100644
--- a/android/src/main/res/drawable-xxhdpi/logo_icon.png
+++ b/android/app/src/main/res/drawable-xxhdpi/logo_icon.png
Binary files differ
diff --git a/android/src/main/res/drawable-xxhdpi/small_logo_black.png b/android/app/src/main/res/drawable-xxhdpi/small_logo_black.png
index b012f609ec..b012f609ec 100644
--- a/android/src/main/res/drawable-xxhdpi/small_logo_black.png
+++ b/android/app/src/main/res/drawable-xxhdpi/small_logo_black.png
Binary files differ
diff --git a/android/src/main/res/drawable-xxhdpi/small_logo_white.png b/android/app/src/main/res/drawable-xxhdpi/small_logo_white.png
index 79c8003c09..79c8003c09 100644
--- a/android/src/main/res/drawable-xxhdpi/small_logo_white.png
+++ b/android/app/src/main/res/drawable-xxhdpi/small_logo_white.png
Binary files differ
diff --git a/android/src/main/res/drawable-xxxhdpi/launch_logo.png b/android/app/src/main/res/drawable-xxxhdpi/launch_logo.png
index 7d3ec88895..7d3ec88895 100644
--- a/android/src/main/res/drawable-xxxhdpi/launch_logo.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/launch_logo.png
Binary files differ
diff --git a/android/src/main/res/drawable-xxxhdpi/logo_icon.png b/android/app/src/main/res/drawable-xxxhdpi/logo_icon.png
index eb7a150208..eb7a150208 100644
--- a/android/src/main/res/drawable-xxxhdpi/logo_icon.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/logo_icon.png
Binary files differ
diff --git a/android/src/main/res/drawable-xxxhdpi/small_logo_black.png b/android/app/src/main/res/drawable-xxxhdpi/small_logo_black.png
index a2d59c953b..a2d59c953b 100644
--- a/android/src/main/res/drawable-xxxhdpi/small_logo_black.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/small_logo_black.png
Binary files differ
diff --git a/android/src/main/res/drawable-xxxhdpi/small_logo_white.png b/android/app/src/main/res/drawable-xxxhdpi/small_logo_white.png
index 89c5de1385..89c5de1385 100644
--- a/android/src/main/res/drawable-xxxhdpi/small_logo_white.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/small_logo_white.png
Binary files differ
diff --git a/android/src/main/res/drawable/account_history_entry_background.xml b/android/app/src/main/res/drawable/account_history_entry_background.xml
index ea25d2b72a..ea25d2b72a 100644
--- a/android/src/main/res/drawable/account_history_entry_background.xml
+++ b/android/app/src/main/res/drawable/account_history_entry_background.xml
diff --git a/android/src/main/res/drawable/account_history_remove.xml b/android/app/src/main/res/drawable/account_history_remove.xml
index 6c7f52fcba..6c7f52fcba 100644
--- a/android/src/main/res/drawable/account_history_remove.xml
+++ b/android/app/src/main/res/drawable/account_history_remove.xml
diff --git a/android/src/main/res/drawable/account_history_remove_normal.xml b/android/app/src/main/res/drawable/account_history_remove_normal.xml
index 532d6cd9d7..532d6cd9d7 100644
--- a/android/src/main/res/drawable/account_history_remove_normal.xml
+++ b/android/app/src/main/res/drawable/account_history_remove_normal.xml
diff --git a/android/src/main/res/drawable/account_history_remove_pressed.xml b/android/app/src/main/res/drawable/account_history_remove_pressed.xml
index 49d3484460..49d3484460 100644
--- a/android/src/main/res/drawable/account_history_remove_pressed.xml
+++ b/android/app/src/main/res/drawable/account_history_remove_pressed.xml
diff --git a/android/src/main/res/drawable/account_input_background.xml b/android/app/src/main/res/drawable/account_input_background.xml
index d31775f404..d31775f404 100644
--- a/android/src/main/res/drawable/account_input_background.xml
+++ b/android/app/src/main/res/drawable/account_input_background.xml
diff --git a/android/src/main/res/drawable/account_login_border.xml b/android/app/src/main/res/drawable/account_login_border.xml
index 7aa3362f35..7aa3362f35 100644
--- a/android/src/main/res/drawable/account_login_border.xml
+++ b/android/app/src/main/res/drawable/account_login_border.xml
diff --git a/android/src/main/res/drawable/account_login_border_error.xml b/android/app/src/main/res/drawable/account_login_border_error.xml
index 7b0b225c85..7b0b225c85 100644
--- a/android/src/main/res/drawable/account_login_border_error.xml
+++ b/android/app/src/main/res/drawable/account_login_border_error.xml
diff --git a/android/src/main/res/drawable/account_login_border_focused.xml b/android/app/src/main/res/drawable/account_login_border_focused.xml
index fa32039e1d..fa32039e1d 100644
--- a/android/src/main/res/drawable/account_login_border_focused.xml
+++ b/android/app/src/main/res/drawable/account_login_border_focused.xml
diff --git a/android/src/main/res/drawable/account_login_corner.xml b/android/app/src/main/res/drawable/account_login_corner.xml
index e4640e498d..e4640e498d 100644
--- a/android/src/main/res/drawable/account_login_corner.xml
+++ b/android/app/src/main/res/drawable/account_login_corner.xml
diff --git a/android/src/main/res/drawable/account_login_corner_error.xml b/android/app/src/main/res/drawable/account_login_corner_error.xml
index c19e1be609..c19e1be609 100644
--- a/android/src/main/res/drawable/account_login_corner_error.xml
+++ b/android/app/src/main/res/drawable/account_login_corner_error.xml
diff --git a/android/src/main/res/drawable/account_login_corner_focused.xml b/android/app/src/main/res/drawable/account_login_corner_focused.xml
index a02110b51d..a02110b51d 100644
--- a/android/src/main/res/drawable/account_login_corner_focused.xml
+++ b/android/app/src/main/res/drawable/account_login_corner_focused.xml
diff --git a/android/src/main/res/drawable/app_list_item_background.xml b/android/app/src/main/res/drawable/app_list_item_background.xml
index a55c1e6d01..a55c1e6d01 100644
--- a/android/src/main/res/drawable/app_list_item_background.xml
+++ b/android/app/src/main/res/drawable/app_list_item_background.xml
diff --git a/android/src/main/res/drawable/blue_button_background.xml b/android/app/src/main/res/drawable/blue_button_background.xml
index e87b080bee..e87b080bee 100644
--- a/android/src/main/res/drawable/blue_button_background.xml
+++ b/android/app/src/main/res/drawable/blue_button_background.xml
diff --git a/android/src/main/res/drawable/cell_button_background.xml b/android/app/src/main/res/drawable/cell_button_background.xml
index 857a8386e1..857a8386e1 100644
--- a/android/src/main/res/drawable/cell_button_background.xml
+++ b/android/app/src/main/res/drawable/cell_button_background.xml
diff --git a/android/src/main/res/drawable/cell_input_background.xml b/android/app/src/main/res/drawable/cell_input_background.xml
index 436b3adb6e..436b3adb6e 100644
--- a/android/src/main/res/drawable/cell_input_background.xml
+++ b/android/app/src/main/res/drawable/cell_input_background.xml
diff --git a/android/src/main/res/drawable/cell_input_cursor.xml b/android/app/src/main/res/drawable/cell_input_cursor.xml
index 781c1d9b87..781c1d9b87 100644
--- a/android/src/main/res/drawable/cell_input_cursor.xml
+++ b/android/app/src/main/res/drawable/cell_input_cursor.xml
diff --git a/android/src/main/res/drawable/cell_switch_background.xml b/android/app/src/main/res/drawable/cell_switch_background.xml
index c7b44ce746..c7b44ce746 100644
--- a/android/src/main/res/drawable/cell_switch_background.xml
+++ b/android/app/src/main/res/drawable/cell_switch_background.xml
diff --git a/android/src/main/res/drawable/dialog_background.xml b/android/app/src/main/res/drawable/dialog_background.xml
index a552adc351..a552adc351 100644
--- a/android/src/main/res/drawable/dialog_background.xml
+++ b/android/app/src/main/res/drawable/dialog_background.xml
diff --git a/android/src/main/res/drawable/edit_text_background.xml b/android/app/src/main/res/drawable/edit_text_background.xml
index 06252ac37c..06252ac37c 100644
--- a/android/src/main/res/drawable/edit_text_background.xml
+++ b/android/app/src/main/res/drawable/edit_text_background.xml
diff --git a/android/src/main/res/drawable/green_button_background.xml b/android/app/src/main/res/drawable/green_button_background.xml
index b2a50d5678..b2a50d5678 100644
--- a/android/src/main/res/drawable/green_button_background.xml
+++ b/android/app/src/main/res/drawable/green_button_background.xml
diff --git a/android/src/main/res/drawable/ic_icons_add.xml b/android/app/src/main/res/drawable/ic_icons_add.xml
index 97f0ca7fc7..97f0ca7fc7 100644
--- a/android/src/main/res/drawable/ic_icons_add.xml
+++ b/android/app/src/main/res/drawable/ic_icons_add.xml
diff --git a/android/src/main/res/drawable/ic_icons_missing.xml b/android/app/src/main/res/drawable/ic_icons_missing.xml
index 726a5c7f74..726a5c7f74 100644
--- a/android/src/main/res/drawable/ic_icons_missing.xml
+++ b/android/app/src/main/res/drawable/ic_icons_missing.xml
diff --git a/android/src/main/res/drawable/ic_icons_remove.xml b/android/app/src/main/res/drawable/ic_icons_remove.xml
index 50b84ad42c..50b84ad42c 100644
--- a/android/src/main/res/drawable/ic_icons_remove.xml
+++ b/android/app/src/main/res/drawable/ic_icons_remove.xml
diff --git a/android/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
index a776994b25..a776994b25 100644
--- a/android/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/android/src/main/res/drawable/icon_add.xml b/android/app/src/main/res/drawable/icon_add.xml
index f44a660a95..f44a660a95 100644
--- a/android/src/main/res/drawable/icon_add.xml
+++ b/android/app/src/main/res/drawable/icon_add.xml
diff --git a/android/src/main/res/drawable/icon_alert.xml b/android/app/src/main/res/drawable/icon_alert.xml
index f8e4a2c0b0..f8e4a2c0b0 100644
--- a/android/src/main/res/drawable/icon_alert.xml
+++ b/android/app/src/main/res/drawable/icon_alert.xml
diff --git a/android/src/main/res/drawable/icon_arrow_blue20.xml b/android/app/src/main/res/drawable/icon_arrow_blue20.xml
index 1fc5f8c1a1..1fc5f8c1a1 100644
--- a/android/src/main/res/drawable/icon_arrow_blue20.xml
+++ b/android/app/src/main/res/drawable/icon_arrow_blue20.xml
diff --git a/android/src/main/res/drawable/icon_arrow_white.xml b/android/app/src/main/res/drawable/icon_arrow_white.xml
index 8b0a0e5f20..8b0a0e5f20 100644
--- a/android/src/main/res/drawable/icon_arrow_white.xml
+++ b/android/app/src/main/res/drawable/icon_arrow_white.xml
diff --git a/android/src/main/res/drawable/icon_back.xml b/android/app/src/main/res/drawable/icon_back.xml
index 7b5534c928..7b5534c928 100644
--- a/android/src/main/res/drawable/icon_back.xml
+++ b/android/app/src/main/res/drawable/icon_back.xml
diff --git a/android/src/main/res/drawable/icon_chevron.xml b/android/app/src/main/res/drawable/icon_chevron.xml
index 8c0fc11d10..8c0fc11d10 100644
--- a/android/src/main/res/drawable/icon_chevron.xml
+++ b/android/app/src/main/res/drawable/icon_chevron.xml
diff --git a/android/src/main/res/drawable/icon_chevron_expand.xml b/android/app/src/main/res/drawable/icon_chevron_expand.xml
index f85e172a00..f85e172a00 100644
--- a/android/src/main/res/drawable/icon_chevron_expand.xml
+++ b/android/app/src/main/res/drawable/icon_chevron_expand.xml
diff --git a/android/src/main/res/drawable/icon_close.xml b/android/app/src/main/res/drawable/icon_close.xml
index 7de0a4ac04..7de0a4ac04 100644
--- a/android/src/main/res/drawable/icon_close.xml
+++ b/android/app/src/main/res/drawable/icon_close.xml
diff --git a/android/src/main/res/drawable/icon_extlink.xml b/android/app/src/main/res/drawable/icon_extlink.xml
index 3d31a523b2..3d31a523b2 100644
--- a/android/src/main/res/drawable/icon_extlink.xml
+++ b/android/app/src/main/res/drawable/icon_extlink.xml
diff --git a/android/src/main/res/drawable/icon_fail.xml b/android/app/src/main/res/drawable/icon_fail.xml
index b3bb63843b..b3bb63843b 100644
--- a/android/src/main/res/drawable/icon_fail.xml
+++ b/android/app/src/main/res/drawable/icon_fail.xml
diff --git a/android/src/main/res/drawable/icon_notification_connect.xml b/android/app/src/main/res/drawable/icon_notification_connect.xml
index 85f7bc9da0..85f7bc9da0 100644
--- a/android/src/main/res/drawable/icon_notification_connect.xml
+++ b/android/app/src/main/res/drawable/icon_notification_connect.xml
diff --git a/android/src/main/res/drawable/icon_notification_disconnect.xml b/android/app/src/main/res/drawable/icon_notification_disconnect.xml
index e90330cdaf..e90330cdaf 100644
--- a/android/src/main/res/drawable/icon_notification_disconnect.xml
+++ b/android/app/src/main/res/drawable/icon_notification_disconnect.xml
diff --git a/android/src/main/res/drawable/icon_notification_error.xml b/android/app/src/main/res/drawable/icon_notification_error.xml
index 7574392129..7574392129 100644
--- a/android/src/main/res/drawable/icon_notification_error.xml
+++ b/android/app/src/main/res/drawable/icon_notification_error.xml
diff --git a/android/src/main/res/drawable/icon_notification_warning.xml b/android/app/src/main/res/drawable/icon_notification_warning.xml
index c6baa04c1c..c6baa04c1c 100644
--- a/android/src/main/res/drawable/icon_notification_warning.xml
+++ b/android/app/src/main/res/drawable/icon_notification_warning.xml
diff --git a/android/src/main/res/drawable/icon_relay_active.xml b/android/app/src/main/res/drawable/icon_relay_active.xml
index 68b77b0641..68b77b0641 100644
--- a/android/src/main/res/drawable/icon_relay_active.xml
+++ b/android/app/src/main/res/drawable/icon_relay_active.xml
diff --git a/android/src/main/res/drawable/icon_relay_inactive.xml b/android/app/src/main/res/drawable/icon_relay_inactive.xml
index d01dc83f11..d01dc83f11 100644
--- a/android/src/main/res/drawable/icon_relay_inactive.xml
+++ b/android/app/src/main/res/drawable/icon_relay_inactive.xml
diff --git a/android/src/main/res/drawable/icon_reload.xml b/android/app/src/main/res/drawable/icon_reload.xml
index 0800d557ff..0800d557ff 100644
--- a/android/src/main/res/drawable/icon_reload.xml
+++ b/android/app/src/main/res/drawable/icon_reload.xml
diff --git a/android/src/main/res/drawable/icon_settings.xml b/android/app/src/main/res/drawable/icon_settings.xml
index 3d670e5124..3d670e5124 100644
--- a/android/src/main/res/drawable/icon_settings.xml
+++ b/android/app/src/main/res/drawable/icon_settings.xml
diff --git a/android/src/main/res/drawable/icon_spinner.xml b/android/app/src/main/res/drawable/icon_spinner.xml
index 2475c4ef3c..2475c4ef3c 100644
--- a/android/src/main/res/drawable/icon_spinner.xml
+++ b/android/app/src/main/res/drawable/icon_spinner.xml
diff --git a/android/src/main/res/drawable/icon_success.xml b/android/app/src/main/res/drawable/icon_success.xml
index 4f5fdaae34..4f5fdaae34 100644
--- a/android/src/main/res/drawable/icon_success.xml
+++ b/android/app/src/main/res/drawable/icon_success.xml
diff --git a/android/src/main/res/drawable/icon_tick.xml b/android/app/src/main/res/drawable/icon_tick.xml
index 8185727a1c..8185727a1c 100644
--- a/android/src/main/res/drawable/icon_tick.xml
+++ b/android/app/src/main/res/drawable/icon_tick.xml
diff --git a/android/src/main/res/drawable/icon_tick_green.xml b/android/app/src/main/res/drawable/icon_tick_green.xml
index a761a863ba..a761a863ba 100644
--- a/android/src/main/res/drawable/icon_tick_green.xml
+++ b/android/app/src/main/res/drawable/icon_tick_green.xml
diff --git a/android/src/main/res/drawable/input_text_background.xml b/android/app/src/main/res/drawable/input_text_background.xml
index d4b4b3c595..d4b4b3c595 100644
--- a/android/src/main/res/drawable/input_text_background.xml
+++ b/android/app/src/main/res/drawable/input_text_background.xml
diff --git a/android/src/main/res/drawable/login_button_arrow.xml b/android/app/src/main/res/drawable/login_button_arrow.xml
index 1909b78fe7..1909b78fe7 100644
--- a/android/src/main/res/drawable/login_button_arrow.xml
+++ b/android/app/src/main/res/drawable/login_button_arrow.xml
diff --git a/android/src/main/res/drawable/login_button_background.xml b/android/app/src/main/res/drawable/login_button_background.xml
index c1041ef523..c1041ef523 100644
--- a/android/src/main/res/drawable/login_button_background.xml
+++ b/android/app/src/main/res/drawable/login_button_background.xml
diff --git a/android/src/main/res/drawable/red_button_background.xml b/android/app/src/main/res/drawable/red_button_background.xml
index e41121638f..e41121638f 100644
--- a/android/src/main/res/drawable/red_button_background.xml
+++ b/android/app/src/main/res/drawable/red_button_background.xml
diff --git a/android/src/main/res/drawable/switch_thumb.xml b/android/app/src/main/res/drawable/switch_thumb.xml
index 1b32766d34..1b32766d34 100644
--- a/android/src/main/res/drawable/switch_thumb.xml
+++ b/android/app/src/main/res/drawable/switch_thumb.xml
diff --git a/android/src/main/res/drawable/switch_track.xml b/android/app/src/main/res/drawable/switch_track.xml
index eb287d3316..eb287d3316 100644
--- a/android/src/main/res/drawable/switch_track.xml
+++ b/android/app/src/main/res/drawable/switch_track.xml
diff --git a/android/src/main/res/drawable/text_input_cursor.xml b/android/app/src/main/res/drawable/text_input_cursor.xml
index 56b2895c88..56b2895c88 100644
--- a/android/src/main/res/drawable/text_input_cursor.xml
+++ b/android/app/src/main/res/drawable/text_input_cursor.xml
diff --git a/android/src/main/res/drawable/transparent_red_button_background.xml b/android/app/src/main/res/drawable/transparent_red_button_background.xml
index 84a3a77c38..84a3a77c38 100644
--- a/android/src/main/res/drawable/transparent_red_button_background.xml
+++ b/android/app/src/main/res/drawable/transparent_red_button_background.xml
diff --git a/android/src/main/res/drawable/transparent_red_left_half_button_background.xml b/android/app/src/main/res/drawable/transparent_red_left_half_button_background.xml
index dab41c1f57..dab41c1f57 100644
--- a/android/src/main/res/drawable/transparent_red_left_half_button_background.xml
+++ b/android/app/src/main/res/drawable/transparent_red_left_half_button_background.xml
diff --git a/android/src/main/res/drawable/transparent_red_right_half_button_background.xml b/android/app/src/main/res/drawable/transparent_red_right_half_button_background.xml
index f23bde9841..f23bde9841 100644
--- a/android/src/main/res/drawable/transparent_red_right_half_button_background.xml
+++ b/android/app/src/main/res/drawable/transparent_red_right_half_button_background.xml
diff --git a/android/src/main/res/drawable/white20_button_background.xml b/android/app/src/main/res/drawable/white20_button_background.xml
index f52c7cf182..f52c7cf182 100644
--- a/android/src/main/res/drawable/white20_button_background.xml
+++ b/android/app/src/main/res/drawable/white20_button_background.xml
diff --git a/android/src/main/res/layout/account.xml b/android/app/src/main/res/layout/account.xml
index 9ca5e6f75b..9ca5e6f75b 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/app/src/main/res/layout/account.xml
diff --git a/android/src/main/res/layout/account_history_entry.xml b/android/app/src/main/res/layout/account_history_entry.xml
index c31782c0bd..c31782c0bd 100644
--- a/android/src/main/res/layout/account_history_entry.xml
+++ b/android/app/src/main/res/layout/account_history_entry.xml
diff --git a/android/src/main/res/layout/account_input.xml b/android/app/src/main/res/layout/account_input.xml
index 96aa3c7c46..96aa3c7c46 100644
--- a/android/src/main/res/layout/account_input.xml
+++ b/android/app/src/main/res/layout/account_input.xml
diff --git a/android/src/main/res/layout/account_login.xml b/android/app/src/main/res/layout/account_login.xml
index 5ada635027..5ada635027 100644
--- a/android/src/main/res/layout/account_login.xml
+++ b/android/app/src/main/res/layout/account_login.xml
diff --git a/android/src/main/res/layout/account_login_border.xml b/android/app/src/main/res/layout/account_login_border.xml
index 73f17980e3..73f17980e3 100644
--- a/android/src/main/res/layout/account_login_border.xml
+++ b/android/app/src/main/res/layout/account_login_border.xml
diff --git a/android/src/main/res/layout/add_custom_dns_server.xml b/android/app/src/main/res/layout/add_custom_dns_server.xml
index 892b48a6fe..892b48a6fe 100644
--- a/android/src/main/res/layout/add_custom_dns_server.xml
+++ b/android/app/src/main/res/layout/add_custom_dns_server.xml
diff --git a/android/src/main/res/layout/advanced.xml b/android/app/src/main/res/layout/advanced.xml
index 42f94b7b7f..42f94b7b7f 100644
--- a/android/src/main/res/layout/advanced.xml
+++ b/android/app/src/main/res/layout/advanced.xml
diff --git a/android/src/main/res/layout/advanced_header.xml b/android/app/src/main/res/layout/advanced_header.xml
index eb04259b3d..eb04259b3d 100644
--- a/android/src/main/res/layout/advanced_header.xml
+++ b/android/app/src/main/res/layout/advanced_header.xml
diff --git a/android/src/main/res/layout/app_list_item.xml b/android/app/src/main/res/layout/app_list_item.xml
index eebfccf88e..eebfccf88e 100644
--- a/android/src/main/res/layout/app_list_item.xml
+++ b/android/app/src/main/res/layout/app_list_item.xml
diff --git a/android/src/main/res/layout/button.xml b/android/app/src/main/res/layout/button.xml
index 51d273af97..51d273af97 100644
--- a/android/src/main/res/layout/button.xml
+++ b/android/app/src/main/res/layout/button.xml
diff --git a/android/src/main/res/layout/collapsed_title_layout.xml b/android/app/src/main/res/layout/collapsed_title_layout.xml
index 64ad3ed2d6..64ad3ed2d6 100644
--- a/android/src/main/res/layout/collapsed_title_layout.xml
+++ b/android/app/src/main/res/layout/collapsed_title_layout.xml
diff --git a/android/src/main/res/layout/confirm_dns.xml b/android/app/src/main/res/layout/confirm_dns.xml
index 6c7266eae9..6c7266eae9 100644
--- a/android/src/main/res/layout/confirm_dns.xml
+++ b/android/app/src/main/res/layout/confirm_dns.xml
diff --git a/android/src/main/res/layout/confirm_no_email.xml b/android/app/src/main/res/layout/confirm_no_email.xml
index ff538ff28b..ff538ff28b 100644
--- a/android/src/main/res/layout/confirm_no_email.xml
+++ b/android/app/src/main/res/layout/confirm_no_email.xml
diff --git a/android/src/main/res/layout/connect.xml b/android/app/src/main/res/layout/connect.xml
index d6ac999d43..d6ac999d43 100644
--- a/android/src/main/res/layout/connect.xml
+++ b/android/app/src/main/res/layout/connect.xml
diff --git a/android/src/main/res/layout/custom_dns_footer.xml b/android/app/src/main/res/layout/custom_dns_footer.xml
index c939eebb7f..c939eebb7f 100644
--- a/android/src/main/res/layout/custom_dns_footer.xml
+++ b/android/app/src/main/res/layout/custom_dns_footer.xml
diff --git a/android/src/main/res/layout/custom_dns_server.xml b/android/app/src/main/res/layout/custom_dns_server.xml
index 54d7e9f01e..54d7e9f01e 100644
--- a/android/src/main/res/layout/custom_dns_server.xml
+++ b/android/app/src/main/res/layout/custom_dns_server.xml
diff --git a/android/src/main/res/layout/edit_custom_dns_server.xml b/android/app/src/main/res/layout/edit_custom_dns_server.xml
index 17008c0d86..17008c0d86 100644
--- a/android/src/main/res/layout/edit_custom_dns_server.xml
+++ b/android/app/src/main/res/layout/edit_custom_dns_server.xml
diff --git a/android/src/main/res/layout/header_bar.xml b/android/app/src/main/res/layout/header_bar.xml
index a5965596a3..a5965596a3 100644
--- a/android/src/main/res/layout/header_bar.xml
+++ b/android/app/src/main/res/layout/header_bar.xml
diff --git a/android/src/main/res/layout/information_view.xml b/android/app/src/main/res/layout/information_view.xml
index 7ac89aee62..7ac89aee62 100644
--- a/android/src/main/res/layout/information_view.xml
+++ b/android/app/src/main/res/layout/information_view.xml
diff --git a/android/src/main/res/layout/launch.xml b/android/app/src/main/res/layout/launch.xml
index a6ae06f1ca..a6ae06f1ca 100644
--- a/android/src/main/res/layout/launch.xml
+++ b/android/app/src/main/res/layout/launch.xml
diff --git a/android/src/main/res/layout/list_item_action.xml b/android/app/src/main/res/layout/list_item_action.xml
index 9b9fc806f0..9b9fc806f0 100644
--- a/android/src/main/res/layout/list_item_action.xml
+++ b/android/app/src/main/res/layout/list_item_action.xml
diff --git a/android/src/main/res/layout/list_item_base.xml b/android/app/src/main/res/layout/list_item_base.xml
index 0c22feef21..0c22feef21 100644
--- a/android/src/main/res/layout/list_item_base.xml
+++ b/android/app/src/main/res/layout/list_item_base.xml
diff --git a/android/src/main/res/layout/list_item_group_divider.xml b/android/app/src/main/res/layout/list_item_group_divider.xml
index 9546d55c98..9546d55c98 100644
--- a/android/src/main/res/layout/list_item_group_divider.xml
+++ b/android/app/src/main/res/layout/list_item_group_divider.xml
diff --git a/android/src/main/res/layout/list_item_plain_text.xml b/android/app/src/main/res/layout/list_item_plain_text.xml
index f17bc6ed5e..f17bc6ed5e 100644
--- a/android/src/main/res/layout/list_item_plain_text.xml
+++ b/android/app/src/main/res/layout/list_item_plain_text.xml
diff --git a/android/src/main/res/layout/list_item_progress.xml b/android/app/src/main/res/layout/list_item_progress.xml
index 221947ea85..221947ea85 100644
--- a/android/src/main/res/layout/list_item_progress.xml
+++ b/android/app/src/main/res/layout/list_item_progress.xml
diff --git a/android/src/main/res/layout/list_item_two_action.xml b/android/app/src/main/res/layout/list_item_two_action.xml
index 81e6a5c652..81e6a5c652 100644
--- a/android/src/main/res/layout/list_item_two_action.xml
+++ b/android/app/src/main/res/layout/list_item_two_action.xml
diff --git a/android/src/main/res/layout/list_item_widget_image.xml b/android/app/src/main/res/layout/list_item_widget_image.xml
index 95034e46e3..95034e46e3 100644
--- a/android/src/main/res/layout/list_item_widget_image.xml
+++ b/android/app/src/main/res/layout/list_item_widget_image.xml
diff --git a/android/src/main/res/layout/list_item_widget_switch.xml b/android/app/src/main/res/layout/list_item_widget_switch.xml
index 9c4e342660..9c4e342660 100644
--- a/android/src/main/res/layout/list_item_widget_switch.xml
+++ b/android/app/src/main/res/layout/list_item_widget_switch.xml
diff --git a/android/src/main/res/layout/login.xml b/android/app/src/main/res/layout/login.xml
index 526dab3ca1..526dab3ca1 100644
--- a/android/src/main/res/layout/login.xml
+++ b/android/app/src/main/res/layout/login.xml
diff --git a/android/src/main/res/layout/main.xml b/android/app/src/main/res/layout/main.xml
index 7839409631..7839409631 100644
--- a/android/src/main/res/layout/main.xml
+++ b/android/app/src/main/res/layout/main.xml
diff --git a/android/src/main/res/layout/missing_service.xml b/android/app/src/main/res/layout/missing_service.xml
index 9e3f21fde7..9e3f21fde7 100644
--- a/android/src/main/res/layout/missing_service.xml
+++ b/android/app/src/main/res/layout/missing_service.xml
diff --git a/android/src/main/res/layout/mtu_edit_text.xml b/android/app/src/main/res/layout/mtu_edit_text.xml
index 11334cf4c1..11334cf4c1 100644
--- a/android/src/main/res/layout/mtu_edit_text.xml
+++ b/android/app/src/main/res/layout/mtu_edit_text.xml
diff --git a/android/src/main/res/layout/notification_banner.xml b/android/app/src/main/res/layout/notification_banner.xml
index 3fb5ef4d10..3fb5ef4d10 100644
--- a/android/src/main/res/layout/notification_banner.xml
+++ b/android/app/src/main/res/layout/notification_banner.xml
diff --git a/android/src/main/res/layout/out_of_time.xml b/android/app/src/main/res/layout/out_of_time.xml
index 791b2d8a77..791b2d8a77 100644
--- a/android/src/main/res/layout/out_of_time.xml
+++ b/android/app/src/main/res/layout/out_of_time.xml
diff --git a/android/src/main/res/layout/payment_buttons.xml b/android/app/src/main/res/layout/payment_buttons.xml
index c617bb1571..c617bb1571 100644
--- a/android/src/main/res/layout/payment_buttons.xml
+++ b/android/app/src/main/res/layout/payment_buttons.xml
diff --git a/android/src/main/res/layout/preferences.xml b/android/app/src/main/res/layout/preferences.xml
index 70489f4429..70489f4429 100644
--- a/android/src/main/res/layout/preferences.xml
+++ b/android/app/src/main/res/layout/preferences.xml
diff --git a/android/src/main/res/layout/problem_report.xml b/android/app/src/main/res/layout/problem_report.xml
index 614003054a..614003054a 100644
--- a/android/src/main/res/layout/problem_report.xml
+++ b/android/app/src/main/res/layout/problem_report.xml
diff --git a/android/src/main/res/layout/redeem_voucher.xml b/android/app/src/main/res/layout/redeem_voucher.xml
index c3e081196e..c3e081196e 100644
--- a/android/src/main/res/layout/redeem_voucher.xml
+++ b/android/app/src/main/res/layout/redeem_voucher.xml
diff --git a/android/src/main/res/layout/relay_list_item.xml b/android/app/src/main/res/layout/relay_list_item.xml
index e0b084901c..e0b084901c 100644
--- a/android/src/main/res/layout/relay_list_item.xml
+++ b/android/app/src/main/res/layout/relay_list_item.xml
diff --git a/android/src/main/res/layout/select_location.xml b/android/app/src/main/res/layout/select_location.xml
index 25eebf7648..25eebf7648 100644
--- a/android/src/main/res/layout/select_location.xml
+++ b/android/app/src/main/res/layout/select_location.xml
diff --git a/android/src/main/res/layout/select_location_header.xml b/android/app/src/main/res/layout/select_location_header.xml
index bd7ede2f3c..bd7ede2f3c 100644
--- a/android/src/main/res/layout/select_location_header.xml
+++ b/android/app/src/main/res/layout/select_location_header.xml
diff --git a/android/src/main/res/layout/settings.xml b/android/app/src/main/res/layout/settings.xml
index 6e51960e88..6e51960e88 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/app/src/main/res/layout/settings.xml
diff --git a/android/src/main/res/layout/settings_back_button.xml b/android/app/src/main/res/layout/settings_back_button.xml
index fc750132ac..fc750132ac 100644
--- a/android/src/main/res/layout/settings_back_button.xml
+++ b/android/app/src/main/res/layout/settings_back_button.xml
diff --git a/android/src/main/res/layout/split_tunneling.xml b/android/app/src/main/res/layout/split_tunneling.xml
index 9875a25774..9875a25774 100644
--- a/android/src/main/res/layout/split_tunneling.xml
+++ b/android/app/src/main/res/layout/split_tunneling.xml
diff --git a/android/src/main/res/layout/split_tunneling_header.xml b/android/app/src/main/res/layout/split_tunneling_header.xml
index 2f8bc681ce..2f8bc681ce 100644
--- a/android/src/main/res/layout/split_tunneling_header.xml
+++ b/android/app/src/main/res/layout/split_tunneling_header.xml
diff --git a/android/src/main/res/layout/switch_location_button.xml b/android/app/src/main/res/layout/switch_location_button.xml
index d9ed79956f..d9ed79956f 100644
--- a/android/src/main/res/layout/switch_location_button.xml
+++ b/android/app/src/main/res/layout/switch_location_button.xml
diff --git a/android/src/main/res/layout/view_logs.xml b/android/app/src/main/res/layout/view_logs.xml
index 3bf9e615fc..3bf9e615fc 100644
--- a/android/src/main/res/layout/view_logs.xml
+++ b/android/app/src/main/res/layout/view_logs.xml
diff --git a/android/src/main/res/layout/welcome.xml b/android/app/src/main/res/layout/welcome.xml
index e1c887ab96..e1c887ab96 100644
--- a/android/src/main/res/layout/welcome.xml
+++ b/android/app/src/main/res/layout/welcome.xml
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/app/src/main/res/layout/wireguard_key.xml
index 1300071d98..1300071d98 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/app/src/main/res/layout/wireguard_key.xml
diff --git a/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 5ed0a2df70..5ed0a2df70 100644
--- a/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/android/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index e69d754ff4..e69d754ff4 100644
--- a/android/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/android/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 1d53dd86ac..1d53dd86ac 100644
--- a/android/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/android/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 2164b759a6..2164b759a6 100644
--- a/android/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index c2f5a200c2..c2f5a200c2 100644
--- a/android/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 922f83b1db..922f83b1db 100644
--- a/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/android/src/main/res/values-da/plurals.xml b/android/app/src/main/res/values-da/plurals.xml
index 27da560202..27da560202 100644
--- a/android/src/main/res/values-da/plurals.xml
+++ b/android/app/src/main/res/values-da/plurals.xml
diff --git a/android/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index e522f75061..e522f75061 100644
--- a/android/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
diff --git a/android/src/main/res/values-de/plurals.xml b/android/app/src/main/res/values-de/plurals.xml
index 00d7d559f7..00d7d559f7 100644
--- a/android/src/main/res/values-de/plurals.xml
+++ b/android/app/src/main/res/values-de/plurals.xml
diff --git a/android/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 369c2f7aac..369c2f7aac 100644
--- a/android/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
diff --git a/android/src/main/res/values-es/plurals.xml b/android/app/src/main/res/values-es/plurals.xml
index 453d24c542..453d24c542 100644
--- a/android/src/main/res/values-es/plurals.xml
+++ b/android/app/src/main/res/values-es/plurals.xml
diff --git a/android/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 89464c8ee0..89464c8ee0 100644
--- a/android/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
diff --git a/android/src/main/res/values-fi/plurals.xml b/android/app/src/main/res/values-fi/plurals.xml
index 43c76d8042..43c76d8042 100644
--- a/android/src/main/res/values-fi/plurals.xml
+++ b/android/app/src/main/res/values-fi/plurals.xml
diff --git a/android/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 83b508d6e8..83b508d6e8 100644
--- a/android/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
diff --git a/android/src/main/res/values-fr/plurals.xml b/android/app/src/main/res/values-fr/plurals.xml
index b708512154..b708512154 100644
--- a/android/src/main/res/values-fr/plurals.xml
+++ b/android/app/src/main/res/values-fr/plurals.xml
diff --git a/android/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index c3f5016e0d..c3f5016e0d 100644
--- a/android/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
diff --git a/android/src/main/res/values-it/plurals.xml b/android/app/src/main/res/values-it/plurals.xml
index 4fec91b5ba..4fec91b5ba 100644
--- a/android/src/main/res/values-it/plurals.xml
+++ b/android/app/src/main/res/values-it/plurals.xml
diff --git a/android/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 4d102a5dfa..4d102a5dfa 100644
--- a/android/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
diff --git a/android/src/main/res/values-ja/plurals.xml b/android/app/src/main/res/values-ja/plurals.xml
index 9ae8cb2365..9ae8cb2365 100644
--- a/android/src/main/res/values-ja/plurals.xml
+++ b/android/app/src/main/res/values-ja/plurals.xml
diff --git a/android/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index ab61aa47dd..ab61aa47dd 100644
--- a/android/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
diff --git a/android/src/main/res/values-ko/plurals.xml b/android/app/src/main/res/values-ko/plurals.xml
index 13e893b3b4..13e893b3b4 100644
--- a/android/src/main/res/values-ko/plurals.xml
+++ b/android/app/src/main/res/values-ko/plurals.xml
diff --git a/android/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index a8bfe3f7c0..a8bfe3f7c0 100644
--- a/android/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
diff --git a/android/src/main/res/values-my/plurals.xml b/android/app/src/main/res/values-my/plurals.xml
index b99a79b345..b99a79b345 100644
--- a/android/src/main/res/values-my/plurals.xml
+++ b/android/app/src/main/res/values-my/plurals.xml
diff --git a/android/src/main/res/values-my/strings.xml b/android/app/src/main/res/values-my/strings.xml
index 7819620498..7819620498 100644
--- a/android/src/main/res/values-my/strings.xml
+++ b/android/app/src/main/res/values-my/strings.xml
diff --git a/android/src/main/res/values-nb/plurals.xml b/android/app/src/main/res/values-nb/plurals.xml
index dea8a0c6f9..dea8a0c6f9 100644
--- a/android/src/main/res/values-nb/plurals.xml
+++ b/android/app/src/main/res/values-nb/plurals.xml
diff --git a/android/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index ae0748b3d5..ae0748b3d5 100644
--- a/android/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
diff --git a/android/src/main/res/values-nl/plurals.xml b/android/app/src/main/res/values-nl/plurals.xml
index 7a99c6a6f7..7a99c6a6f7 100644
--- a/android/src/main/res/values-nl/plurals.xml
+++ b/android/app/src/main/res/values-nl/plurals.xml
diff --git a/android/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 734dd30d85..734dd30d85 100644
--- a/android/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
diff --git a/android/src/main/res/values-pl/plurals.xml b/android/app/src/main/res/values-pl/plurals.xml
index 67654bfc29..67654bfc29 100644
--- a/android/src/main/res/values-pl/plurals.xml
+++ b/android/app/src/main/res/values-pl/plurals.xml
diff --git a/android/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index f2b758330c..f2b758330c 100644
--- a/android/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
diff --git a/android/src/main/res/values-pt/plurals.xml b/android/app/src/main/res/values-pt/plurals.xml
index e4eba372a7..e4eba372a7 100644
--- a/android/src/main/res/values-pt/plurals.xml
+++ b/android/app/src/main/res/values-pt/plurals.xml
diff --git a/android/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 29e2b0a007..29e2b0a007 100644
--- a/android/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
diff --git a/android/src/main/res/values-ru/plurals.xml b/android/app/src/main/res/values-ru/plurals.xml
index 3a4cfffb59..3a4cfffb59 100644
--- a/android/src/main/res/values-ru/plurals.xml
+++ b/android/app/src/main/res/values-ru/plurals.xml
diff --git a/android/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index d28f1535fa..d28f1535fa 100644
--- a/android/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
diff --git a/android/src/main/res/values-sv/plurals.xml b/android/app/src/main/res/values-sv/plurals.xml
index d31ab0ad5b..d31ab0ad5b 100644
--- a/android/src/main/res/values-sv/plurals.xml
+++ b/android/app/src/main/res/values-sv/plurals.xml
diff --git a/android/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 3b4a8b9701..3b4a8b9701 100644
--- a/android/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
diff --git a/android/src/main/res/values-th/plurals.xml b/android/app/src/main/res/values-th/plurals.xml
index 96232c71d5..96232c71d5 100644
--- a/android/src/main/res/values-th/plurals.xml
+++ b/android/app/src/main/res/values-th/plurals.xml
diff --git a/android/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index f3f35de0c6..f3f35de0c6 100644
--- a/android/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
diff --git a/android/src/main/res/values-tr/plurals.xml b/android/app/src/main/res/values-tr/plurals.xml
index 250f0e2261..250f0e2261 100644
--- a/android/src/main/res/values-tr/plurals.xml
+++ b/android/app/src/main/res/values-tr/plurals.xml
diff --git a/android/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 41d0b405cc..41d0b405cc 100644
--- a/android/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
diff --git a/android/src/main/res/values-zh-rCN/plurals.xml b/android/app/src/main/res/values-zh-rCN/plurals.xml
index 5a9b4b2b33..5a9b4b2b33 100644
--- a/android/src/main/res/values-zh-rCN/plurals.xml
+++ b/android/app/src/main/res/values-zh-rCN/plurals.xml
diff --git a/android/src/main/res/values-zh-rCN/strings.xml b/android/app/src/main/res/values-zh-rCN/strings.xml
index 67e8f4b28c..67e8f4b28c 100644
--- a/android/src/main/res/values-zh-rCN/strings.xml
+++ b/android/app/src/main/res/values-zh-rCN/strings.xml
diff --git a/android/src/main/res/values-zh-rTW/plurals.xml b/android/app/src/main/res/values-zh-rTW/plurals.xml
index 5658c7b022..5658c7b022 100644
--- a/android/src/main/res/values-zh-rTW/plurals.xml
+++ b/android/app/src/main/res/values-zh-rTW/plurals.xml
diff --git a/android/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index f8cbc821f1..f8cbc821f1 100644
--- a/android/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
diff --git a/android/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml
index 8eefb1c173..8eefb1c173 100644
--- a/android/src/main/res/values/attrs.xml
+++ b/android/app/src/main/res/values/attrs.xml
diff --git a/android/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 8f53508029..8f53508029 100644
--- a/android/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
diff --git a/android/src/main/res/values/dimensions.xml b/android/app/src/main/res/values/dimensions.xml
index c8e8b2ff33..c8e8b2ff33 100644
--- a/android/src/main/res/values/dimensions.xml
+++ b/android/app/src/main/res/values/dimensions.xml
diff --git a/android/src/main/res/values/integers.xml b/android/app/src/main/res/values/integers.xml
index 3089382d18..3089382d18 100644
--- a/android/src/main/res/values/integers.xml
+++ b/android/app/src/main/res/values/integers.xml
diff --git a/android/src/main/res/values/plurals.xml b/android/app/src/main/res/values/plurals.xml
index b9aa90441e..b9aa90441e 100644
--- a/android/src/main/res/values/plurals.xml
+++ b/android/app/src/main/res/values/plurals.xml
diff --git a/android/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index b0828e73b0..b0828e73b0 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
diff --git a/android/src/main/res/values/strings_non_translatable.xml b/android/app/src/main/res/values/strings_non_translatable.xml
index 98ef2737c4..98ef2737c4 100644
--- a/android/src/main/res/values/strings_non_translatable.xml
+++ b/android/app/src/main/res/values/strings_non_translatable.xml
diff --git a/android/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 742cc42c4f..742cc42c4f 100644
--- a/android/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/TestCoroutineRule.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/TestCoroutineRule.kt
index 1acdf9e577..1acdf9e577 100644
--- a/android/src/test/kotlin/net/mullvad/mullvadvpn/TestCoroutineRule.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/TestCoroutineRule.kt
diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/TestUtils.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/TestUtils.kt
index 4c4f043c06..4c4f043c06 100644
--- a/android/src/test/kotlin/net/mullvad/mullvadvpn/TestUtils.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/TestUtils.kt
diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManagerTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManagerTest.kt
index e6d43621a1..e6d43621a1 100644
--- a/android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManagerTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsIconManagerTest.kt
diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt
index e1a9e37ac4..e1a9e37ac4 100644
--- a/android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt
diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/di/AppModuleTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/di/AppModuleTest.kt
index c30a63fedf..c30a63fedf 100644
--- a/android/src/test/kotlin/net/mullvad/mullvadvpn/di/AppModuleTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/di/AppModuleTest.kt
diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt
index a3c96349d9..a3c96349d9 100644
--- a/android/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/relaylist/RelayNameComparatorTest.kt
diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt
index ac229ba3fb..ac229ba3fb 100644
--- a/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt
diff --git a/android/build.gradle b/android/build.gradle
index abf3e64407..46b04e49d7 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,172 +1,3 @@
-apply plugin: 'com.android.application'
-apply plugin: 'com.github.triplet.play'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
-
-def repoRootPath = projectDir.absoluteFile.parentFile.absolutePath
-def extraAssetsDirectory = "$project.buildDir/extraAssets"
-def extraJniDirectory = "$project.buildDir/extraJni"
-
-def keystorePropertiesFile = file('keystore.properties')
-def keystoreProperties = new Properties()
-
-if (keystorePropertiesFile.exists()) {
- keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
-android {
- compileSdkVersion 30
- buildToolsVersion '30.0.3'
-
- defaultConfig {
- applicationId "net.mullvad.mullvadvpn"
- minSdkVersion 26
- targetSdkVersion 30
- versionCode 21010099
- versionName "2021.1"
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- }
-
- if (keystorePropertiesFile.exists()) {
- signingConfigs {
- release {
- keyAlias keystoreProperties['keyAlias']
- keyPassword keystoreProperties['keyPassword']
- storeFile file(keystoreProperties['storeFile'])
- storePassword keystoreProperties['storePassword']
- }
- }
-
- buildTypes {
- release {
- minifyEnabled false
- signingConfig signingConfigs.release
- }
- }
- }
-
- buildTypes {
- fdroid {
- initWith release
- minifyEnabled false
- signingConfig null
- }
- }
-
- sourceSets {
- main {
- assets {
- srcDirs = files(extraAssetsDirectory)
- }
-
- jniLibs {
- srcDirs = files(extraJniDirectory)
- }
- java {
- srcDirs += 'src/main/kotlin/'
- }
- }
-
- test {
- java {
- srcDirs += 'src/test/kotlin/'
- }
- }
-
- androidTest {
- java {
- srcDirs += 'src/androidTest/kotlin/'
- }
- }
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
- kotlinOptions {
- jvmTarget = '1.8'
- freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" // Opt-in option for Koin annotation of KoinComponent.
- }
-
- applicationVariants.all { variant ->
- variant.mergeAssetsProvider.configure {
- dependsOn copyExtraAssets
- }
- }
-
- testOptions {
- unitTests.all {
- testLogging {
- outputs.upToDateWhen { false }
- events "passed", "skipped", "failed", "standardOut", "standardError"
- showCauses true
- showExceptions true
- }
- }
- }
-}
-
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
- kotlinOptions {
- allWarningsAsErrors = true
-
- kotlinOptions.freeCompilerArgs += [
- "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
- "-Xuse-experimental=kotlinx.coroutines.ObsoleteCoroutinesApi",
- ]
- }
-}
-
-play {
- serviceAccountCredentials = file("play-api-key.json")
-}
-
-repositories {
- google()
- mavenCentral()
-}
-
-dependencies {
- implementation "androidx.appcompat:appcompat:1.2.0"
- implementation "androidx.constraintlayout:constraintlayout:2.0.4"
- implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
- implementation "androidx.core:core-ktx:1.3.2"
- implementation "androidx.fragment:fragment-ktx:$fragmentVersion"
- implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
- implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
- implementation "androidx.recyclerview:recyclerview:1.2.0"
- implementation "com.google.android.material:material:1.3.0"
- implementation "commons-validator:commons-validator:1.7"
- implementation "joda-time:joda-time:2.10.2"
- implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
- implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3"
- implementation "io.insert-koin:koin-core:$koinVersion"
- implementation "io.insert-koin:koin-core-ext:$koinVersion"
- implementation "io.insert-koin:koin-androidx-fragment:$koinVersion"
- implementation "io.insert-koin:koin-androidx-scope:$koinVersion"
- implementation "io.insert-koin:koin-androidx-viewmodel:$koinVersion"
-
- /* Test dependencies */
- testImplementation "io.mockk:mockk:$mockkVersion"
- testImplementation "junit:junit:4.13"
- testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
- testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3"
- testImplementation "io.insert-koin:koin-test:$koinVersion"
-
- /* UI test dependencies */
- debugImplementation "androidx.fragment:fragment-testing:$fragmentVersion"
- androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
- androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
- androidTestImplementation "androidx.test.ext:junit:1.1.2"
- androidTestImplementation "io.mockk:mockk-android:$mockkVersion"
- androidTestImplementation "io.insert-koin:koin-test:$koinVersion"
- androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
- // debugImplementation because LeakCanary should only run in debug builds.
- // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6'
-}
-
buildscript {
ext {
espressoVersion = "3.3.0"
@@ -191,9 +22,13 @@ buildscript {
}
}
-task copyExtraAssets(type: Copy) {
- from "$repoRootPath/dist-assets"
- include "relays.json"
- include "api-ip-address.txt"
- into extraAssetsDirectory
+allprojects {
+ repositories {
+ google()
+ mavenCentral()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
}
diff --git a/android/generate-pngs.sh b/android/generate-pngs.sh
index 1e2518c69c..611efcd690 100755
--- a/android/generate-pngs.sh
+++ b/android/generate-pngs.sh
@@ -27,15 +27,15 @@ BLACK_MONO_ICON_PATH="../graphics/icon-mono.svg"
#
# Examples:
#
-# The following will generate a 50 by 50 image in android/src/main/res/drawable-hdpi/my_image.png
+# The following will generate a 50 by 50 image in android/app/src/main/res/drawable-hdpi/my_image.png
#
# convert_image /tmp/my-image.svg hdpi-50
#
-# The following will generate a 50 by 50 image in android/src/main/res/drawable-mdpi/other_image.png
+# The following will generate a 50 by 50 image in android/app/src/main/res/drawable-mdpi/other_image.png
#
# convert_image /tmp/my-other-image.svg mdpi-50 other_image
#
-# The following will generate a 50 by 50 image in android/src/main/res/mipmap-xxhdpi/my_icon.png
+# The following will generate a 50 by 50 image in android/app/src/main/res/mipmap-xxhdpi/my_icon.png
#
# convert_image /tmp/my-final-image.svg xxhdpi-50 my_icon mipmap
function convert_image() {
@@ -62,7 +62,7 @@ function convert_image() {
local dpi="$(echo "$dpi_config" | cut -f1 -d'-')"
local size="$(echo "$dpi_config" | cut -f2 -d'-')"
- local dpi_dir="./src/main/res/${destination_dir}-${dpi}"
+ local dpi_dir="./app/src/main/res/${destination_dir}-${dpi}"
echo "$source_image -> ($size x $size) ${dpi_dir}/${destination_image}.png"
mkdir -p "$dpi_dir"
diff --git a/android/settings.gradle b/android/settings.gradle
new file mode 100644
index 0000000000..af1a998862
--- /dev/null
+++ b/android/settings.gradle
@@ -0,0 +1 @@
+include ":app"
diff --git a/android/translations-converter/src/main.rs b/android/translations-converter/src/main.rs
index 2549237b8d..262f06ff24 100644
--- a/android/translations-converter/src/main.rs
+++ b/android/translations-converter/src/main.rs
@@ -43,7 +43,7 @@ use std::{
};
fn main() {
- let resources_dir = Path::new("../src/main/res");
+ let resources_dir = Path::new("../app/src/main/res");
let strings_file = File::open(resources_dir.join("values/strings.xml"))
.expect("Failed to open string resources file");
diff --git a/build-apk.sh b/build-apk.sh
index 8392e498a9..960d509a18 100755
--- a/build-apk.sh
+++ b/build-apk.sh
@@ -6,7 +6,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "$SCRIPT_DIR"
-PRODUCT_VERSION="$(sed -n -e 's/^ *versionName "\([^"]*\)"$/\1/p' android/build.gradle)"
+PRODUCT_VERSION="$(sed -n -e 's/^ *versionName "\([^"]*\)"$/\1/p' android/app/build.gradle)"
BUILD_TYPE="release"
GRADLE_BUILD_TYPE="release"
GRADLE_TASK="assembleRelease"
@@ -76,7 +76,7 @@ else
fi
$GRADLE_CMD --console plain clean
-mkdir -p "build/extraJni"
+mkdir -p "app/build/extraJni"
popd
function restore_metadata_backups() {
@@ -120,7 +120,7 @@ for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
cargo +stable build $CARGO_ARGS --target "$TARGET" --package mullvad-jni
STRIP_TOOL="${NDK_TOOLCHAIN_DIR}/${LLVM_TRIPLE}-strip"
- STRIPPED_LIB_PATH="$SCRIPT_DIR/android/build/extraJni/$ABI/libmullvad_jni.so"
+ STRIPPED_LIB_PATH="$SCRIPT_DIR/android/app/build/extraJni/$ABI/libmullvad_jni.so"
UNSTRIPPED_LIB_PATH="$SCRIPT_DIR/target/$TARGET/$BUILD_TYPE/libmullvad_jni.so"
$STRIP_TOOL --strip-debug --strip-unneeded -o "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH"
@@ -133,13 +133,13 @@ cd "$SCRIPT_DIR/android"
$GRADLE_CMD --console plain "$GRADLE_TASK"
mkdir -p "$SCRIPT_DIR/dist"
-cp "$SCRIPT_DIR/android/build/outputs/apk/$GRADLE_BUILD_TYPE/android${BUILT_APK_SUFFIX}.apk" \
+cp "$SCRIPT_DIR/android/app/build/outputs/apk/$GRADLE_BUILD_TYPE/app${BUILT_APK_SUFFIX}.apk" \
"$SCRIPT_DIR/dist/MullvadVPN-${PRODUCT_VERSION}${FILE_SUFFIX}.apk"
if [[ "$BUILD_BUNDLE" == "yes" ]]; then
$GRADLE_CMD --console plain "$BUNDLE_TASK"
- cp "$SCRIPT_DIR/android/build/outputs/bundle/$GRADLE_BUILD_TYPE/android${BUILT_APK_SUFFIX}.aab" \
+ cp "$SCRIPT_DIR/android/app/build/outputs/bundle/$GRADLE_BUILD_TYPE/app${BUILT_APK_SUFFIX}.aab" \
"$SCRIPT_DIR/dist/MullvadVPN-${PRODUCT_VERSION}${FILE_SUFFIX}.aab"
fi
diff --git a/ci/ci-android-xml.sh b/ci/ci-android-xml.sh
index b63e7ece1a..1d7c46020a 100644
--- a/ci/ci-android-xml.sh
+++ b/ci/ci-android-xml.sh
@@ -13,25 +13,25 @@ function tidy-up-android-xml {
--indent-attributes yes \
--indent-spaces 4 \
--literal-attributes yes \
- android/src/main/AndroidManifest.xml \
- android/src/main/res/anim*/*.xml \
- android/src/main/res/drawable*/*.xml \
- android/src/main/res/layout*/*.xml \
- android/src/main/res/values/*.xml
+ android/app/src/main/AndroidManifest.xml \
+ android/app/src/main/res/anim*/*.xml \
+ android/app/src/main/res/drawable*/*.xml \
+ android/app/src/main/res/layout*/*.xml \
+ android/app/src/main/res/values/*.xml
# FIXME - when tidy learns to not leave whitespace around, remove the line below - https://github.com/htacg/tidy-html5/issues/864
- find android/src/main/ -name '*.xml' -exec sed -i -e 's/[ \t]*$//' '{}' ';'
+ find android/app/src/main/ -name '*.xml' -exec sed -i -e 's/[ \t]*$//' '{}' ';'
}
# Autoformats Android XML files and returns 0 if no files were actually changed, or 1 if files were changed
function tidy-verify-xml {
tidy-up-android-xml
- if git diff --exit-code -- android/src/main/AndroidManifest.xml android/src/main/res; then
+ if git diff --exit-code -- android/app/src/main/AndroidManifest.xml android/app/src/main/res; then
echo "Android XML files are correctly formatted"
return 0
else
- echo "android/src/main contains files that were changed, XML is not formatted properly"
+ echo "android/app/src/main contains files that were changed, XML is not formatted properly"
return 1
fi
}
diff --git a/graphics/README.md b/graphics/README.md
index 5fa171d69d..61287b764e 100644
--- a/graphics/README.md
+++ b/graphics/README.md
@@ -7,15 +7,15 @@ where the app is distributed.
The `Android-feature-graphics.psd` file should be used to generate a PNG image to be used as the
feature graphics in the app's Google Play Store listing. The PNG image should be placed in the
-`android/src/main/play/listings/en-US/graphics/feature-graphics/` directory.
+`android/app/src/main/play/listings/en-US/graphics/feature-graphics/` directory.
The `icon-square.svg` is used to generate Android's square icon used in the app's Google Play Store
listing. The resulting 512x512 PNG image should be placed in the
-`android/src/main/play/listings/en-US/graphics/icon/` directory. The file can be generate with the
+`android/app/src/main/play/listings/en-US/graphics/icon/` directory. The file can be generate with the
following command:
```
-rsvg-convert ./icon-square.svg -w 512 -h 512 -o ../android/src/main/play/listings/en-US/graphics/icon/icon.png
+rsvg-convert ./icon-square.svg -w 512 -h 512 -o ../android/app/src/main/play/listings/en-US/graphics/icon/icon.png
```
The icon `adaptive-icon-source.svg` is used for Android adaptive icon. The icon converted to
diff --git a/wireguard/libwg/build-android.sh b/wireguard/libwg/build-android.sh
index 843102866f..a94a54bc23 100755
--- a/wireguard/libwg/build-android.sh
+++ b/wireguard/libwg/build-android.sh
@@ -52,7 +52,7 @@ for arch in ${ARCHITECTURES:-armv7 aarch64 x86_64 i686}; do
# Strip and copy the libray to `android/build/extraJni/$ANDROID_ABI` to be able to build the APK
UNSTRIPPED_LIB_PATH="../../build/lib/$RUST_TARGET_TRIPLE/libwg.so"
- STRIPPED_LIB_PATH="../../android/build/extraJni/$ANDROID_ABI/libwg.so"
+ STRIPPED_LIB_PATH="../../android/app/build/extraJni/$ANDROID_ABI/libwg.so"
# Create the directories with RWX permissions for all users so that the build server can clean
# the directories afterwards
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.