also update locale of ApplicationContext as this is neeed eg. by the core

This commit is contained in:
B. Petersen
2019-03-09 18:15:47 +01:00
parent 60aab2998a
commit 2b67413b62
3 changed files with 15 additions and 1 deletions
@@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.crypto.PRNGFixes;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobmanager.persistence.JavaJobSerializer;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.ScreenLockUtil;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.SignalProtocolLoggerProvider;
@@ -71,6 +72,13 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
initializeJobManager();
initializeIncomingMessageNotifier();
ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
try {
DynamicLanguage.setContextLocale(this, DynamicLanguage.getSelectedLocale(this));
}
catch (Exception e) {
e.printStackTrace();
}
}
@Override
@@ -8,6 +8,7 @@ import android.support.annotation.Nullable;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.DynamicLanguage;
@@ -59,6 +60,11 @@ public class AppearancePreferenceFragment extends ListSummaryPreferenceFragment
public void onStop() {
super.onStop();
getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener((ApplicationPreferencesActivity) getActivity());
// update the locale of the applicationContext so that the core gets the correct strings
// (for pending activities, the locale is updated by calling DynamicLanguage.onResume)
Context applicationContext = this.getActivity().getApplicationContext();
DynamicLanguage.setContextLocale(applicationContext, DynamicLanguage.getSelectedLocale(applicationContext));
}
public static CharSequence getSummary(Context context) {
@@ -48,7 +48,7 @@ public class DynamicLanguage {
return configuration.getLayoutDirection();
}
private static void setContextLocale(Context context, Locale selectedLocale) {
public static void setContextLocale(Context context, Locale selectedLocale) {
Configuration configuration = context.getResources().getConfiguration();
if (!configuration.locale.equals(selectedLocale)) {