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

Fix issue #464 - More restrictive pattern

This commit is contained in:
Thomas 2022-11-19 11:36:50 +01:00
parent 65b353da5c
commit d06f7b4cde
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/helper/TimelineHelper.java
View File

@ -119,7 +119,7 @@ public class TimelineHelper {
if (filterKeyword.whole_word) { if (filterKeyword.whole_word) {
p = Pattern.compile(sb + "(" + Pattern.quote(filterKeyword.keyword) + ")" + eb, Pattern.CASE_INSENSITIVE); p = Pattern.compile(sb + "(" + Pattern.quote(filterKeyword.keyword) + ")" + eb, Pattern.CASE_INSENSITIVE);
} else { } else {
p = Pattern.compile("#" + Pattern.quote(filterKeyword.keyword), Pattern.CASE_INSENSITIVE); p = Pattern.compile("(" + Pattern.quote(filterKeyword.keyword) + ")", Pattern.CASE_INSENSITIVE);
} }
for (Status status : statuses) { for (Status status : statuses) {
if (status.account.id.equals(MainActivity.currentUserID)) { if (status.account.id.equals(MainActivity.currentUserID)) {

5
app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java
View File

@ -53,8 +53,10 @@ import app.fedilab.android.client.entities.api.Statuses;
import app.fedilab.android.client.entities.api.Tag; import app.fedilab.android.client.entities.api.Tag;
import app.fedilab.android.client.entities.api.Token; import app.fedilab.android.client.entities.api.Token;
import app.fedilab.android.client.entities.app.StatusCache; import app.fedilab.android.client.entities.app.StatusCache;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.helper.Helper; import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.TimelineHelper;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import retrofit2.Call; import retrofit2.Call;
@ -908,7 +910,8 @@ public class AccountsVM extends AndroidViewModel {
Response<List<Status>> bookmarksResponse = bookmarksCall.execute(); Response<List<Status>> bookmarksResponse = bookmarksCall.execute();
if (bookmarksResponse.isSuccessful()) { if (bookmarksResponse.isSuccessful()) {
statusList = bookmarksResponse.body(); statusList = bookmarksResponse.body();
statuses.statuses = statusList; // TimelineHelper.filterStatus(getApplication().getApplicationContext(), statusList, Timeline.TimeLineEnum.PUBLIC);
statuses.statuses = TimelineHelper.filterStatus(getApplication().getApplicationContext(), statusList, Timeline.TimeLineEnum.PUBLIC);
statuses.pagination = MastodonHelper.getPagination(bookmarksResponse.headers()); statuses.pagination = MastodonHelper.getPagination(bookmarksResponse.headers());
} }
} catch (Exception e) { } catch (Exception e) {