diff options
| author | Albin <albin@mullvad.net> | 2024-07-03 17:32:05 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-07-03 17:32:05 +0200 |
| commit | 6fcf6e0c507a90fa95e9f86bc88060629d7cc674 (patch) | |
| tree | 857a79cf463e26a7bf6bcd9c2c8ca3e5c9f89f0a /android/app | |
| parent | c6771e8b135b8ea7bdb435109a2c95cbeaa777bf (diff) | |
| parent | 2eb8effd68977aeb351dffd3c926ab7fdf43c9c1 (diff) | |
| download | mullvadvpn-6fcf6e0c507a90fa95e9f86bc88060629d7cc674.tar.xz mullvadvpn-6fcf6e0c507a90fa95e9f86bc88060629d7cc674.zip | |
Merge branch 'bump-activity-compose'
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/build.gradle.kts | 1 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 359a4259cc..51ecdacc95 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -325,6 +325,7 @@ dependencies { playImplementation(project(Dependencies.Mullvad.billingLib)) implementation(Dependencies.commonsValidator) + implementation(Dependencies.AndroidX.activityCompose) implementation(Dependencies.AndroidX.coreKtx) implementation(Dependencies.AndroidX.lifecycleRuntimeKtx) implementation(Dependencies.AndroidX.lifecycleViewmodelKtx) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index 5649442050..7d592f468a 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -72,7 +72,7 @@ class MainActivity : ComponentActivity() { } } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) intentProvider.setStartIntent(intent) } |