From ef77bc0b5ddf506e7ce82f8643d390a1d9c16131 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sat, 14 Apr 2018 23:03:27 +0200
Subject: [PATCH] Make language default value non-empty

---
 .../health/openscale/gui/activities/BaseAppCompatActivity.java  | 2 +-
 android_app/app/src/main/res/values/arrays.xml                  | 2 +-
 android_app/app/src/main/res/xml/general_preferences.xml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/BaseAppCompatActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/BaseAppCompatActivity.java
index 9262727f..bf7dfa00 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/BaseAppCompatActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/BaseAppCompatActivity.java
@@ -36,7 +36,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
         String language = prefs.getString(PREFERENCE_LANGUAGE, "");
-        if (language.isEmpty()) {
+        if (language.isEmpty() || language.equals("default")) {
             return context;
         }
 
diff --git a/android_app/app/src/main/res/values/arrays.xml b/android_app/app/src/main/res/values/arrays.xml
index b1790e10..6f15d964 100644
--- a/android_app/app/src/main/res/values/arrays.xml
+++ b/android_app/app/src/main/res/values/arrays.xml
@@ -19,7 +19,7 @@
     </string-array>
 
     <string-array name="language_values">
-        <item />
+        <item>default</item>
         <item>pt-BR</item>
         <item>ca</item>
         <item>cs</item>
diff --git a/android_app/app/src/main/res/xml/general_preferences.xml b/android_app/app/src/main/res/xml/general_preferences.xml
index d89e5218..41b94de4 100644
--- a/android_app/app/src/main/res/xml/general_preferences.xml
+++ b/android_app/app/src/main/res/xml/general_preferences.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <ListPreference
-        android:defaultValue=""
+        android:defaultValue="default"
         android:entries="@array/language_entries"
         android:entryValues="@array/language_values"
         android:key="language"