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

Crash fixes

Browse Source
This commit is contained in:
Grishka
2023-12-04 06:22:21 +03:00
parent 1f9ff8d341
commit b08cd1eb4b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1077,6 +1077,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
Editable e=mainEditText.getText(); Editable e=mainEditText.getText();
int start=e.getSpanStart(currentAutocompleteSpan); int start=e.getSpanStart(currentAutocompleteSpan);
int end=e.getSpanEnd(currentAutocompleteSpan); int end=e.getSpanEnd(currentAutocompleteSpan);
if(start==-1 || end==-1)
return;
e.replace(start, end, text+" "); e.replace(start, end, text+" ");
finishAutocomplete(); finishAutocomplete();
InputConnection conn=mainEditText.getCurrentInputConnection(); InputConnection conn=mainEditText.getCurrentInputConnection();

2
mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeAutocompleteViewController.java
View File

@@ -278,7 +278,7 @@ public class ComposeAutocompleteViewController{
@Override @Override
public void onSuccess(SearchResults result){ public void onSuccess(SearchResults result){
currentRequest=null; currentRequest=null;
if(result.hashtags.isEmpty() || (result.hashtags.size()==1 && result.hashtags.get(0).name.equals(lastText.substring(1)))) if(result.hashtags.isEmpty() || (result.hashtags.size()==1 && result.hashtags.get(0).name.equals(lastText.substring(1))) || mode!=Mode.HASHTAGS)
return; return;
List<Hashtag> oldList=hashtags; List<Hashtag> oldList=hashtags;
hashtags=result.hashtags; hashtags=result.hashtags;