summaryrefslogtreecommitdiffhomepage
path: root/android/lib/common/src
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-09-07 09:26:05 +0200
committerAlbin <albin@mullvad.net>2023-09-22 13:20:14 +0200
commit84f6868ca47d00c04e0923fbb7ca2e7482c34ceb (patch)
tree8f82b7a549a43d5ab7fc952d47c2df647c3a07bf /android/lib/common/src
parent990b5f8df1a79a441fe3910470822538a8e4e476 (diff)
downloadmullvadvpn-84f6868ca47d00c04e0923fbb7ca2e7482c34ceb.tar.xz
mullvadvpn-84f6868ca47d00c04e0923fbb7ca2e7482c34ceb.zip
Support running under build variant app ids
Diffstat (limited to 'android/lib/common/src')
-rw-r--r--android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/Actions.kt5
-rw-r--r--android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/Classes.kt5
-rw-r--r--android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/ClassesAndActions.kt14
3 files changed, 14 insertions, 10 deletions
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/Actions.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/Actions.kt
deleted file mode 100644
index 6d8dbf697f..0000000000
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/Actions.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.mullvad.mullvadvpn.lib.common.constant
-
-const val KEY_CONNECT_ACTION = "$MULLVAD_PACKAGE_NAME.connect_action"
-const val KEY_DISCONNECT_ACTION = "$MULLVAD_PACKAGE_NAME.disconnect_action"
-const val KEY_QUIT_ACTION = "$MULLVAD_PACKAGE_NAME.quit_action"
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/Classes.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/Classes.kt
deleted file mode 100644
index e8888cc3cd..0000000000
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/Classes.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.mullvad.mullvadvpn.lib.common.constant
-
-const val MULLVAD_PACKAGE_NAME = "net.mullvad.mullvadvpn"
-const val MAIN_ACTIVITY_CLASS = "$MULLVAD_PACKAGE_NAME.ui.MainActivity"
-const val VPN_SERVICE_CLASS = "$MULLVAD_PACKAGE_NAME.service.MullvadVpnService"
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/ClassesAndActions.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/ClassesAndActions.kt
new file mode 100644
index 0000000000..09210ffa03
--- /dev/null
+++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/ClassesAndActions.kt
@@ -0,0 +1,14 @@
+package net.mullvad.mullvadvpn.lib.common.constant
+
+// Do not use in cases where the application id is expected since the application id will differ
+// between different builds.
+private const val MULLVAD_PACKAGE_NAME = "net.mullvad.mullvadvpn"
+
+// Classes
+const val MAIN_ACTIVITY_CLASS = "$MULLVAD_PACKAGE_NAME.ui.MainActivity"
+const val VPN_SERVICE_CLASS = "$MULLVAD_PACKAGE_NAME.service.MullvadVpnService"
+
+// Actions
+const val KEY_CONNECT_ACTION = "$MULLVAD_PACKAGE_NAME.connect_action"
+const val KEY_DISCONNECT_ACTION = "$MULLVAD_PACKAGE_NAME.disconnect_action"
+const val KEY_QUIT_ACTION = "$MULLVAD_PACKAGE_NAME.quit_action"