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

Jump to bottom

Remove GsonJsonSerializer #2145

Merged
merged 1 commit into from
Oct 7, 2022
Merged

Remove GsonJsonSerializer #2145

merged 1 commit into from
Oct 7, 2022

Conversation

nielsvanvelzen
Copy link
Member

Also migrates a bunch of stuff to the SDK so we can use kotlinx.serialization

Changes

  • Remove GsonJsonSerializer
  • Migrate a bunch of stuff to SDK types
  • Add FakeBaseItem for hacky code

Issues

@nielsvanvelzen nielsvanvelzen added the refactor Improvements to code realiability, readability and quality label Oct 6, 2022
@nielsvanvelzen nielsvanvelzen added this to the v0.15.0 milestone Oct 6, 2022
github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 6, 2022
View reviewed changes
app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java
@@ -130,7 +130,7 @@

private DisplayMetrics mMetrics;

protected BaseItemDto mProgramInfo;
protected org.jellyfin.sdk.model.api.BaseItemDto mProgramInfo;

Check notice

Code scanning / Android Lint

Unknown nullness

Unknown nullability; explicitly declare as @Nullable or @NonNull to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations
app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java
@@ -1451,17 +1446,17 @@
};

RecordPopup mRecordPopup;
public void showRecordingOptions(String id, final BaseItemDto program, final boolean recordSeries) {
public void showRecordingOptions(String id, final org.jellyfin.sdk.model.api.BaseItemDto program, final boolean recordSeries) {

Check notice

Code scanning / Android Lint

Unknown nullness

Unknown nullability; explicitly declare as @Nullable or @NonNull to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations
app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java
@@ -1451,17 +1446,17 @@
};

RecordPopup mRecordPopup;
public void showRecordingOptions(String id, final BaseItemDto program, final boolean recordSeries) {
public void showRecordingOptions(String id, final org.jellyfin.sdk.model.api.BaseItemDto program, final boolean recordSeries) {

Check notice

Code scanning / Android Lint

Unknown nullness

Unknown nullability; explicitly declare as @Nullable or @NonNull to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations
app/src/main/java/org/jellyfin/androidtv/util/sdk/compat/JavaCompat.kt
@@ -41,3 +49,25 @@
?: audioStreams.firstOrNull { it.isDefault }
?: audioStreams.firstOrNull()
}

object FakeBaseItem {
val FAV_SONGS_ID = UUID.fromString("11111111-0000-0000-0000-000000000001")

Check notice

Code scanning / Android Lint

Unknown nullness

Should explicitly declare type here since implicit type does not specify nullness
app/src/main/java/org/jellyfin/androidtv/util/sdk/compat/JavaCompat.kt
isFolder = true,
)

val SERIES_TIMERS_ID = UUID.fromString("11111111-0000-0000-0000-000000000002")

Check notice

Code scanning / Android Lint

Unknown nullness

Should explicitly declare type here since implicit type does not specify nullness
app/src/main/java/org/jellyfin/androidtv/util/sdk/compat/JavaCompat.kt
collectionType = "SeriesTimers",
)

val TV_RECORDINGS_ID = UUID.fromString("11111111-0000-0000-0000-000000000003")

Check notice

Code scanning / Android Lint

Unknown nullness

Should explicitly declare type here since implicit type does not specify nullness
@nielsvanvelzen nielsvanvelzen marked this pull request as ready for review October 6, 2022 20:08
@jellyfin-bot jellyfin-bot added the merge conflict Conflicts prevent merging label Oct 7, 2022
@nielsvanvelzen
Remove GsonJsonSerializer
efd9ed0 
Also migrates a bunch of stuff to the SDK so we can use kotlinx.serialization
@jellyfin-bot jellyfin-bot removed the merge conflict Conflicts prevent merging label Oct 7, 2022
@nielsvanvelzen nielsvanvelzen merged commit ee97639 into jellyfin:master Oct 7, 2022
@nielsvanvelzen nielsvanvelzen deleted the gsonserializer branch October 7, 2022 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
refactor Improvements to code realiability, readability and quality
Projects
None yet
Milestone
v0.15.0
Development

Successfully merging this pull request may close these issues.
2 participants
@nielsvanvelzen @jellyfin-bot