Switch to the Java 8 Date/Time API.

app/src/main/java/org/schabi/newpipe/database/Converters.java

@@ -5,31 +5,35 @@
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.local.subscription.FeedGroupIcon;
 
-import java.util.Date;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 
 public final class Converters {
     private Converters() { }
 
     /**
-     * Convert a long value to a date.
+     * Convert a long value to a {@link OffsetDateTime}.
      *
      * @param value the long value
-     * @return the date
+     * @return the {@code OffsetDateTime}
      */
     @TypeConverter
-    public static Date fromTimestamp(final Long value) {
-        return value == null ? null : new Date(value);
+    public static OffsetDateTime offsetDateTimeFromTimestamp(final Long value) {
+        return value == null ? null : OffsetDateTime.ofInstant(Instant.ofEpochMilli(value),
+                ZoneOffset.UTC);
     }
 
     /**
-     * Convert a date to a long value.
+     * Convert a {@link OffsetDateTime} to a long value.
      *
-     * @param date the date
+     * @param offsetDateTime the {@code OffsetDateTime}
      * @return the long value
      */
     @TypeConverter
-    public static Long dateToTimestamp(final Date date) {
-        return date == null ? null : date.getTime();
+    public static Long offsetDateTimeToTimestamp(final OffsetDateTime offsetDateTime) {
+        return offsetDateTime == null ? null : offsetDateTime.withOffsetSameInstant(ZoneOffset.UTC)
+                .toInstant().toEpochMilli();
     }
 
     @TypeConverter

app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt

@@ -7,7 +7,7 @@ import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Update
 import io.reactivex.Flowable
-import java.util.Date
+import java.time.OffsetDateTime
 import org.schabi.newpipe.database.feed.model.FeedEntity
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
@@ -58,10 +58,10 @@ abstract class FeedDAO {
             INNER JOIN feed f
             ON s.uid = f.stream_id
 
-            WHERE s.upload_date < :date
+            WHERE s.upload_date < :offsetDateTime
         )
         """)
-    abstract fun unlinkStreamsOlderThan(date: Date)
+    abstract fun unlinkStreamsOlderThan(offsetDateTime: OffsetDateTime)
 
     @Query("""
         DELETE FROM feed
@@ -106,10 +106,10 @@ abstract class FeedDAO {
         INNER JOIN feed_group_subscription_join fgs
         ON fgs.subscription_id = lu.subscription_id AND fgs.group_id = :groupId
         """)
-    abstract fun oldestSubscriptionUpdate(groupId: Long): Flowable<List<Date>>
+    abstract fun oldestSubscriptionUpdate(groupId: Long): Flowable<List<OffsetDateTime>>
 
     @Query("SELECT MIN(last_updated) FROM feed_last_updated")
-    abstract fun oldestSubscriptionUpdateFromAll(): Flowable<List<Date>>
+    abstract fun oldestSubscriptionUpdateFromAll(): Flowable<List<OffsetDateTime>>
 
     @Query("SELECT COUNT(*) FROM feed_last_updated WHERE last_updated IS NULL")
     abstract fun notLoadedCount(): Flowable<Long>
@@ -135,7 +135,7 @@ abstract class FeedDAO {
 
         WHERE lu.last_updated IS NULL OR lu.last_updated < :outdatedThreshold
         """)
-    abstract fun getAllOutdated(outdatedThreshold: Date): Flowable<List<SubscriptionEntity>>
+    abstract fun getAllOutdated(outdatedThreshold: OffsetDateTime): Flowable<List<SubscriptionEntity>>
 
     @Query("""
         SELECT s.* FROM subscriptions s
@@ -148,5 +148,5 @@ abstract class FeedDAO {
 
         WHERE lu.last_updated IS NULL OR lu.last_updated < :outdatedThreshold
         """)
-    abstract fun getAllOutdatedForGroup(groupId: Long, outdatedThreshold: Date): Flowable<List<SubscriptionEntity>>
+    abstract fun getAllOutdatedForGroup(groupId: Long, outdatedThreshold: OffsetDateTime): Flowable<List<SubscriptionEntity>>
 }

app/src/main/java/org/schabi/newpipe/database/feed/model/FeedLastUpdatedEntity.kt

@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
-import java.util.Date
+import java.time.OffsetDateTime
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity.Companion.FEED_LAST_UPDATED_TABLE
 import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity.Companion.SUBSCRIPTION_ID
 import org.schabi.newpipe.database.subscription.SubscriptionEntity
@@ -25,9 +25,8 @@ data class FeedLastUpdatedEntity(
     var subscriptionId: Long,
 
     @ColumnInfo(name = LAST_UPDATED)
-    var lastUpdated: Date? = null
+    var lastUpdated: OffsetDateTime? = null
 ) {
-
     companion object {
         const val FEED_LAST_UPDATED_TABLE = "feed_last_updated"
 

app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.java

@@ -6,7 +6,7 @@
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
-import java.util.Date;
+import java.time.OffsetDateTime;
 
 import static org.schabi.newpipe.database.history.model.SearchHistoryEntry.SEARCH;
 
@@ -24,15 +24,16 @@ public class SearchHistoryEntry {
     private long id;
 
     @ColumnInfo(name = CREATION_DATE)
-    private Date creationDate;
+    private OffsetDateTime creationDate;
 
     @ColumnInfo(name = SERVICE_ID)
     private int serviceId;
 
     @ColumnInfo(name = SEARCH)
     private String search;
 
-    public SearchHistoryEntry(final Date creationDate, final int serviceId, final String search) {
+    public SearchHistoryEntry(final OffsetDateTime creationDate, final int serviceId,
+                              final String search) {
         this.serviceId = serviceId;
         this.creationDate = creationDate;
         this.search = search;
@@ -46,11 +47,11 @@ public void setId(final long id) {
         this.id = id;
     }
 
-    public Date getCreationDate() {
+    public OffsetDateTime getCreationDate() {
         return creationDate;
     }
 
-    public void setCreationDate(final Date creationDate) {
+    public void setCreationDate(final OffsetDateTime creationDate) {
         this.creationDate = creationDate;
     }
 

app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java

@@ -9,7 +9,7 @@
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 
-import java.util.Date;
+import java.time.OffsetDateTime;
 
 import static androidx.room.ForeignKey.CASCADE;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.JOIN_STREAM_ID;
@@ -37,20 +37,20 @@ public class StreamHistoryEntity {
 
     @NonNull
     @ColumnInfo(name = STREAM_ACCESS_DATE)
-    private Date accessDate;
+    private OffsetDateTime accessDate;
 
     @ColumnInfo(name = STREAM_REPEAT_COUNT)
     private long repeatCount;
 
-    public StreamHistoryEntity(final long streamUid, @NonNull final Date accessDate,
+    public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime accessDate,
                                final long repeatCount) {
         this.streamUid = streamUid;
         this.accessDate = accessDate;
         this.repeatCount = repeatCount;
     }
 
     @Ignore
-    public StreamHistoryEntity(final long streamUid, @NonNull final Date accessDate) {
+    public StreamHistoryEntity(final long streamUid, @NonNull final OffsetDateTime accessDate) {
         this(streamUid, accessDate, 1);
     }
 
@@ -62,11 +62,12 @@ public void setStreamUid(final long streamUid) {
         this.streamUid = streamUid;
     }
 
-    public Date getAccessDate() {
+    @NonNull
+    public OffsetDateTime getAccessDate() {
         return accessDate;
     }
 
-    public void setAccessDate(@NonNull final Date accessDate) {
+    public void setAccessDate(@NonNull final OffsetDateTime accessDate) {
         this.accessDate = accessDate;
     }
 

app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.kt

@@ -2,7 +2,7 @@ package org.schabi.newpipe.database.history.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
-import java.util.Date
+import java.time.OffsetDateTime
 import org.schabi.newpipe.database.stream.model.StreamEntity
 
 data class StreamHistoryEntry(
@@ -13,7 +13,7 @@ data class StreamHistoryEntry(
     val streamId: Long,
 
     @ColumnInfo(name = StreamHistoryEntity.STREAM_ACCESS_DATE)
-    val accessDate: Date,
+    val accessDate: OffsetDateTime,
 
     @ColumnInfo(name = StreamHistoryEntity.STREAM_REPEAT_COUNT)
     val repeatCount: Long
@@ -25,6 +25,6 @@ data class StreamHistoryEntry(
 
     fun hasEqualValues(other: StreamHistoryEntry): Boolean {
         return this.streamEntity.uid == other.streamEntity.uid && streamId == other.streamId &&
-                accessDate.compareTo(other.accessDate) == 0
+                accessDate.isEqual(other.accessDate)
     }
 }

app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.kt

@@ -2,26 +2,25 @@ package org.schabi.newpipe.database.stream
 
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
-import java.util.Date
+import java.time.OffsetDateTime
 import org.schabi.newpipe.database.LocalItem
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 
 class StreamStatisticsEntry(
-    @Embedded
+        @Embedded
     val streamEntity: StreamEntity,
 
-    @ColumnInfo(name = StreamHistoryEntity.JOIN_STREAM_ID)
+        @ColumnInfo(name = StreamHistoryEntity.JOIN_STREAM_ID)
     val streamId: Long,
 
-    @ColumnInfo(name = STREAM_LATEST_DATE)
-    val latestAccessDate: Date,
+        @ColumnInfo(name = STREAM_LATEST_DATE)
+    val latestAccessDate: OffsetDateTime,
 
-    @ColumnInfo(name = STREAM_WATCH_COUNT)
+        @ColumnInfo(name = STREAM_WATCH_COUNT)
     val watchCount: Long
 ) : LocalItem {
-
     fun toStreamInfoItem(): StreamInfoItem {
         val item = StreamInfoItem(streamEntity.serviceId, streamEntity.url, streamEntity.title, streamEntity.streamType)
         item.duration = streamEntity.duration

app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt

@@ -7,7 +7,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
 import io.reactivex.Flowable
-import java.util.Date
+import java.time.OffsetDateTime
 import org.schabi.newpipe.database.BasicDAO
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_ID
@@ -129,7 +129,7 @@ abstract class StreamDAO : BasicDAO<StreamEntity> {
         var textualUploadDate: String? = null,
 
         @ColumnInfo(name = StreamEntity.STREAM_UPLOAD_DATE)
-        var uploadDate: Date? = null,
+        var uploadDate: OffsetDateTime? = null,
 
         @ColumnInfo(name = StreamEntity.STREAM_IS_UPLOAD_DATE_APPROXIMATION)
         var isUploadDateApproximation: Boolean? = null,

app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.kt

@@ -6,8 +6,7 @@ import androidx.room.Ignore
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import java.io.Serializable
-import java.util.Calendar
-import java.util.Date
+import java.time.OffsetDateTime
 import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_SERVICE_ID
 import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_TABLE
 import org.schabi.newpipe.database.stream.model.StreamEntity.Companion.STREAM_URL
@@ -55,18 +54,17 @@ data class StreamEntity(
     var textualUploadDate: String? = null,
 
     @ColumnInfo(name = STREAM_UPLOAD_DATE)
-    var uploadDate: Date? = null,
+    var uploadDate: OffsetDateTime? = null,
 
     @ColumnInfo(name = STREAM_IS_UPLOAD_DATE_APPROXIMATION)
     var isUploadDateApproximation: Boolean? = null
 ) : Serializable {
-
     @Ignore
     constructor(item: StreamInfoItem) : this(
             serviceId = item.serviceId, url = item.url, title = item.name,
             streamType = item.streamType, duration = item.duration, uploader = item.uploaderName,
             thumbnailUrl = item.thumbnailUrl, viewCount = item.viewCount,
-            textualUploadDate = item.textualUploadDate, uploadDate = item.uploadDate?.date()?.time,
+            textualUploadDate = item.textualUploadDate, uploadDate = item.uploadDate?.offsetDateTime(),
             isUploadDateApproximation = item.uploadDate?.isApproximation
     )
 
@@ -75,7 +73,7 @@ data class StreamEntity(
             serviceId = info.serviceId, url = info.url, title = info.name,
             streamType = info.streamType, duration = info.duration, uploader = info.uploaderName,
             thumbnailUrl = info.thumbnailUrl, viewCount = info.viewCount,
-            textualUploadDate = info.textualUploadDate, uploadDate = info.uploadDate?.date()?.time,
+            textualUploadDate = info.textualUploadDate, uploadDate = info.uploadDate?.offsetDateTime(),
             isUploadDateApproximation = info.uploadDate?.isApproximation
     )
 
@@ -95,8 +93,7 @@ data class StreamEntity(
         if (viewCount != null) item.viewCount = viewCount as Long
         item.textualUploadDate = textualUploadDate
         item.uploadDate = uploadDate?.let {
-            DateWrapper(Calendar.getInstance().apply { time = it }, isUploadDateApproximation
-                    ?: false)
+            DateWrapper(it, isUploadDateApproximation ?: false)
         }
 
         return item

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -1527,7 +1527,7 @@ public void handleResult(@NonNull final StreamInfo info) {
 
         if (info.getUploadDate() != null) {
             videoUploadDateView.setText(Localization
-                    .localizeUploadDate(activity, info.getUploadDate().date().getTime()));
+                    .localizeUploadDate(activity, info.getUploadDate().offsetDateTime()));
             videoUploadDateView.setVisibility(View.VISIBLE);
         } else {
             videoUploadDateView.setText(null);

app/src/main/java/org/schabi/newpipe/ktx/OffsetDateTime.kt

@@ -0,0 +1,10 @@
+package org.schabi.newpipe.ktx
+
+import java.time.OffsetDateTime
+import java.time.ZoneId
+import java.util.Calendar
+import java.util.GregorianCalendar
+
+fun OffsetDateTime.toCalendar(zoneId: ZoneId = ZoneId.systemDefault()): Calendar {
+    return GregorianCalendar.from(if (zoneId != offset) atZoneSameInstant(zoneId) else toZonedDateTime())
+}

app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java

@@ -26,7 +26,8 @@
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.OnClickGesture;
 
-import java.text.DateFormat;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -69,7 +70,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     private final LocalItemBuilder localItemBuilder;
     private final ArrayList<LocalItem> localItems;
     private final HistoryRecordManager recordManager;
-    private final DateFormat dateFormat;
+    private final DateTimeFormatter dateTimeFormatter;
 
     private boolean showFooter = false;
     private boolean useGridVariant = false;
@@ -80,8 +81,8 @@ public LocalItemListAdapter(final Context context) {
         recordManager = new HistoryRecordManager(context);
         localItemBuilder = new LocalItemBuilder(context);
         localItems = new ArrayList<>();
-        dateFormat = DateFormat.getDateInstance(DateFormat.SHORT,
-                Localization.getPreferredLocale(context));
+        dateTimeFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
+                .withLocale(Localization.getPreferredLocale(context));
     }
 
     public void setSelectedListener(final OnClickGesture<LocalItem> listener) {
@@ -303,7 +304,7 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
             }
 
             ((LocalItemHolder) holder)
-                    .updateFromItem(localItems.get(position), recordManager, dateFormat);
+                    .updateFromItem(localItems.get(position), recordManager, dateTimeFormatter);
         } else if (holder instanceof HeaderFooterHolder && position == 0 && header != null) {
             ((HeaderFooterHolder) holder).view = header;
         } else if (holder instanceof HeaderFooterHolder && position == sizeConsideringHeader()