Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: address Parcelable API deprecations

Browse Source 
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2023-03-22 21:17:50 +05:30
parent 91227e445a
commit 35c8c10b7e
No known key found for this signature in database
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
View File

@ -5,6 +5,7 @@
package com.wireguard.android.fragment package com.wireguard.android.fragment
import android.content.Context import android.content.Context
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.text.InputType import android.text.InputType
import android.util.Log import android.util.Log
@ -265,7 +266,12 @@ class TunnelEditorFragment : BaseFragment() {
onSelectedTunnelChanged(null, selectedTunnel) onSelectedTunnelChanged(null, selectedTunnel)
} else { } else {
tunnel = selectedTunnel tunnel = selectedTunnel
val config: ConfigProxy = savedInstanceState.getParcelable(KEY_LOCAL_CONFIG)!! val config: ConfigProxy = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
savedInstanceState.getParcelable(KEY_LOCAL_CONFIG, ConfigProxy::class.java)!!
} else {
@Suppress("DEPRECATION")
savedInstanceState.getParcelable(KEY_LOCAL_CONFIG)!!
}
val originalName = savedInstanceState.getString(KEY_ORIGINAL_NAME) val originalName = savedInstanceState.getString(KEY_ORIGINAL_NAME)
if (tunnel != null && tunnel!!.name != originalName) onSelectedTunnelChanged(null, tunnel) else binding!!.config = config if (tunnel != null && tunnel!!.name != originalName) onSelectedTunnelChanged(null, tunnel) else binding!!.config = config
} }

2
ui/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.kt
View File

@ -18,7 +18,7 @@ class ConfigProxy : Parcelable {
val peers: ObservableList<PeerProxy> = ObservableArrayList() val peers: ObservableList<PeerProxy> = ObservableArrayList()
private constructor(parcel: Parcel) { private constructor(parcel: Parcel) {
`interface` = parcel.readParcelable(InterfaceProxy::class.java.classLoader)!! `interface` = InterfaceProxy.CREATOR.createFromParcel(parcel)
parcel.readTypedList(peers, PeerProxy.CREATOR) parcel.readTypedList(peers, PeerProxy.CREATOR)
peers.forEach { it.bind(this) } peers.forEach { it.bind(this) }
} }