Merge pull request #10957 from osmandapp/master

update test branch

OsmAnd-java/src/main/java/net/osmand/osm/io/OsmBaseStorage.java

@@ -183,7 +183,7 @@ public class OsmBaseStorage {
 	protected static final int moduleProgress = 1 << 10;
 	
 	public void startElement(XmlPullParser parser, String name)  {
-		if(!parseStarted){
+		if (!parseStarted) {
 			initRootElement(parser, name);
 		}
 		if (ELEM_MODIFY.equals(name) ) {
@@ -283,13 +283,14 @@ public class OsmBaseStorage {
 		if (type != null) {
 			if(currentParsedEntity != null){
 				EntityId entityId = new EntityId(type, currentParsedEntity.getId());
-				if(acceptEntityToLoad(entityId, currentParsedEntity)){
+				if (acceptEntityToLoad(entityId, currentParsedEntity)) {
 					Entity oldEntity = entities.put(entityId, currentParsedEntity);
-					if(parseEntityInfo && currentParsedEntityInfo != null){
+					if (parseEntityInfo && currentParsedEntityInfo != null) {
 						entityInfo.put(entityId, currentParsedEntityInfo);
 					}
-					if(!supressWarnings && oldEntity!= null){
-						throw new UnsupportedOperationException("Entity with id=" + oldEntity.getId() +" is duplicated in osm map"); //$NON-NLS-1$ //$NON-NLS-2$
+					if (!supressWarnings && oldEntity != null) {
+						throw new UnsupportedOperationException(
+								"Entity with id=" + oldEntity.getId() + " is duplicated in osm map"); //$NON-NLS-1$ //$NON-NLS-2$
 					}
 				} else {
 //					System.gc();
@@ -308,8 +309,8 @@ public class OsmBaseStorage {
 	
 	
 	protected boolean acceptEntityToLoad(EntityId entityId, Entity entity) {
-		for(IOsmStorageFilter f : filters){
-			if(!f.acceptEntityToLoad(this, entityId, entity)){
+		for (IOsmStorageFilter f : filters) {
+			if (!f.acceptEntityToLoad(this, entityId, entity)) {
 				return false;
 			}
 		}

OsmAnd/build-common.gradle

@@ -106,6 +106,14 @@ android {
 	}
 }
 
+clean.doFirst {
+	delete fileTree('assets') {
+		include '*.obf'
+		include 'fonts/**'
+		include 'feature_articles/**'
+		include 'voice/**'
+	}
+}
 
 task validateTranslate {
 	println "Validating translations"
@@ -126,9 +134,15 @@ task validateTranslate {
 	}
 }
 
+task downloadDefaultWikivoyage {
+	doLast {
+		ant.get(src: 'https://builder.osmand.net/wikivoyage-gen/sqlite/Default_wikivoyage_2.travel.obf', dest: 'assets/Default_wikivoyage.travel.obf', skipexisting: 'true')
+	}
+}
+
 task downloadWorldMiniBasemap {
 	doLast {
-		ant.get(src: 'http://builder.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true')
+		ant.get(src: 'https://builder.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true')
 	}
 }
 
@@ -254,7 +268,8 @@ task collectExternalResources {
 			copyWidgetIconsHdpi,
 			copyWidgetIconsXhdpi,
 			copyPoiCategories,
-			downloadWorldMiniBasemap
+			downloadWorldMiniBasemap,
+			downloadDefaultWikivoyage
 }
 
 // Legacy core build

OsmAnd/res/layout/two_line_with_images_list_item.xml

@@ -100,7 +100,7 @@
             android:paddingRight="@dimen/bottom_sheet_exit_button_margin"
             android:text="@string/buy"
             android:textColor="@color/text_color_tab_active_light"
-            android:visibility="visible" />
+            android:visibility="gone" />
 
     </LinearLayout>