From 7732c1e7b16f0e34716f0da05319f1ec9be565c5 Mon Sep 17 00:00:00 2001
From: max-klaus <alex.morozov.osm@gmail.com>
Date: Wed, 10 Feb 2021 10:53:21 +0300
Subject: [PATCH 1/2] Fix free version manifest

---
 OsmAnd/AndroidManifest-gplayFree.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/AndroidManifest-gplayFree.xml b/OsmAnd/AndroidManifest-gplayFree.xml
index 873848e1e9..eb06260f4e 100644
--- a/OsmAnd/AndroidManifest-gplayFree.xml
+++ b/OsmAnd/AndroidManifest-gplayFree.xml
@@ -4,7 +4,7 @@
 
     <application
         android:icon="@mipmap/icon_free"
-		android:label="@string/app_name_free"
+		android:label="@string/app_name"
         tools:replace="android:icon, android:label">
 
         <meta-data

From 1b03867e2c5439ea11628be8882498feb13deddb Mon Sep 17 00:00:00 2001
From: Kseniia <alisa.91150@gmail.com>
Date: Fri, 12 Feb 2021 10:18:47 +0200
Subject: [PATCH 2/2] fix 10789

---
 .../src/main/java/net/osmand/router/BinaryRoutePlanner.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java b/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java
index dabefe81b3..0769e1390c 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java
@@ -658,7 +658,7 @@ public class BinaryRoutePlanner {
 							break;
 						}
 					}
-					if (rv == viaId && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
+					if (rv == viaId && via && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
 						type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
 						break;
 					}
@@ -675,7 +675,7 @@ public class BinaryRoutePlanner {
 						}
 					}
 
-					if (rv == viaId && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
+					if (rv == viaId && via && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
 						type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
 						break;
 					}