From 90e14cc691f1ca28ef27b137cb7650a209b079fb Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Wed, 30 Jan 2019 12:34:51 +0200
Subject: [PATCH 1/2] Bugfix - Remove the close button for the layer
 transparency seekbar #6485 - fixed

---
 OsmAnd/res/layout-land/map_hud_bottom.xml              | 8 --------
 OsmAnd/res/layout/map_hud_bottom.xml                   | 8 --------
 OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java | 9 ---------
 3 files changed, 25 deletions(-)

diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index 680be73185..53cdff7392 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -183,14 +183,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"/>
 
-                <ImageButton
-                    android:id="@+id/map_transparency_hide"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:background="@drawable/btn_circle_transparent"
-                    android:contentDescription="@string/shared_string_hide"
-                    android:src="@drawable/headliner_close"/>
             </LinearLayout>
             
                	<ProgressBar
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 143794a913..3556cf3998 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -103,14 +103,6 @@
                 android:paddingLeft="6dp"
                 android:paddingRight="6dp"/>
 
-            <ImageButton
-                android:id="@+id/map_transparency_hide"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/btn_circle_transparent"
-                android:contentDescription="@string/shared_string_hide"
-                android:src="@drawable/headliner_close"/>
         </LinearLayout>
 
         <LinearLayout
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index cdd4319afb..372b104acb 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -925,15 +925,6 @@ public class MapControlsLayer extends OsmandMapLayer {
 				}
 			}
 		});
-		ImageButton imageButton = (ImageButton) mapActivity.findViewById(R.id.map_transparency_hide);
-		imageButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				transparencyBarLayout.setVisibility(View.GONE);
-				settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.set(LayerTransparencySeekbarMode.OFF);
-				hideTransparencyBar(transparencySetting);
-			}
-		});
 
 		LayerTransparencySeekbarMode seekbarMode = settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.get();
 		if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {

From c634526458346a5f63d6bbb9d45a692b1c5af702 Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Wed, 30 Jan 2019 13:59:43 +0200
Subject: [PATCH 2/2] bugfix - OsmAnd Live reporting that there is no update
 available. #6201

---
 .../src/net/osmand/plus/resources/IncrementalChangesManager.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java b/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
index 880526d709..85ee219a99 100644
--- a/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
+++ b/OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
@@ -299,6 +299,7 @@ public class IncrementalChangesManager {
 			XmlPullParserException {
 		String url = URL + "?aosmc=true&timestamp=" + timestamp + "&file=" + URLEncoder.encode(file);
 		HttpURLConnection conn = NetworkUtils.getHttpURLConnection(url);
+		conn.setUseCaches(false);
 		XmlPullParser parser = PlatformUtil.newXMLPullParser();
 		parser.setInput(conn.getInputStream(), "UTF-8");
 		List<IncrementalUpdate> lst = new ArrayList<IncrementalUpdate>();