From 60d4e4d396d8a3ef0b5a5c287be8db24d9ccfaa9 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 9 Dec 2022 21:15:11 +0100
Subject: [PATCH] use default posting language

---
 .../org/joinmastodon/android/fragments/ComposeFragment.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 5260c0b6a..28099726b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -679,11 +679,15 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		languageButton.setCompoundDrawableTintList(languageButton.getTextColors());
 		languageButton.setCompoundDrawablePadding(V.dp(6));
 
-		updateLanguage(Locale.getDefault());
 		languagePopup=new PopupMenu(getActivity(), languageButton);
 		languageButton.setOnTouchListener(languagePopup.getDragToOpenListener());
 		languageButton.setOnClickListener(v->languagePopup.show());
 
+		Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences;
+		String defaultLang = prefs != null ? prefs.postingDefaultLanguage : null;
+		if (defaultLang != null) updateLanguage(defaultLang);
+		else updateLanguage(Locale.getDefault());
+
 		Menu languageMenu = languagePopup.getMenu();
 
 		for (String recentLanguage : GlobalUserPreferences.recentLanguages) {