Merge branch 'google-play-in-app-purchases-droid-277'

3 files changed, 26 insertions, 2 deletions

diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt
index c5ede20327..e1079807f1 100644
--- a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt
+++ b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Event.kt
@@ -5,16 +5,16 @@ import kotlinx.parcelize.Parcelize
 import net.mullvad.mullvadvpn.model.AccountCreationResult
 import net.mullvad.mullvadvpn.model.AccountExpiry
 import net.mullvad.mullvadvpn.model.AccountHistory
-import net.mullvad.mullvadvpn.model.AppVersionInfo
 import net.mullvad.mullvadvpn.model.DeviceListEvent
 import net.mullvad.mullvadvpn.model.DeviceState
 import net.mullvad.mullvadvpn.model.GeoIpLocation
 import net.mullvad.mullvadvpn.model.LoginResult
+import net.mullvad.mullvadvpn.model.PlayPurchaseInitResult
+import net.mullvad.mullvadvpn.model.PlayPurchaseVerifyResult
 import net.mullvad.mullvadvpn.model.RelayList
 import net.mullvad.mullvadvpn.model.RemoveDeviceResult
 import net.mullvad.mullvadvpn.model.Settings
 import net.mullvad.mullvadvpn.model.TunnelState
-import net.mullvad.mullvadvpn.model.VoucherSubmissionResult
 
 // Events that can be sent from the service
 sealed class Event : Message.EventMessage() {
@@ -61,6 +61,11 @@ sealed class Event : Message.EventMessage() {
         val result: net.mullvad.mullvadvpn.model.VoucherSubmissionResult
     ) : Event()
 
+    @Parcelize data class PlayPurchaseInitResultEvent(val result: PlayPurchaseInitResult) : Event()
+
+    @Parcelize
+    data class PlayPurchaseVerifyResultEvent(val result: PlayPurchaseVerifyResult) : Event()
+
     @Parcelize object VpnPermissionRequest : Event()
 
     companion object {
diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/MessageHandler.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/MessageHandler.kt
new file mode 100644
index 0000000000..04de35e3bd
--- /dev/null
+++ b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/MessageHandler.kt
@@ -0,0 +1,14 @@
+package net.mullvad.mullvadvpn.lib.ipc
+
+import kotlin.reflect.KClass
+import kotlinx.coroutines.flow.Flow
+
+interface MessageHandler {
+    fun <R : Event> events(klass: KClass<R>): Flow<R>
+
+    fun trySendRequest(request: Request): Boolean
+}
+
+inline fun <reified R : Event> MessageHandler.events(): Flow<R> {
+    return this.events(R::class)
+}
diff --git a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
index 38237e84b3..b73010785a 100644
--- a/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
+++ b/android/lib/ipc/src/main/kotlin/net/mullvad/mullvadvpn/lib/ipc/Request.kt
@@ -9,6 +9,7 @@ import net.mullvad.mullvadvpn.model.DnsOptions
 import net.mullvad.mullvadvpn.model.GeographicLocationConstraint
 import net.mullvad.mullvadvpn.model.ObfuscationSettings
 import net.mullvad.mullvadvpn.model.Ownership
+import net.mullvad.mullvadvpn.model.PlayPurchase
 import net.mullvad.mullvadvpn.model.Providers
 import net.mullvad.mullvadvpn.model.QuantumResistantState
 import net.mullvad.mullvadvpn.model.WireguardConstraints
@@ -83,6 +84,10 @@ sealed class Request : Message.RequestMessage() {
 
     @Parcelize data class SubmitVoucher(val voucher: String) : Request()
 
+    @Parcelize data object InitPlayPurchase : Request()
+
+    @Parcelize data class VerifyPlayPurchase(val playPurchase: PlayPurchase) : Request()
+
     @Parcelize data class UnregisterListener(val listenerId: Int) : Request()
 
     @Parcelize data class VpnPermissionResponse(val isGranted: Boolean) : Request()