Skip to content

Commit 22a3914

Browse files
committed
Use ParcelCompat for Android 13 changes
1 parent 73662bd commit 22a3914

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaItem.kt

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.net.Uri
44
import android.os.Parcel
55
import android.os.Parcelable
66
import android.os.Parcelable.Creator
7+
import androidx.core.os.ParcelCompat
78
import org.wordpress.android.ui.mediapicker.MediaItem.IdentifierType.GIF_MEDIA_IDENTIFIER
89
import org.wordpress.android.ui.mediapicker.MediaItem.IdentifierType.LOCAL_ID
910
import org.wordpress.android.ui.mediapicker.MediaItem.IdentifierType.LOCAL_URI
@@ -82,7 +83,15 @@ data class MediaItem(
8283
return when (type) {
8384
LOCAL_URI -> {
8485
LocalUri(
85-
UriWrapper(requireNotNull(parcel.readParcelable(Uri::class.java.classLoader))),
86+
UriWrapper(
87+
requireNotNull(
88+
ParcelCompat.readParcelable(
89+
parcel,
90+
Uri::class.java.classLoader,
91+
Uri::class.java
92+
)
93+
)
94+
),
8695
parcel.readInt() != 0
8796
)
8897
}
@@ -97,7 +106,15 @@ data class MediaItem(
97106
}
98107
GIF_MEDIA_IDENTIFIER -> {
99108
GifMediaIdentifier(
100-
UriWrapper(requireNotNull(parcel.readParcelable(Uri::class.java.classLoader))),
109+
UriWrapper(
110+
requireNotNull(
111+
ParcelCompat.readParcelable(
112+
parcel,
113+
Uri::class.java.classLoader,
114+
Uri::class.java
115+
)
116+
)
117+
),
101118
parcel.readString()
102119
)
103120
}

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
44
import android.os.Bundle
55
import android.os.Parcel
66
import android.os.Parcelable
7+
import androidx.core.os.ParcelCompat
78
import androidx.lifecycle.LiveData
89
import androidx.lifecycle.MutableLiveData
910
import kotlinx.parcelize.Parceler
@@ -224,7 +225,7 @@ class SelectedDateProvider
224225
null
225226
}
226227
val availableTimeStamps = mutableListOf<Any?>()
227-
parcel.readList(availableTimeStamps, null)
228+
ParcelCompat.readList(parcel, availableTimeStamps, null, Any::class.java)
228229
val availableDates = availableTimeStamps.map { Date(it as Long) }
229230
val loading = parcel.readValue(null) as Boolean
230231
val error = parcel.readValue(null) as Boolean

0 commit comments

Comments
 (0)