From 3d9a68c1e3a3e833c7fc4423a7b6e74f5096b4e0 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Sat, 6 Feb 2021 00:19:15 +0100
Subject: [PATCH] rename AppProvider "Recently Updated" to "Latest Tab"
This is only used for the Latest Tab, so it should be named accordingly.
---
.../org/fdroid/fdroid/data/AppProvider.java | 24 ++++++++++++-------
.../fdroid/views/main/WhatsNewViewBinder.java | 5 +++-
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
index 513530ede..e52cc35c1 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
@@ -6,10 +6,10 @@ import android.content.Context;
import android.content.UriMatcher;
import android.database.Cursor;
import android.net.Uri;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.Schema.ApkAntiFeatureJoinTable;
@@ -446,7 +446,7 @@ public class AppProvider extends FDroidProvider {
private static final String PATH_SEARCH_REPO = "searchRepo";
protected static final String PATH_APPS = "apps";
protected static final String PATH_SPECIFIC_APP = "app";
- private static final String PATH_RECENTLY_UPDATED = "recentlyUpdated";
+ private static final String PATH_LATEST_TAB = "recentlyUpdated";
private static final String PATH_CATEGORY = "category";
private static final String PATH_REPO = "repo";
private static final String PATH_HIGHEST_PRIORITY = "highestPriority";
@@ -459,8 +459,8 @@ public class AppProvider extends FDroidProvider {
private static final int INSTALLED = CAN_UPDATE + 1;
private static final int SEARCH_TEXT = INSTALLED + 1;
private static final int SEARCH_TEXT_AND_CATEGORIES = SEARCH_TEXT + 1;
- private static final int RECENTLY_UPDATED = SEARCH_TEXT_AND_CATEGORIES + 1;
- private static final int CATEGORY = RECENTLY_UPDATED + 1;
+ private static final int LATEST_TAB = SEARCH_TEXT_AND_CATEGORIES + 1;
+ private static final int CATEGORY = LATEST_TAB + 1;
private static final int CALC_SUGGESTED_APKS = CATEGORY + 1;
private static final int REPO = CALC_SUGGESTED_APKS + 1;
private static final int SEARCH_REPO = REPO + 1;
@@ -473,7 +473,7 @@ public class AppProvider extends FDroidProvider {
MATCHER.addURI(getAuthority(), null, CODE_LIST);
MATCHER.addURI(getAuthority(), PATH_CALC_SUGGESTED_APKS, CALC_SUGGESTED_APKS);
MATCHER.addURI(getAuthority(), PATH_CALC_SUGGESTED_APKS + "/*", CALC_SUGGESTED_APKS);
- MATCHER.addURI(getAuthority(), PATH_RECENTLY_UPDATED, RECENTLY_UPDATED);
+ MATCHER.addURI(getAuthority(), PATH_LATEST_TAB, LATEST_TAB);
MATCHER.addURI(getAuthority(), PATH_CATEGORY + "/*", CATEGORY);
MATCHER.addURI(getAuthority(), PATH_SEARCH + "/*/*", SEARCH_TEXT_AND_CATEGORIES);
MATCHER.addURI(getAuthority(), PATH_SEARCH + "/*", SEARCH_TEXT);
@@ -492,8 +492,14 @@ public class AppProvider extends FDroidProvider {
return Uri.parse("content://" + getAuthority());
}
- public static Uri getRecentlyUpdatedUri() {
- return Uri.withAppendedPath(getContentUri(), PATH_RECENTLY_UPDATED);
+ /**
+ * Get entries that are sorted by the {@link Schema.AppMetadataTable.Cols#LAST_UPDATED}
+ * date.
+ *
+ * @see #LATEST_TAB
+ */
+ public static Uri getLatestTabUri() {
+ return Uri.withAppendedPath(getContentUri(), PATH_LATEST_TAB);
}
private static Uri calcSuggestedApksUri() {
@@ -845,7 +851,7 @@ public class AppProvider extends FDroidProvider {
includeSwap = false;
break;
- case RECENTLY_UPDATED:
+ case LATEST_TAB:
String table = getTableName();
String isNew = table + "." + Cols.LAST_UPDATED + " <= " + table + "." + Cols.ADDED + " DESC";
String hasFeatureGraphic = table + "." + Cols.FEATURE_GRAPHIC + " IS NULL ASC ";
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
index d223d284e..bc3f0029c 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
@@ -95,6 +95,9 @@ class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks<Cursor> {
activity.getSupportLoaderManager().initLoader(LOADER_ID, null, this);
}
+ /**
+ * @see AppProvider#getLatestTabUri()
+ */
@NonNull
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
@@ -124,7 +127,7 @@ class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks<Cursor> {
return new CursorLoader(
activity,
- AppProvider.getRecentlyUpdatedUri(),
+ AppProvider.getLatestTabUri(),
AppMetadataTable.Cols.ALL,
selection,
null,