diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java index 82acd5ab1..7f2bb8044 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java +++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java @@ -29,7 +29,9 @@ public class GlobalUserPreferences{ public static ColorPreference color; private final static Type recentLanguagesType = new TypeToken>>() {}.getType(); + private final static Type defaultLanguagesType = new TypeToken>() {}.getType(); public static Map> recentLanguages; + public static Map defaultLanguages; private static SharedPreferences getPrefs(){ return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE); @@ -55,6 +57,7 @@ public class GlobalUserPreferences{ voteButtonForSingleChoice=prefs.getBoolean("voteButtonForSingleChoice", true); theme=ThemePreference.values()[prefs.getInt("theme", 0)]; recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>()); + defaultLanguages=fromJson(prefs.getString("defaultLanguages", "{}"), defaultLanguagesType, new HashMap<>()); color=ColorPreference.values()[prefs.getInt("color", 1)]; } @@ -72,6 +75,7 @@ public class GlobalUserPreferences{ .putBoolean("disableMarquee", disableMarquee) .putInt("theme", theme.ordinal()) .putString("recentLanguages", gson.toJson(recentLanguages)) + .putString("defaultLanguages", gson.toJson(defaultLanguages)) .putInt("color", color.ordinal()) .apply(); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java b/mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java index 2e4eb949a..6770c55b1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java +++ b/mastodon/src/main/java/org/joinmastodon/android/utils/MastodonLanguage.java @@ -93,8 +93,9 @@ public class MastodonLanguage { .orElse(fallbackLanguage); } - public MastodonLanguage getDefault() { - return from(Locale.getDefault().getLanguage()); + public MastodonLanguage getDefault(String accountID) { + + return from(Locale.getDefault().getLanguage()); } } }