Android: Fix read configuration file -> more than one interface

Author: albert-lopez

android/noroot/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.openoverlayrouter.noroot" android:versionCode="2" android:versionName="1.1">
+      package="org.openoverlayrouter.noroot" android:versionCode="3" android:versionName="1.1.1">
     <uses-sdk android:minSdkVersion="14" />
 
     <application android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar">

android/noroot/src/org/openoverlayrouter/noroot/updateConfActivity.java

@@ -128,15 +128,22 @@ public void readConfFileAndFillParameters()
 				line = line.replaceAll("\\s", "");
 
 				if (line.contains("database-mapping")){
+					int num_braces = 0;
+					if (line.contains("{")){
+						num_braces ++;
+					}
 					do{
 						sub_line = br.readLine();
 						if (sub_line.startsWith("#")){
 							sub_line = br.readLine();
 							continue;
 						}
+						if (sub_line.contains("{")){
+							num_braces ++;
+						}
+						
 						sub_line = sub_line.toLowerCase();
 						sub_line = sub_line.replaceAll("\\s", "");
-						
 						if (sub_line.contains("eid-prefix")){
 							String[] tmp 	= sub_line.split("=");
 							if (tmp.length < 2)
@@ -168,7 +175,6 @@ public void readConfFileAndFillParameters()
 								if (tmp.length < 2)
 									continue;
 								String iface_name = tmp[1];
-								
 								Iterator <String>iface_it = iface_list.iterator();
 								while (iface_it.hasNext())
 								{
@@ -180,9 +186,12 @@ public void readConfFileAndFillParameters()
 									}
 								}	
 							}
-							
 						}
-					}while (!sub_line.contains("}"));
+						
+						if (sub_line.contains("}")){
+							num_braces --;
+						}
+					}while (num_braces != 0);
 				}else if (line.contains("map-resolver")) {
 					sub_line = br.readLine();
 					if (sub_line.startsWith("#")){

android/root/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.openoverlayrouter.root" android:versionCode="2" android:versionName="1.1">
+      package="org.openoverlayrouter.root" android:versionCode="3" android:versionName="1.1.1">
     <uses-sdk android:minSdkVersion="9" />
 
     <application android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar">

android/root/src/org/openoverlayrouter/root/updateConfActivity.java

@@ -130,15 +130,22 @@ public void readConfFileAndFillParameters()
 				line = line.replaceAll("\\s", "");
 
 				if (line.contains("database-mapping")){
+					int num_braces = 0;
+					if (line.contains("{")){
+						num_braces ++;
+					}
 					do{
 						sub_line = br.readLine();
 						if (sub_line.startsWith("#")){
 							sub_line = br.readLine();
 							continue;
 						}
+						if (sub_line.contains("{")){
+							num_braces ++;
+						}
+						
 						sub_line = sub_line.toLowerCase();
 						sub_line = sub_line.replaceAll("\\s", "");
-						
 						if (sub_line.contains("eid-prefix")){
 							String[] tmp 	= sub_line.split("=");
 							if (tmp.length < 2)
@@ -170,7 +177,6 @@ public void readConfFileAndFillParameters()
 								if (tmp.length < 2)
 									continue;
 								String iface_name = tmp[1];
-								
 								Iterator <String>iface_it = iface_list.iterator();
 								while (iface_it.hasNext())
 								{
@@ -182,9 +188,12 @@ public void readConfFileAndFillParameters()
 									}
 								}	
 							}
-							
 						}
-					}while (!sub_line.contains("}"));
+						
+						if (sub_line.contains("}")){
+							num_braces --;
+						}
+					}while (num_braces != 0);
 				}else if (line.contains("map-resolver")) {
 					sub_line = br.readLine();
 					if (sub_line.startsWith("#")){