Commit d06f7b4c authored by Thomas's avatar Thomas
Browse files

Fix issue #464 - More restrictive pattern

parent 65b353da

app/src/main/java/app/fedilab/android/helper/TimelineHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class TimelineHelper { 
                        if (filterKeyword.whole_word) {

                            p = Pattern.compile(sb + "(" + Pattern.quote(filterKeyword.keyword) + ")" + eb, Pattern.CASE_INSENSITIVE);

                        } 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) {

                            if (status.account.id.equals(MainActivity.currentUserID)) {

app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java

+4 −1
Original line number Diff line number Diff line
@@ -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.Token;

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.MastodonHelper;

import app.fedilab.android.helper.TimelineHelper;

import okhttp3.MultipartBody;

import okhttp3.OkHttpClient;

import retrofit2.Call;
@@ -908,7 +910,8 @@ public class AccountsVM extends AndroidViewModel { 
                    Response<List<Status>> bookmarksResponse = bookmarksCall.execute();

                    if (bookmarksResponse.isSuccessful()) {

                        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());

                    }

                } catch (Exception e) {