From 4415598d3d203a2b6e12eefaf5b859316b711aa6 Mon Sep 17 00:00:00 2001
From: goapunk <goapunk@riseup.net>
Date: Wed, 19 Sep 2018 18:25:40 +0200
Subject: [PATCH] Respect the deprecation of updateConfiguration

---
 .../java/org/briarproject/briar/android/Localizer.java   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/Localizer.java b/briar-android/src/main/java/org/briarproject/briar/android/Localizer.java
index 6f7154d28..e2498a6c7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/Localizer.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/Localizer.java
@@ -72,13 +72,6 @@ public class Localizer {
 	public Context setLocale(Context context) {
 		Resources res = context.getResources();
 		Configuration conf = res.getConfiguration();
-		Locale currentLocale;
-		if (SDK_INT >= 24) {
-			currentLocale = conf.getLocales().get(0);
-		} else
-			currentLocale = conf.locale;
-		if (locale.equals(currentLocale))
-			return context;
 		Locale.setDefault(locale);
 		updateConfiguration(conf, locale);
 		Configuration systemConfiguration =
@@ -89,7 +82,7 @@ public class Localizer {
 		Resources.getSystem().updateConfiguration(systemConfiguration,
 				Resources.getSystem().getDisplayMetrics());
 		if (SDK_INT >= 17)
-			context.createConfigurationContext(conf);
+			return context.createConfigurationContext(conf);
 		//noinspection deprecation
 		res.updateConfiguration(conf, res.getDisplayMetrics());
 		return context;