Commit Diff

Commit:
d1b008786a00038f7dd1a3c33fca570064e2074b
From:
darkwolf <darkwolf@furmail.cc>
Date:
Message:
fix crash caused by language re-detection since this method occurs before the list variable is initialized, it might result in receiving a null value.
Actions:
Patch | Tree
commit - 0fc8f55245c848c70afc4bd8a59154b57819993c
commit + d1b008786a00038f7dd1a3c33fca570064e2074b
blob - bd7073885126a80617b5ee3d61e261282f5a081f
blob + d5dd83fd8b3c429ffd0ee49353e7d6445df72d23
--- mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java
+++ mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java
@@ -84,14 +84,6 @@ public class ComposeLanguageAlertViewController{
 			));
 		}
 
-		if(Build.VERSION.SDK_INT>=29 && !TextUtils.isEmpty(postText)){
-			SpecialLocaleInfo detected=new SpecialLocaleInfo();
-			detected.displayName=context.getString(R.string.language_detecting);
-			detected.enabled=false;
-			specialLocales.add(detected);
-			detectLanguage(detected, postText);
-		}
-
 		AccountLocalPreferences lp=session==null ? null : session.getLocalPreferences();
 		if(lp!=null){
 			for(String tag : lp.recentLanguages){
@@ -181,6 +173,14 @@ public class ComposeLanguageAlertViewController{
 				}
 			});
 		}
+
+		if(Build.VERSION.SDK_INT>=29 && !TextUtils.isEmpty(postText)){
+			SpecialLocaleInfo detected=new SpecialLocaleInfo();
+			detected.displayName=context.getString(R.string.language_detecting);
+			detected.enabled=false;
+			specialLocales.add(detected);
+			detectLanguage(detected, postText);
+		}
 	}
 
 	@RequiresApi(api = Build.VERSION_CODES.Q)