owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix "go to account" in search

Browse Source
This commit is contained in:
Grishka
2023-11-25 03:35:21 +03:00
parent 957bc76dbb
commit 723853079e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
View File

@@ -102,11 +102,11 @@ public class MainActivity extends FragmentStackActivity{
session=AccountSessionManager.get(accountID); session=AccountSessionManager.get(accountID);
if(session==null || !session.activated) if(session==null || !session.activated)
return; return;
openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false); openSearchQuery(uri.toString(), session.getID(), R.string.opening_link, false, null);
} }
public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch){ public void openSearchQuery(String q, String accountID, int progressText, boolean fromSearch, GetSearchResults.Type type){
new GetSearchResults(q, null, true, null, 0, 0) new GetSearchResults(q, type, true, null, 0, 0)
.setCallback(new Callback<>(){ .setCallback(new Callback<>(){
@Override @Override
public void onSuccess(SearchResults result){ public void onSuccess(SearchResults result){

2
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
View File

@@ -408,7 +408,7 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
if(q.lastIndexOf('@')==0){ if(q.lastIndexOf('@')==0){
q+="@"+AccountSessionManager.get(accountID).domain; q+="@"+AccountSessionManager.get(accountID).domain;
} }
((MainActivity)getActivity()).openSearchQuery(q, accountID, R.string.loading, true); ((MainActivity)getActivity()).openSearchQuery(q, accountID, R.string.loading, true, GetSearchResults.Type.ACCOUNTS);
} }
private void onGoToStatusSearchClick(ListItem<?> item_){ private void onGoToStatusSearchClick(ListItem<?> item_){