Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix search

This commit is contained in:
tom79 2019-08-19 16:33:09 +02:00
parent 4c550ea3b0
commit 2df5b95112
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
View File

@ -348,13 +348,15 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
if( statuses != null){ if( statuses != null){
statusesNew = new ArrayList<>(); statusesNew = new ArrayList<>();
for(app.fedilab.android.client.Entities.Status status: statuses){ for(app.fedilab.android.client.Entities.Status status: statuses){
if (tag != null) { if (tag != null && !tag.contains("\"")) {
String[] searches = tag.split(" "); String[] searches = tag.split(" ");
for (String search : searches) { for (String search : searches) {
if (status.getContent().contains(search) || status.getSpoiler_text().contains(search)) { if (status.getContent().contains(search) || status.getSpoiler_text().contains(search)) {
statusesNew.add(status); statusesNew.add(status);
} }
} }
}else{
statusesNew.addAll(statuses);
} }
} }
} }

2
app/src/main/java/app/fedilab/android/sqlite/TimelineCacheDAO.java
View File

@ -19,7 +19,6 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -167,7 +166,6 @@ public class TimelineCacheDAO {
String search = word.replace("\"",""); String search = word.replace("\"","");
query = new StringBuilder(Sqlite.COL_CACHE + " LIKE '%").append(search).append("%'"); query = new StringBuilder(Sqlite.COL_CACHE + " LIKE '%").append(search).append("%'");
} }
if (max_id != null) { if (max_id != null) {
c = db.query(Sqlite.TABLE_TIMELINE_CACHE, null, Sqlite.COL_INSTANCE + " = \"" + instance + "\" AND " + Sqlite.COL_USER_ID + " = \"" + userId + "\" AND " + Sqlite.COL_STATUS_ID + " < '" + max_id + "' AND " + query, null, null, null, Sqlite.COL_STATUS_ID + " DESC", "40"); c = db.query(Sqlite.TABLE_TIMELINE_CACHE, null, Sqlite.COL_INSTANCE + " = \"" + instance + "\" AND " + Sqlite.COL_USER_ID + " = \"" + userId + "\" AND " + Sqlite.COL_STATUS_ID + " < '" + max_id + "' AND " + query, null, null, null, Sqlite.COL_STATUS_ID + " DESC", "40");
return cursorToListStatus(c); return cursorToListStatus(c);