Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deprecated Parcel functions #18068

Merged
merged 10 commits into from
Mar 9, 2023
Merged

Update deprecated Parcel functions #18068

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ff3699a
Update androidx.core version to 1.9.0
irfano Mar 8, 2023
86dd01a
Add android.permission.POST_NOTIFICATIONS
irfano Mar 8, 2023
d33a199
Use ParcelCompat for Android 13 changes
irfano Mar 8, 2023
d98d281
Revert "Update androidx.core version to 1.9.0"
irfano Mar 9, 2023
28fff0b
Revert "Add android.permission.POST_NOTIFICATIONS"
irfano Mar 9, 2023
4047e5a
Revert "Use ParcelCompat for Android 13 changes"
irfano Mar 9, 2023
64f591a
Add Android 13 compatibility functions for Parcel
irfano Mar 9, 2023
21ad209
Update deprecated Parcel functions
irfano Mar 9, 2023
b194387
Add comments to functions in CompatExtensions
irfano Mar 9, 2023
b5bc515
Merge branch 'feature/update-compile-sdk-33' into update-parcelcompat…
irfano Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use ParcelCompat for Android 13 changes
  • Loading branch information
@irfano
irfano committed Mar 8, 2023
commit d33a1999fc17e2ea833b0a4e6e6b65f7e69fbb20
21 changes: 19 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.net.Uri
import android.os.Parcel
import android.os.Parcelable
import android.os.Parcelable.Creator
import androidx.core.os.ParcelCompat
import org.wordpress.android.ui.mediapicker.MediaItem.IdentifierType.GIF_MEDIA_IDENTIFIER
import org.wordpress.android.ui.mediapicker.MediaItem.IdentifierType.LOCAL_ID
import org.wordpress.android.ui.mediapicker.MediaItem.IdentifierType.LOCAL_URI
Expand Down Expand Up @@ -82,7 +83,15 @@ data class MediaItem(
return when (type) {
LOCAL_URI -> {
LocalUri(
UriWrapper(requireNotNull(parcel.readParcelable(Uri::class.java.classLoader))),
UriWrapper(
requireNotNull(
ParcelCompat.readParcelable(
parcel,
Uri::class.java.classLoader,
Uri::class.java
)
)
),
parcel.readInt() != 0
)
}
Expand All @@ -97,7 +106,15 @@ data class MediaItem(
}
GIF_MEDIA_IDENTIFIER -> {
GifMediaIdentifier(
UriWrapper(requireNotNull(parcel.readParcelable(Uri::class.java.classLoader))),
UriWrapper(
requireNotNull(
ParcelCompat.readParcelable(
parcel,
Uri::class.java.classLoader,
Uri::class.java
)
)
),
parcel.readString()
)
}
Expand Down
3 changes: 2 additions & 1 deletion ...va/org/wordpress/android/ui/stats/refresh/lists/sections/granular/SelectedDateProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.os.Bundle
import android.os.Parcel
import android.os.Parcelable
import androidx.core.os.ParcelCompat
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import kotlinx.parcelize.Parceler
Expand Down Expand Up @@ -223,7 +224,7 @@ class SelectedDateProvider
null
}
val availableTimeStamps = mutableListOf<Any?>()
parcel.readList(availableTimeStamps, null)
ParcelCompat.readList(parcel, availableTimeStamps, null, Any::class.java)
val availableDates = availableTimeStamps.map { Date(it as Long) }
val loading = parcel.readValue(null) as Boolean
val error = parcel.readValue(null) as Boolean
Expand Down