Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

if search are letters with a "." in the middle, enable packageName

Browse Source 
This makes it easy to search by Application ID aka Package Name without
affecting searches that definitely cannot be a Package Name.
This commit is contained in:
Hans-Christoph Steiner 2021-02-08 22:53:51 +01:00
parent c3c31ed033
commit 1c8a56e314
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
View File

@ -283,16 +283,33 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
if (terms.length == 0 || terms[0].equals("")) { if (terms.length == 0 || terms[0].equals("")) {
return table + "." + Cols.NAME + " COLLATE LOCALIZED "; return table + "." + Cols.NAME + " COLLATE LOCALIZED ";
} }
boolean potentialPackageName = false;
StringBuilder packageNameFirstCase = new StringBuilder();
if (terms[0].length() > 2 && terms[0].substring(1, terms[0].length() - 1).contains(".")) {
potentialPackageName = true;
packageNameFirstCase.append(String.format("%s LIKE '%%%s%%' ",
packageCol, terms[0]));
} }
StringBuilder titleCase = new StringBuilder(String.format("%s like '%%%s%%'", nameCol, terms[0])); StringBuilder titleCase = new StringBuilder(String.format("%s like '%%%s%%'", nameCol, terms[0]));
StringBuilder summaryCase = new StringBuilder(String.format("%s like '%%%s%%'", summaryCol, terms[0])); StringBuilder summaryCase = new StringBuilder(String.format("%s like '%%%s%%'", summaryCol, terms[0]));
StringBuilder packageNameCase = new StringBuilder(String.format("%s like '%%%s%%'", packageCol, terms[0]));
for (int i = 1; i < terms.length; i++) { for (int i = 1; i < terms.length; i++) {
if (potentialPackageName) {
packageNameCase.append(String.format(" and %s like '%%%s%%'", summaryCol, terms[i]));
}
titleCase.append(String.format(" and %s like '%%%s%%'", nameCol, terms[i])); titleCase.append(String.format(" and %s like '%%%s%%'", nameCol, terms[i]));
summaryCase.append(String.format(" and %s like '%%%s%%'", summaryCol, terms[i])); summaryCase.append(String.format(" and %s like '%%%s%%'", summaryCol, terms[i]));
} }
String sortOrder;
return String.format("case when %s then 1 when %s then 2 else 3 end, %s", if (packageNameCase.length() > 0) {
titleCase.toString(), summaryCase.toString(), "" sortOrder = String.format("CASE WHEN %s THEN 0 WHEN %s THEN 1 WHEN %s THEN 2 ELSE 3 END",
packageNameCase.toString(), titleCase.toString(), summaryCase.toString());
} else {
sortOrder = String.format("CASE WHEN %s THEN 1 WHEN %s THEN 2 ELSE 3 END",
titleCase.toString(), summaryCase.toString());
}
return sortOrder
+ ", " + table + "." + Cols.IS_LOCALIZED + " DESC" + ", " + table + "." + Cols.IS_LOCALIZED + " DESC"
+ ", " + table + "." + Cols.ADDED + " ASC" + ", " + table + "." + Cols.ADDED + " ASC"
+ ", " + table + "." + Cols.NAME + " IS NULL ASC" + ", " + table + "." + Cols.NAME + " IS NULL ASC"
@ -309,7 +326,6 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
+ " AND " + table + "." + Cols.PROMO_GRAPHIC + " IS NULL" + " AND " + table + "." + Cols.PROMO_GRAPHIC + " IS NULL"
+ " AND " + table + "." + Cols.TV_BANNER + " IS NULL" + " AND " + table + "." + Cols.TV_BANNER + " IS NULL"
+ " THEN 1 ELSE 0 END" + " THEN 1 ELSE 0 END"
+ ", " + table + "." + Cols.LAST_UPDATED + " DESC" + ", " + table + "." + Cols.LAST_UPDATED + " DESC";
);
} }
} }