Finish refactor into ui and service packages

5 files changed, 32 insertions, 26 deletions

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index a945c6cab3..ca8178220b 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
             tools:ignore="GoogleAppIndexingWarning"
             >
         <activity
-                android:name=".MainActivity"
+                android:name="net.mullvad.mullvadvpn.ui.MainActivity"
                 android:label="@string/app_name"
                 android:configChanges="orientation"
                 android:screenOrientation="portrait"
@@ -34,7 +34,7 @@
         </activity>
 
         <service
-                android:name=".MullvadVpnService"
+                android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
                 android:permission="android.permission.BIND_VPN_SERVICE"
                 >
             <intent-filter>
diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml
index 8ebf04c8b4..b0a53d87d6 100644
--- a/android/src/main/res/layout/login.xml
+++ b/android/src/main/res/layout/login.xml
@@ -107,7 +107,7 @@
                 android:textSize="13sp"
                 android:text="@string/login_description"
                 />
-        <net.mullvad.mullvadvpn.AccountInputContainer android:id="@+id/account_input_container"
+        <net.mullvad.mullvadvpn.ui.AccountInputContainer android:id="@+id/account_input_container"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
                 android:orientation="horizontal"
@@ -137,7 +137,7 @@
                     android:background="@drawable/login_button_background"
                     android:src="@drawable/login_button_arrow"
                     />
-        </net.mullvad.mullvadvpn.AccountInputContainer>
+        </net.mullvad.mullvadvpn.ui.AccountInputContainer>
         <Space
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
diff --git a/mullvad-jni/src/classes.rs b/mullvad-jni/src/classes.rs
index 6669f2b403..3cc61e86a9 100644
--- a/mullvad-jni/src/classes.rs
+++ b/mullvad-jni/src/classes.rs
@@ -36,8 +36,8 @@ pub const CLASSES: &[&str] = &[
     "net/mullvad/mullvadvpn/model/TunnelState$Disconnected",
     "net/mullvad/mullvadvpn/model/TunnelState$Disconnecting",
     "net/mullvad/mullvadvpn/model/WireguardEndpointData",
-    "net/mullvad/mullvadvpn/MullvadDaemon",
-    "net/mullvad/mullvadvpn/MullvadVpnService",
+    "net/mullvad/mullvadvpn/service/MullvadDaemon",
+    "net/mullvad/mullvadvpn/service/MullvadVpnService",
     "net/mullvad/talpid/net/Endpoint",
     "net/mullvad/talpid/net/TransportProtocol",
     "net/mullvad/talpid/net/TunnelEndpoint",
diff --git a/mullvad-jni/src/jni_event_listener.rs b/mullvad-jni/src/jni_event_listener.rs
index 901ec5d2b7..9fd5c3d2ea 100644
--- a/mullvad-jni/src/jni_event_listener.rs
+++ b/mullvad-jni/src/jni_event_listener.rs
@@ -116,7 +116,7 @@ impl<'env> JniEventHandler<'env> {
         mullvad_ipc_client: JObject<'env>,
         events: mpsc::Receiver<Event>,
     ) -> Result<Self, Error> {
-        let class = env.get_class("net/mullvad/mullvadvpn/MullvadDaemon");
+        let class = env.get_class("net/mullvad/mullvadvpn/service/MullvadDaemon");
         let notify_app_version_info_event = Self::get_method_id(
             &env,
             &class,
diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs
index 3e779af9f2..1a4a3e0da3 100644
--- a/mullvad-jni/src/lib.rs
+++ b/mullvad-jni/src/lib.rs
@@ -94,7 +94,7 @@ impl From<Result<AccountData, daemon_interface::Error>> for GetAccountDataResult
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_initialize(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_initialize(
     env: JNIEnv<'_>,
     this: JObject<'_>,
     vpnService: JObject<'_>,
@@ -202,7 +202,7 @@ fn create_daemon(
 }
 
 fn set_daemon_interface_address(env: &JnixEnv<'_>, this: &JObject<'_>, address: jlong) {
-    let class = env.get_class("net/mullvad/mullvadvpn/MullvadDaemon");
+    let class = env.get_class("net/mullvad/mullvadvpn/service/MullvadDaemon");
     let method_id = env
         .get_method_id(&class, "setDaemonInterfaceAddress", "(J)V")
         .expect("Failed to get method ID for MullvadDaemon.setDaemonInterfaceAddress");
@@ -224,7 +224,7 @@ fn set_daemon_interface_address(env: &JnixEnv<'_>, this: &JObject<'_>, address:
 }
 
 fn get_daemon_interface_address(env: &JnixEnv<'_>, this: &JObject<'_>) -> *mut DaemonInterface {
-    let class = env.get_class("net/mullvad/mullvadvpn/MullvadDaemon");
+    let class = env.get_class("net/mullvad/mullvadvpn/service/MullvadDaemon");
     let method_id = env
         .get_method_id(&class, "getDaemonInterfaceAddress", "()J")
         .expect("Failed to get method ID for MullvadDaemon.getDaemonInterfaceAddress");
@@ -274,7 +274,7 @@ fn get_daemon_interface<'a>(address: jlong) -> Option<&'a mut DaemonInterface> {
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_connect(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_connect(
     _: JNIEnv<'_>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -291,7 +291,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_connect(
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_disconnect(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_disconnect(
     _: JNIEnv<'_>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -308,7 +308,9 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_disconnect(
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_generateWireguardKey<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_generateWireguardKey<
+    'env,
+>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -333,7 +335,9 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_generateWiregua
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_verifyWireguardKey<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_verifyWireguardKey<
+    'env,
+>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -364,7 +368,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_verifyWireguard
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getAccountData<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_getAccountData<'env>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -391,7 +395,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getAccountData<
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getWwwAuthToken<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_getWwwAuthToken<'env>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -416,7 +420,9 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getWwwAuthToken
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getCurrentLocation<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_getCurrentLocation<
+    'env,
+>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -441,7 +447,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getCurrentLocat
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getCurrentVersion<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_getCurrentVersion<'env>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -466,7 +472,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getCurrentVersi
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getRelayLocations<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_getRelayLocations<'env>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -491,7 +497,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getRelayLocatio
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getSettings<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_getSettings<'env>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -513,7 +519,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getSettings<'en
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getState<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_getState<'env>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -535,7 +541,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getState<'env>(
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getVersionInfo<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_getVersionInfo<'env>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -560,7 +566,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getVersionInfo<
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getWireguardKey<'env>(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_getWireguardKey<'env>(
     env: JNIEnv<'env>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -585,7 +591,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_getWireguardKey
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_setAccount(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_setAccount(
     env: JNIEnv<'_>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -604,7 +610,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_setAccount(
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_shutdown(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_shutdown(
     _: JNIEnv<'_>,
     _: JObject<'_>,
     daemon_interface_address: jlong,
@@ -621,7 +627,7 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_shutdown(
 
 #[no_mangle]
 #[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_MullvadDaemon_updateRelaySettings(
+pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_updateRelaySettings(
     env: JNIEnv<'_>,
     _: JObject<'_>,
     daemon_interface_address: jlong,