FIX - Ashok - Fixed even if the formsection name and field name are e…

…mpty
arjunk · Feb 15, 2013 · bdd31a1 · bdd31a1
1 parent dae9326
commit bdd31a1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/forms/FormField.java b/RapidFTR-Android/src/main/java/com/rapidftr/forms/FormField.java
@@ -53,8 +53,10 @@ public List<String> getLocalizedOptionStrings(){
     }
 
     private String getLocalized(Map<String, String> valueMap) {
-        if(valueMap != null)
-            return valueMap.get(Locale.getDefault().getLanguage()) != null ? valueMap.get(Locale.getDefault().getLanguage()) : valueMap.get(RapidFtrApplication.getDefaultLocale());
+        if(valueMap != null) {
+            String value = valueMap.get(Locale.getDefault().getLanguage());
+            return (value == null || "".equals(value)) ? valueMap.get(RapidFtrApplication.getDefaultLocale()) : value;
+        }
         return null;
     }
 

diff --git a/RapidFTR-Android/src/main/java/com/rapidftr/forms/FormSection.java b/RapidFTR-Android/src/main/java/com/rapidftr/forms/FormSection.java
@@ -36,8 +36,10 @@ public String getLocalizedHelpText() {
     }
 
     private String getLocalized(Map<String, String> valueMap) {
-        if(valueMap != null)
-            return valueMap.get(Locale.getDefault().getLanguage()) != null ? valueMap.get(Locale.getDefault().getLanguage()) : valueMap.get(RapidFtrApplication.getDefaultLocale());
+        if(valueMap != null){
+            String value = valueMap.get(Locale.getDefault().getLanguage());
+            return (value == null || "".equals(value)) ? valueMap.get(RapidFtrApplication.getDefaultLocale()) : value ;
+        }
         return null;
     }