Use ZonedDateTime instead of Calendar where possible.

Author: Isira-Seneviratne

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

@@ -0,0 +1,6 @@
+package org.schabi.newpipe.ktx
+
+import java.time.ZonedDateTime
+import java.util.Date
+
+fun ZonedDateTime.toLegacyDate(): Date = Date.from(toInstant())

app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt

@@ -7,6 +7,9 @@ import io.reactivex.Flowable
 import io.reactivex.Maybe
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.ZonedDateTime
 import java.util.Calendar
 import java.util.Date
 import org.schabi.newpipe.MainActivity.DEBUG
@@ -17,6 +20,7 @@ import org.schabi.newpipe.database.feed.model.FeedLastUpdatedEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.extractor.stream.StreamType
+import org.schabi.newpipe.ktx.toLegacyDate
 import org.schabi.newpipe.local.subscription.FeedGroupIcon
 
 class FeedDatabaseManager(context: Context) {
@@ -29,13 +33,8 @@ class FeedDatabaseManager(context: Context) {
         /**
          * Only items that are newer than this will be saved.
          */
-        val FEED_OLDEST_ALLOWED_DATE: Calendar = Calendar.getInstance().apply {
-            add(Calendar.WEEK_OF_YEAR, -13)
-            set(Calendar.HOUR_OF_DAY, 0)
-            set(Calendar.MINUTE, 0)
-            set(Calendar.SECOND, 0)
-            set(Calendar.MILLISECOND, 0)
-        }
+        val FEED_OLDEST_ALLOWED_DATE: ZonedDateTime =
+                LocalDate.now().minusWeeks(13).atStartOfDay(ZoneId.systemDefault())
     }
 
     fun groups() = feedGroupTable.getAll()
@@ -73,7 +72,7 @@ class FeedDatabaseManager(context: Context) {
     fun upsertAll(
         subscriptionId: Long,
         items: List<StreamInfoItem>,
-        oldestAllowedDate: Date = FEED_OLDEST_ALLOWED_DATE.time
+        oldestAllowedDate: Date = FEED_OLDEST_ALLOWED_DATE.toLegacyDate()
     ) {
         val itemsToInsert = ArrayList<StreamInfoItem>()
         loop@ for (streamItem in items) {
@@ -99,7 +98,7 @@ class FeedDatabaseManager(context: Context) {
         feedTable.setLastUpdatedForSubscription(FeedLastUpdatedEntity(subscriptionId, Calendar.getInstance().time))
     }
 
-    fun removeOrphansOrOlderStreams(oldestAllowedDate: Date = FEED_OLDEST_ALLOWED_DATE.time) {
+    fun removeOrphansOrOlderStreams(oldestAllowedDate: Date = FEED_OLDEST_ALLOWED_DATE.toLegacyDate()) {
         feedTable.unlinkStreamsOlderThan(oldestAllowedDate)
         streamTable.deleteOrphans()
     }

app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt

@@ -41,7 +41,7 @@ import io.reactivex.functions.Function
 import io.reactivex.processors.PublishProcessor
 import io.reactivex.schedulers.Schedulers
 import java.io.IOException
-import java.util.Calendar
+import java.time.ZonedDateTime
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
@@ -53,6 +53,7 @@ import org.schabi.newpipe.database.feed.model.FeedGroupEntity
 import org.schabi.newpipe.extractor.ListInfo
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
+import org.schabi.newpipe.ktx.toLegacyDate
 import org.schabi.newpipe.local.feed.FeedDatabaseManager
 import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.ErrorResultEvent
 import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.IdleEvent
@@ -172,9 +173,8 @@ class FeedLoadService : Service() {
     private fun startLoading(groupId: Long = FeedGroupEntity.GROUP_ALL_ID, useFeedExtractor: Boolean, thresholdOutdatedSeconds: Int) {
         feedResultsHolder = ResultsHolder()
 
-        val outdatedThreshold = Calendar.getInstance().apply {
-            add(Calendar.SECOND, -thresholdOutdatedSeconds)
-        }.time
+        val outdatedThreshold = ZonedDateTime.now().minusSeconds(thresholdOutdatedSeconds.toLong())
+                .toLegacyDate()
 
         val subscriptions = when (groupId) {
             FeedGroupEntity.GROUP_ALL_ID -> feedDatabaseManager.outdatedSubscriptions(outdatedThreshold)