From a825d4f5725960b73ebe5c0f469c38acf2ca3886 Mon Sep 17 00:00:00 2001
From: Benjamin Brahmer <info@b-brahmer.de>
Date: Fri, 11 Aug 2023 14:29:55 +0200
Subject: [PATCH] only nc26+ supported

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
---
 lib/Service/StatusService.php            |  8 ++------
 tests/Unit/Service/FolderServiceTest.php | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/Service/StatusService.php b/lib/Service/StatusService.php
index 69a621e3c0..09cea9e4a2 100644
--- a/lib/Service/StatusService.php
+++ b/lib/Service/StatusService.php
@@ -92,12 +92,8 @@ public function getUpdateTime(): int
 
         $time = 0;
 
-        [$major, $minor, $micro] = Util::getVersion();
-        
-        if ($major >= 26) {
-            $myJobList = $this->jobList->getJobsIterator(UpdaterJob::class, 1, 0);
-            $time = $myJobList->current()->getLastRun();
-        }
+        $myJobList = $this->jobList->getJobsIterator(UpdaterJob::class, 1, 0);
+        $time = $myJobList->current()->getLastRun();
         
         return $time;
     }
diff --git a/tests/Unit/Service/FolderServiceTest.php b/tests/Unit/Service/FolderServiceTest.php
index 3e7e980415..737955ff93 100644
--- a/tests/Unit/Service/FolderServiceTest.php
+++ b/tests/Unit/Service/FolderServiceTest.php
@@ -13,6 +13,8 @@
 
 namespace OCA\News\Tests\Unit\Service;
 
+use DateTime;
+use DateTimeImmutable;
 use OC\AppFramework\Utility\TimeFactory;
 use OCA\News\Db\Feed;
 use \OCA\News\Db\Folder;
@@ -48,10 +50,15 @@ class FolderServiceTest extends TestCase
     private $class;
 
     /**
-     * @var int
+     * @var DateTimeImmutable
      */
     private $time;
 
+    /**
+     * @var int
+     */
+    private $timestamp;
+
     /**
      * @var string
      */
@@ -64,12 +71,14 @@ class FolderServiceTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->time = 222;
+        $this->time = new DateTimeImmutable("now");
+        $this->timestamp = $this->time->getTimestamp();
+        
         $timeFactory = $this->getMockBuilder(TimeFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
         $timeFactory->expects($this->any())
-            ->method('getTime')
+            ->method('now')
             ->will($this->returnValue($this->time));
 
         $this->feedService = $this->getMockBuilder(FeedServiceV2::class)
@@ -192,7 +201,7 @@ public function testMarkDeleted()
     {
         $folder = new Folder();
         $folder2 = new Folder();
-        $folder2->setDeletedAt($this->time);
+        $folder2->setDeletedAt($this->timestamp);
 
         $this->mapper->expects($this->once())
             ->method('findFromUser')