commit cf466588b70f799f12277ac2b7ffe71a64393760
author Maarten Derks <maarten@fairphone.com> Mon Sep 12 12:41:01 2016 +0200
committer Teemu Hukkanen <teemu@fairphone.com> Wed Nov 23 20:27:18 2016 +0100
tree 347bb691351b8ebbb83aaf12aa603d3a07c89d62
parent 73c99b47e8a64a9d2dc68b9711ab1a482ae484f9

FPII-2368: Updater doesn't parse erase_data_warning correctly

Move parser to next tag after finding erase_data_warning.

Change-Id: If94a51f06176f9c8ca565b3a505f064858b1190c

app/src/main/AndroidManifest.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a18fabe..f88fe5c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.fairphone.updater"
-    android:versionCode="35"
-    android:versionName="35" >
+    android:versionCode="36"
+    android:versionName="36" >
 
     <uses-sdk
         android:minSdkVersion="17"

app/src/main/java/com/fairphone/updater/tools/XmlParser.java

diff --git a/app/src/main/java/com/fairphone/updater/tools/XmlParser.java b/app/src/main/java/com/fairphone/updater/tools/XmlParser.java
index d0efbf8..b4858a9 100644
--- a/app/src/main/java/com/fairphone/updater/tools/XmlParser.java
+++ b/app/src/main/java/com/fairphone/updater/tools/XmlParser.java
@@ -146,6 +146,7 @@
                 version.setVersionDependencies(readDependencies(parser));
             } else if (tagName.equals("erase_data_warning")) {
                 version.setEraseAllPartitionWarning();
+		skip(parser);
             } else {
                 skip(parser);
             }

app/src/test/resources/fp1_kitkat.xml

diff --git a/app/src/test/resources/fp1_kitkat.xml b/app/src/test/resources/fp1_kitkat.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/src/test/resources/fp1_kitkat.xml