1 files changed, 17 insertions, 8 deletions
diff --git a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
index 36774c3f..7f39b461 100644
--- a/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
+++ b/ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
@@ -1,25 +1,30 @@
 /*
- * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * Copyright © 2017-2025 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 package com.wireguard.android.viewmodel
 
+import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
+import androidx.core.os.ParcelCompat
 import androidx.databinding.ObservableArrayList
 import androidx.databinding.ObservableList
 import com.wireguard.config.BadConfigException
 import com.wireguard.config.Config
 import com.wireguard.config.Peer
-import java.util.ArrayList
 
 class ConfigProxy : Parcelable {
     val `interface`: InterfaceProxy
     val peers: ObservableList<PeerProxy> = ObservableArrayList()
 
     private constructor(parcel: Parcel) {
-        `interface` = parcel.readParcelable(InterfaceProxy::class.java.classLoader)!!
-        parcel.readTypedList(peers, PeerProxy.CREATOR)
+        `interface` = ParcelCompat.readParcelable(parcel, InterfaceProxy::class.java.classLoader, InterfaceProxy::class.java) ?: InterfaceProxy()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            ParcelCompat.readParcelableList(parcel, peers, PeerProxy::class.java.classLoader, PeerProxy::class.java)
+        } else {
+            parcel.readTypedList(peers, PeerProxy.CREATOR)
+        }
         peers.forEach { it.bind(this) }
     }
 
@@ -50,14 +55,18 @@ class ConfigProxy : Parcelable {
         val resolvedPeers: MutableCollection<Peer> = ArrayList()
         peers.forEach { resolvedPeers.add(it.resolve()) }
         return Config.Builder()
-                .setInterface(`interface`.resolve())
-                .addPeers(resolvedPeers)
-                .build()
+            .setInterface(`interface`.resolve())
+            .addPeers(resolvedPeers)
+            .build()
     }
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
         dest.writeParcelable(`interface`, flags)
-        dest.writeTypedList(peers)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            dest.writeParcelableList(peers, flags)
+        } else {
+            dest.writeTypedList(peers)
+        }
     }
 
     private class ConfigProxyCreator : Parcelable.Creator<ConfigProxy> {