Merge pull request #249 from akvo/release/2.1.0.1

Release/2.1.0.1
akvo · Jan 15, 2015 · 7c4c54b · 7c4c54b
2 parents a76b217 + c933735
commit 7c4c54b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,14 @@
 Akvo FLOW app release notes
 ===========================
 
+#ver 2.1.0.1
+Date: 15 January 2015
+
+New and noteworthy
+------------------
+* Dependent questions whose parent question allows multiple values had some hidden visibility issues. This is fixed now [#239]
+* Cascade resource's inconsistent level number caused an app crash [#246]
+
 #ver 2.1.0
 Date: 15 December 2014
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.akvo.flow"
     android:versionCode="1"
-    android:versionName="2.1.0" >
+    android:versionName="2.1.0.1" >
 
     <uses-sdk
         android:minSdkVersion="10"

diff --git a/app/src/main/java/org/akvo/flow/domain/Dependency.java b/app/src/main/java/org/akvo/flow/domain/Dependency.java
@@ -46,18 +46,18 @@ public void setAnswer(String answer) {
     }
 
     public boolean isMatch(String val) {
-        boolean isMatch = false;
-        if (answer != null) {
-            String[] tokens = answer.split("\\|");
-            for (int i = 0; i < tokens.length; i++) {
-                if (tokens[i].trim().equals(val.trim())) {
-                    isMatch = true;
-                    break;
+        if (answer == null || val == null) {
+            return answer == val;
+        }
+
+        for (String v : val.split("\\|", -1)) {
+            for (String a : answer.split("\\|", -1)) {
+                if (v.equals(a)) {
+                    return true;
                 }
             }
-        } else if (val == null) {
-            isMatch = true;
         }
-        return isMatch;
+
+        return false;
     }
 }
diff --git a/app/src/main/java/org/akvo/flow/ui/view/CascadeQuestionView.java b/app/src/main/java/org/akvo/flow/ui/view/CascadeQuestionView.java
@@ -142,7 +142,7 @@ private void addLevelView(int position, List<Node> values, int selection) {
         final TextView text = (TextView)view.findViewById(R.id.text);
         final Spinner spinner = (Spinner)view.findViewById(R.id.spinner);
 
-        text.setText(mLevels != null && mLevels.length >= position ? mLevels[position] : "");
+        text.setText(mLevels != null && mLevels.length > position ? mLevels[position] : "");
 
         // Insert a fake 'Select' value
         Node node = new Node(ID_NONE, getContext().getString(R.string.select));