From 2a4c9f0fcb2865f0f631e9ed45641a20bfffe76f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 9 Feb 2021 10:06:40 +0100
Subject: [PATCH] sort "new" app entries based on lastUpdate time of Repo

https://gitlab.com/fdroid/fdroidclient/-/issues/939#note_504169741
---
 .../fdroid/fdroid/views/categories/AppCardController.java  | 6 ++----
 .../org/fdroid/fdroid/views/main/LatestViewBinder.java     | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
index 2d7a09bb2..138427e6f 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
@@ -1,20 +1,18 @@
 package org.fdroid.fdroid.views.categories;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Pair;
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
-
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.App;
@@ -33,7 +31,7 @@ public class AppCardController extends RecyclerView.ViewHolder
     /**
      * After this many days, don't consider showing the "New" tag next to an app.
      */
-    private static final int DAYS_TO_CONSIDER_NEW = 14;
+    public static final int DAYS_TO_CONSIDER_NEW = 14;
 
     @NonNull
     private final ImageView icon;
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java
index a53315ce6..685136b84 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/LatestViewBinder.java
@@ -25,8 +25,10 @@ import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.data.RepoProvider;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols;
+import org.fdroid.fdroid.data.Schema.RepoTable;
 import org.fdroid.fdroid.panic.HidingManager;
 import org.fdroid.fdroid.views.apps.AppListActivity;
+import org.fdroid.fdroid.views.categories.AppCardController;
 
 import java.util.Date;
 
@@ -134,7 +136,10 @@ class LatestViewBinder implements LoaderManager.LoaderCallbacks<Cursor> {
                         + "        AND " + table + "." + Cols.TV_BANNER + " IS NULL"
                         + "        THEN 1 ELSE 0 END"
                         + ", CASE WHEN date(" + added + ")  >= date(" + lastUpdated + ")"
-                        + "        AND date('now','-7 days') < date(" + lastUpdated + ")"
+                        + "        AND date((SELECT " + RepoTable.Cols.LAST_UPDATED + " FROM " + RepoTable.NAME
+                        + "                  WHERE _id=" + table + "." + Cols.REPO_ID
+                        + "                  ),'-" + AppCardController.DAYS_TO_CONSIDER_NEW + " days') "
+                        + "          < date(" + lastUpdated + ")"
                         + "        THEN 0 ELSE 1 END"
                         + ", " + table + "." + Cols.WHATSNEW + " IS NULL ASC"
                         + ", " + lastUpdated + " DESC"