From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 3 Jul 2013 14:30:44 +0000 (+0200)
Subject: android: Use explicit locale when converting settings names
X-Git-Tag: 5.1.0dr2~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9f94d7efbccb3c0cdd5587127eace05c3085cd6;p=thirdparty%2Fstrongswan.git

android: Use explicit locale when converting settings names

Apparently, these functions use the user's default locale which might not
yield the expected result (e.g. lowercase I is not i in the Turkish
locale but ı instead).
---

diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/SettingsCollector.java b/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/SettingsCollector.java
index 3f6bcff6f0..658c2daea0 100644
--- a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/SettingsCollector.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/SettingsCollector.java
@@ -17,6 +17,8 @@
 
 package org.strongswan.android.logic.imc.collectors;
 
+import java.util.Locale;
+
 import org.strongswan.android.logic.imc.attributes.Attribute;
 import org.strongswan.android.logic.imc.attributes.SettingsAttribute;
 
@@ -44,10 +46,10 @@ public class SettingsCollector implements Collector
 		SettingsAttribute attribute = new SettingsAttribute();
 		for (String name : mSettings)
 		{
-			String value = android.provider.Settings.Secure.getString(mContentResolver, name.toLowerCase());
+			String value = android.provider.Settings.Secure.getString(mContentResolver, name.toLowerCase(Locale.US));
 			if (value == null)
 			{
-				value = android.provider.Settings.System.getString(mContentResolver, name.toLowerCase());
+				value = android.provider.Settings.System.getString(mContentResolver, name.toLowerCase(Locale.US));
 			}
 			if (value != null)
 			{