Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't match space, since it deletes properties

Browse source 
It is dangerous to use (.*), because it matches several properties within the same line.
For example
"@drawable/(.*)"
matches
"@drawable/icon" android:label="@string/app_name"
thus android:label="@string/app_name" will be removed, leading to this issue:
https://groups.google.com/forum/#!topic/osmand/g05wYLexF00
This commit is contained in:
Zahnstocher 2014-07-16 15:13:19 +02:00
parent 0d06d93503
commit 7ce0e98747
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/build.xml
View file

@ -78,7 +78,7 @@
<then> <then>
<property name="package.name" value="net.osmand.sherpafy" /> <property name="package.name" value="net.osmand.sherpafy" />
<property name="app.name" value="Sherpafy" /> <property name="app.name" value="Sherpafy" />
<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_sherpafy"' byline="true" /> <replaceregexp file="AndroidManifest.xml" match='"@drawable/([^\s]*)"' replace='"@drawable/icon_sherpafy"' byline="true" />
</then> </then>
</if> </if>
<if> <if>
@ -88,7 +88,7 @@
<then> <then>
<property name="package.name" value="net.osmand" /> <property name="package.name" value="net.osmand" />
<property name="app.name" value="OsmAnd" /> <property name="app.name" value="OsmAnd" />
<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon_free"' byline="true" /> <replaceregexp file="AndroidManifest.xml" match='"@drawable/([^\s]*)"' replace='"@drawable/icon_free"' byline="true" />
</then> </then>
</if> </if>
<if> <if>
@ -98,7 +98,7 @@
<then> <then>
<property name="package.name" value="net.osmand.plus" /> <property name="package.name" value="net.osmand.plus" />
<property name="app.name" value="OsmAnd+" /> <property name="app.name" value="OsmAnd+" />
<replaceregexp file="AndroidManifest.xml" match='"@drawable/(.*)"' replace='"@drawable/icon"' byline="true" /> <replaceregexp file="AndroidManifest.xml" match='"@drawable/([^\s]*)"' replace='"@drawable/icon"' byline="true" />
</then> </then>
</if> </if>
<if> <if>