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

Replace all left-over Date usages with java.time #3767

Merged

nielsvanvelzen merged 1 commit into jellyfin:master from nielsvanvelzen:no-date

Jul 18, 2024

Member

nielsvanvelzen commented Jul 17, 2024

sample text

Changes

Remove all left over usages of java.util.Date

Issues

nielsvanvelzen added the refactor label

nielsvanvelzen added this to the v0.17.0 milestone

github-advanced-security bot found potential problems

View reviewed changes

app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java

@@ @@ -639,12 +637,12 @@ @@
                       }
                   };
-                  public long getCurrentLocalStartDate() {
-                      return mCurrentLocalGuideStart;
+                  public LocalDateTime getCurrentLocalStartDate() {

Check notice

Code scanning / Android Lint

Unknown nullness Note

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/playback/CustomPlaybackOverlayFragment.java

                   }
-                  public long getCurrentLocalEndDate() {
-                      return mCurrentLocalGuideEnd;
+                  public LocalDateTime getCurrentLocalEndDate() {

Check notice

Code scanning / Android Lint

Unknown nullness Note

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/FriendlyDateButton.java


		public FriendlyDateButton(Context context, long thisDate, OnClickListener listener) {
		public FriendlyDateButton(Context context, LocalDateTime thisDate, OnClickListener listener) {

Check notice

Code scanning / Android Lint

Unknown nullness Note

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/FriendlyDateButton.java


		public FriendlyDateButton(Context context, long thisDate, OnClickListener listener) {
		public FriendlyDateButton(Context context, LocalDateTime thisDate, OnClickListener listener) {

Check notice

Code scanning / Android Lint

Unknown nullness Note

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/FriendlyDateButton.java


		public FriendlyDateButton(Context context, long thisDate, OnClickListener listener) {
		public FriendlyDateButton(Context context, LocalDateTime thisDate, OnClickListener listener) {

Check notice

Code scanning / Android Lint

Unknown nullness Note

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/TimeUtils.java

@@ @@ -59,12 +55,11 @@ @@
                       }
                   }
-                  public static String getFriendlyDate(Context context, Date date) {
+                  public static String getFriendlyDate(Context context, LocalDateTime date) {

Check notice

Code scanning / Android Lint

Unknown nullness Note

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/TimeUtils.java

@@ @@ -59,12 +55,11 @@ @@
                       }
                   }
-                  public static String getFriendlyDate(Context context, Date date) {
+                  public static String getFriendlyDate(Context context, LocalDateTime date) {

Check notice

Code scanning / Android Lint

Unknown nullness Note

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/TimeUtils.java

                       return getFriendlyDate(context, date, false);
                   }
-                  public static String getFriendlyDate(Context context, Date date, boolean relative) {
-                      LocalDateTime dateTime = getLocalDateTime(date);
+                  public static String getFriendlyDate(Context context, LocalDateTime dateTime, boolean relative) {

Check notice

Code scanning / Android Lint

Unknown nullness Note

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/TimeUtils.java

                       return getFriendlyDate(context, date, false);
                   }
-                  public static String getFriendlyDate(Context context, Date date, boolean relative) {
-                      LocalDateTime dateTime = getLocalDateTime(date);
+                  public static String getFriendlyDate(Context context, LocalDateTime dateTime, boolean relative) {

Check notice

Code scanning / Android Lint

Unknown nullness Note

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/TimeUtils.java

                       return getFriendlyDate(context, date, false);
                   }
-                  public static String getFriendlyDate(Context context, Date date, boolean relative) {
-                      LocalDateTime dateTime = getLocalDateTime(date);
+                  public static String getFriendlyDate(Context context, LocalDateTime dateTime, boolean relative) {

Check notice

Code scanning / Android Lint

Unknown nullness Note

Unknown nullability; explicitly declare as @Nullable or @NonNull to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations


          Replace all left-over Date usages with java.time

d9a668b

Member Author

nielsvanvelzen commented Jul 17, 2024

ugh live tv guide broken again. marking it as draft for now and gonna fix that when I have some more energy.

nielsvanvelzen marked this pull request as draft

July 17, 2024 20:12

nielsvanvelzen force-pushed the no-date branch from 81388aa to d9a668b Compare

July 17, 2024 20:13

nielsvanvelzen marked this pull request as ready for review

July 18, 2024 18:44

Member Author

nielsvanvelzen commented Jul 18, 2024

Turns out everything is fine. The date and time in my Android emulator was 2 days behind so that's why the guide didn't populate. Thanks Google for never fixing this issue.

nielsvanvelzen requested a review from crobibero

July 18, 2024 18:50

crobibero approved these changes

View reviewed changes

nielsvanvelzen merged commit 3170670 into jellyfin:master

6 checks passed

nielsvanvelzen deleted the no-date branch

August 3, 2024 19:57

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels