Mastodon/mastodon-app-ufficiale-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in post language selector once again

Browse Source
This commit is contained in:
Grishka 2024-02-20 00:39:58 +03:00
parent 8dffbff97c
commit b1e999cc9c
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ public class SettingsBehaviorFragment extends BaseSettingsFragment<Void>{
protected void doLoadData(int offset, int count){} protected void doLoadData(int offset, int count){}
private void onDefaultLanguageClick(ListItem<?> item){ private void onDefaultLanguageClick(ListItem<?> item){
ComposeLanguageAlertViewController vc=new ComposeLanguageAlertViewController(getActivity(), null, new ComposeLanguageAlertViewController.SelectedOption(-1, postLanguage), null); ComposeLanguageAlertViewController vc=new ComposeLanguageAlertViewController(getActivity(), null, new ComposeLanguageAlertViewController.SelectedOption(-1, postLanguage, null), null);
new M3AlertDialogBuilder(getActivity()) new M3AlertDialogBuilder(getActivity())
.setTitle(R.string.default_post_language) .setTitle(R.string.default_post_language)
.setView(vc.getView()) .setView(vc.getView())

21
mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java
View File

@ -46,6 +46,7 @@ public class ComposeLanguageAlertViewController{
private List<SpecialLocaleInfo> specialLocales=new ArrayList<>(); private List<SpecialLocaleInfo> specialLocales=new ArrayList<>();
private int selectedIndex=0; private int selectedIndex=0;
private Locale selectedLocale; private Locale selectedLocale;
private Locale detectedLocale;
public ComposeLanguageAlertViewController(Context context, String preferred, SelectedOption previouslySelected, String postText){ public ComposeLanguageAlertViewController(Context context, String preferred, SelectedOption previouslySelected, String postText){
this.context=context; this.context=context;
@ -81,15 +82,22 @@ public class ComposeLanguageAlertViewController{
if(Build.VERSION.SDK_INT>=29 && !TextUtils.isEmpty(postText)){ if(Build.VERSION.SDK_INT>=29 && !TextUtils.isEmpty(postText)){
SpecialLocaleInfo detected=new SpecialLocaleInfo(); SpecialLocaleInfo detected=new SpecialLocaleInfo();
detected.displayName=context.getString(R.string.language_detecting); if(previouslySelected!=null && previouslySelected.detectedLocale!=null){
detected.enabled=false; detectedLocale=previouslySelected.detectedLocale;
detected.locale=detectedLocale;
detected.displayName=capitalizeLanguageName(detectedLocale.getDisplayName(Locale.getDefault()));
detected.title=context.getString(R.string.language_detected);
}else{
detected.displayName=context.getString(R.string.language_detecting);
detected.enabled=false;
}
specialLocales.add(detected); specialLocales.add(detected);
detectLanguage(detected, postText); detectLanguage(detected, postText);
} }
if(previouslySelected!=null){ if(previouslySelected!=null){
if(previouslySelected.index!=-1 && ((previouslySelected.index<specialLocales.size() && Objects.equals(previouslySelected.locale, specialLocales.get(previouslySelected.index).locale)) || if(previouslySelected.index!=-1 && ((previouslySelected.index<specialLocales.size() && Objects.equals(previouslySelected.locale, specialLocales.get(previouslySelected.index).locale)) ||
(previouslySelected.index<specialLocales.size()+allLocales.size() && previouslySelected.index>-1 && Objects.equals(previouslySelected.locale, allLocales.get(previouslySelected.index-specialLocales.size()).locale)))){ (previouslySelected.index<specialLocales.size()+allLocales.size() && previouslySelected.index>=specialLocales.size() && Objects.equals(previouslySelected.locale, allLocales.get(previouslySelected.index-specialLocales.size()).locale)))){
selectedIndex=previouslySelected.index; selectedIndex=previouslySelected.index;
selectedLocale=previouslySelected.locale; selectedLocale=previouslySelected.locale;
}else{ }else{
@ -174,6 +182,7 @@ public class ComposeLanguageAlertViewController{
info.displayName=context.getString(R.string.language_cant_detect); info.displayName=context.getString(R.string.language_cant_detect);
}else{ }else{
Locale locale=lang.getLocale(0).toLocale(); Locale locale=lang.getLocale(0).toLocale();
detectedLocale=locale;
info.locale=locale; info.locale=locale;
info.displayName=capitalizeLanguageName(locale.getDisplayName(Locale.getDefault())); info.displayName=capitalizeLanguageName(locale.getDisplayName(Locale.getDefault()));
info.title=context.getString(R.string.language_detected); info.title=context.getString(R.string.language_detected);
@ -197,7 +206,7 @@ public class ComposeLanguageAlertViewController{
} }
public SelectedOption getSelectedOption(){ public SelectedOption getSelectedOption(){
return new SelectedOption(selectedIndex, selectedLocale); return new SelectedOption(selectedIndex, selectedLocale, detectedLocale);
} }
private void selectItem(int index){ private void selectItem(int index){
@ -343,12 +352,14 @@ public class ComposeLanguageAlertViewController{
public static class SelectedOption{ public static class SelectedOption{
public int index; public int index;
public Locale locale; public Locale locale;
public Locale detectedLocale;
public SelectedOption(){} public SelectedOption(){}
public SelectedOption(int index, Locale locale){ public SelectedOption(int index, Locale locale, Locale detectedLocale){
this.index=index; this.index=index;
this.locale=locale; this.locale=locale;
this.detectedLocale=detectedLocale;
} }
} }
} }