From ed1d9165e15808bb672ec69ab0f34de6dd811382 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 16 Dec 2022 02:14:06 +0100
Subject: [PATCH] use default posting language from server

---
 .../org/joinmastodon/android/fragments/ComposeFragment.java  | 5 ++++-
 1 file changed, 4 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 e2c39a0a1..a38304a5d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -672,7 +672,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		languageButton.setOnTouchListener(languagePopup.getDragToOpenListener());
 		languageButton.setOnClickListener(v->languagePopup.show());
 
-		updateLanguage(languageResolver.getDefault());
+		Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences;
+		updateLanguage(prefs != null && prefs.postingDefaultLanguage != null && prefs.postingDefaultLanguage.length() > 0
+				? languageResolver.from(prefs.postingDefaultLanguage)
+				: languageResolver.getDefault());
 
 		Menu languageMenu = languagePopup.getMenu();
 		for (String recentLanguage : Optional.ofNullable(recentLanguages.get(accountID)).orElse(defaultRecentLanguages)) {