Skip to content
Snippets Groups Projects
Verified Commit 65a461a0 authored by Julian Dehm's avatar Julian Dehm
Browse files

Reset Localizer on account deletion

parent a44a68f2
No related branches found
No related tags found
No related merge requests found
......@@ -20,10 +20,12 @@ public class Localizer {
// Locking: class
@Nullable
private static Localizer INSTANCE;
private final Locale systemLocale;
@Nullable
private final Locale locale;
private volatile Locale locale;
private Localizer(SharedPreferences sharedPreferences) {
systemLocale = Locale.getDefault();
locale = getLocaleFromTag(
sharedPreferences.getString(LANGUAGE, "default"));
}
......@@ -39,6 +41,11 @@ public class Localizer {
return INSTANCE;
}
// Reset to the system locale
public synchronized void reset() {
locale = systemLocale;
}
// Get Locale from BCP-47 tag
@Nullable
public static Locale getLocaleFromTag(String tag) {
......
......@@ -13,6 +13,7 @@ import android.widget.EditText;
import android.widget.ProgressBar;
import org.briarproject.briar.R;
import org.briarproject.briar.android.Localizer;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BaseActivity;
import org.briarproject.briar.android.controller.BriarController;
......@@ -105,6 +106,7 @@ public class PasswordActivity extends BaseActivity {
private void deleteAccount() {
passwordController.deleteAccount(this);
Localizer.getInstance().reset();
setResult(RESULT_CANCELED);
Intent i = new Intent(this, SetupActivity.class);
i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment