From 0fb3d111fcef13809315c67c7323f952b19c41b9 Mon Sep 17 00:00:00 2001
From: Ichchha <ichchhamoktan07@gmail.com>
Date: Tue, 18 May 2021 12:50:49 +0545
Subject: [PATCH 1/2] added method to set app binding key

---
 .gitignore                                    |   0
 .idea/.name                                   |   0
 .idea/codeStyles/Project.xml                  |   0
 .idea/compiler.xml                            |   2 +-
 .idea/gradle.xml                              |   0
 .idea/jarRepositories.xml                     |   0
 .idea/misc.xml                                |  12 +++--
 .idea/runConfigurations.xml                   |   1 +
 .idea/vcs.xml                                 |   0
 README.md                                     |   0
 app/.gitignore                                |   0
 app/build.gradle                              |   2 -
 app/proguard-rules.pro                        |   0
 .../ExampleInstrumentedTest.java              |   0
 app/src/main/AndroidManifest.xml              |   1 +
 .../com/baato/osmnavigationapp/Constants.java |   2 +-
 .../baato/osmnavigationapp/MainActivity.java  |   3 +-
 .../drawable-v24/ic_launcher_foreground.xml   |   0
 .../res/drawable/ic_launcher_background.xml   |   0
 app/src/main/res/layout/activity_main.xml     |   0
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   0
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   0
 app/src/main/res/mipmap-hdpi/ic_launcher.png  | Bin
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin
 app/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin
 app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin
 app/src/main/res/values/colors.xml            |   0
 app/src/main/res/values/strings.xml           |   0
 app/src/main/res/values/styles.xml            |   0
 .../main/res/xml/network_security_config.xml  |   7 +++
 .../osmnavigationapp/ExampleUnitTest.java     |   0
 baatolibrary/.gitignore                       |   0
 baatolibrary/build.gradle                     |  17 +++----
 baatolibrary/consumer-rules.pro               |   0
 baatolibrary/proguard-rules.pro               |   0
 .../baatolibrary/ExampleInstrumentedTest.java |   0
 baatolibrary/src/main/AndroidManifest.xml     |   0
 baatolibrary/src/main/assets/locale/en_US.txt |   0
 baatolibrary/src/main/assets/locale/ne.txt    |   0
 .../baatolibrary/application/BaatoLib.java    |  10 +----
 .../baatolibrary/application/TinyDB.java      |   0
 .../models/DirectionsAPIResponse.java         |   0
 .../baatolibrary/models/ErrorResponse.java    |   0
 .../baato/baatolibrary/models/Geometry.java   |   0
 .../com/baato/baatolibrary/models/LatLon.java |   0
 .../baatolibrary/models/NavResponse.java      |   0
 .../baatolibrary/models/PlaceAPIResponse.java |   0
 .../com/baato/baatolibrary/models/Points.java |   0
 .../models/SearchAPIResponse.java             |   0
 .../baatolibrary/models/SearchDataModel.java  |   0
 .../navigation/BaatoTranslationMap.java       |   0
 ...itionalDistanceVoiceInstructionConfig.java |   0
 .../baatolibrary/navigation/DecodeLine.java   |   0
 .../navigation/DirectionForLine.java          |   0
 .../navigation/DistanceConfig.java            |   0
 .../navigation/DistanceUtils.java             |   0
 .../FixedDistanceVoiceInstructionConfig.java  |   0
 .../InitialVoiceInstructionConfig.java        |   0
 .../navigation/InstructionResponse.java       |   0
 .../navigation/NavigateResponseConverter.java |   0
 ...vigateResponseConverterTranslationMap.java |   0
 .../navigation/VoiceInstructionConfig.java    |   0
 .../baatolibrary/navigation/WebHelper.java    |   0
 .../baato/baatolibrary/requests/BaatoAPI.java |   2 +-
 .../baatolibrary/services/BaatoPlace.java     |  26 ++++++++---
 .../baatolibrary/services/BaatoReverse.java   |  22 ++++++---
 .../baatolibrary/services/BaatoRouting.java   |  42 +++++++++++++++---
 .../baatolibrary/services/BaatoSearch.java    |  25 +++++++----
 .../baatolibrary/utilities/BaatoUtil.java     |  16 ++++---
 .../baatolibrary/utilities/ErrorUtils.java    |   2 +-
 .../baato/baatolibrary/utilities/Keys.java    |   0
 .../{Retry.java => RetryInterceptor.java}     |   6 +--
 baatolibrary/src/main/res/raw/en_us.txt       |   0
 baatolibrary/src/main/res/raw/ne.txt          |   0
 baatolibrary/src/main/res/values/strings.xml  |   0
 .../baatolibrary/ExampleUnitTest.java         |   0
 build.gradle                                  |   0
 gradle.properties                             |   0
 gradle/wrapper/gradle-wrapper.jar             | Bin
 gradle/wrapper/gradle-wrapper.properties      |   0
 gradlew.bat                                   |   0
 routelibrary/.gitignore                       |   0
 routelibrary/build.gradle                     |   0
 routelibrary/consumer-rules.pro               |   0
 routelibrary/proguard-rules.pro               |   0
 .../routelibrary/ExampleInstrumentedTest.java |   0
 routelibrary/src/main/AndroidManifest.xml     |   0
 .../routelibrary/BaatoUtil.java               |   0
 .../routelibrary/models/Geometry.java         |   0
 routelibrary/src/main/res/values/strings.xml  |   0
 .../routelibrary/ExampleUnitTest.java         |   0
 settings.gradle                               |   0
 98 files changed, 138 insertions(+), 60 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 .idea/.name
 mode change 100644 => 100755 .idea/codeStyles/Project.xml
 mode change 100644 => 100755 .idea/compiler.xml
 mode change 100644 => 100755 .idea/gradle.xml
 mode change 100644 => 100755 .idea/jarRepositories.xml
 mode change 100644 => 100755 .idea/misc.xml
 mode change 100644 => 100755 .idea/runConfigurations.xml
 mode change 100644 => 100755 .idea/vcs.xml
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 app/.gitignore
 mode change 100644 => 100755 app/build.gradle
 mode change 100644 => 100755 app/proguard-rules.pro
 mode change 100644 => 100755 app/src/androidTest/java/com/kathmandulivinglabs/osmnavigationapp/ExampleInstrumentedTest.java
 mode change 100644 => 100755 app/src/main/AndroidManifest.xml
 mode change 100644 => 100755 app/src/main/java/com/baato/osmnavigationapp/Constants.java
 mode change 100644 => 100755 app/src/main/java/com/baato/osmnavigationapp/MainActivity.java
 mode change 100644 => 100755 app/src/main/res/drawable-v24/ic_launcher_foreground.xml
 mode change 100644 => 100755 app/src/main/res/drawable/ic_launcher_background.xml
 mode change 100644 => 100755 app/src/main/res/layout/activity_main.xml
 mode change 100644 => 100755 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 mode change 100644 => 100755 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 mode change 100644 => 100755 app/src/main/res/mipmap-hdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-hdpi/ic_launcher_round.png
 mode change 100644 => 100755 app/src/main/res/mipmap-mdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-mdpi/ic_launcher_round.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 mode change 100644 => 100755 app/src/main/res/values/colors.xml
 mode change 100644 => 100755 app/src/main/res/values/strings.xml
 mode change 100644 => 100755 app/src/main/res/values/styles.xml
 create mode 100755 app/src/main/res/xml/network_security_config.xml
 mode change 100644 => 100755 app/src/test/java/com/kathmandulivinglabs/osmnavigationapp/ExampleUnitTest.java
 mode change 100644 => 100755 baatolibrary/.gitignore
 mode change 100644 => 100755 baatolibrary/build.gradle
 mode change 100644 => 100755 baatolibrary/consumer-rules.pro
 mode change 100644 => 100755 baatolibrary/proguard-rules.pro
 mode change 100644 => 100755 baatolibrary/src/androidTest/java/com/kathmandulivinglabs/baatolibrary/ExampleInstrumentedTest.java
 mode change 100644 => 100755 baatolibrary/src/main/AndroidManifest.xml
 mode change 100644 => 100755 baatolibrary/src/main/assets/locale/en_US.txt
 mode change 100644 => 100755 baatolibrary/src/main/assets/locale/ne.txt
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/application/BaatoLib.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/application/TinyDB.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/models/DirectionsAPIResponse.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/models/ErrorResponse.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/models/Geometry.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/models/LatLon.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/models/NavResponse.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/models/PlaceAPIResponse.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/models/Points.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/models/SearchAPIResponse.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/models/SearchDataModel.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/BaatoTranslationMap.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/ConditionalDistanceVoiceInstructionConfig.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DecodeLine.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DirectionForLine.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DistanceConfig.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DistanceUtils.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/FixedDistanceVoiceInstructionConfig.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/InitialVoiceInstructionConfig.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/InstructionResponse.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverter.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterTranslationMap.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/VoiceInstructionConfig.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/navigation/WebHelper.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/requests/BaatoAPI.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoPlace.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoReverse.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoSearch.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/utilities/BaatoUtil.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/utilities/ErrorUtils.java
 mode change 100644 => 100755 baatolibrary/src/main/java/com/baato/baatolibrary/utilities/Keys.java
 rename baatolibrary/src/main/java/com/baato/baatolibrary/utilities/{Retry.java => RetryInterceptor.java} (88%)
 mode change 100644 => 100755
 mode change 100644 => 100755 baatolibrary/src/main/res/raw/en_us.txt
 mode change 100644 => 100755 baatolibrary/src/main/res/raw/ne.txt
 mode change 100644 => 100755 baatolibrary/src/main/res/values/strings.xml
 mode change 100644 => 100755 baatolibrary/src/test/java/com/kathmandulivinglabs/baatolibrary/ExampleUnitTest.java
 mode change 100644 => 100755 build.gradle
 mode change 100644 => 100755 gradle.properties
 mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.jar
 mode change 100644 => 100755 gradle/wrapper/gradle-wrapper.properties
 mode change 100644 => 100755 gradlew.bat
 mode change 100644 => 100755 routelibrary/.gitignore
 mode change 100644 => 100755 routelibrary/build.gradle
 mode change 100644 => 100755 routelibrary/consumer-rules.pro
 mode change 100644 => 100755 routelibrary/proguard-rules.pro
 mode change 100644 => 100755 routelibrary/src/androidTest/java/com/kathmandulivinglabs/routelibrary/ExampleInstrumentedTest.java
 mode change 100644 => 100755 routelibrary/src/main/AndroidManifest.xml
 mode change 100644 => 100755 routelibrary/src/main/java/com/kathmandulivinglabs/routelibrary/BaatoUtil.java
 mode change 100644 => 100755 routelibrary/src/main/java/com/kathmandulivinglabs/routelibrary/models/Geometry.java
 mode change 100644 => 100755 routelibrary/src/main/res/values/strings.xml
 mode change 100644 => 100755 routelibrary/src/test/java/com/kathmandulivinglabs/routelibrary/ExampleUnitTest.java
 mode change 100644 => 100755 settings.gradle

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.idea/.name b/.idea/.name
old mode 100644
new mode 100755
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
old mode 100644
new mode 100755
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
old mode 100644
new mode 100755
index 61a9130..fb7f4a8
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
old mode 100644
new mode 100755
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
old mode 100644
new mode 100755
diff --git a/.idea/misc.xml b/.idea/misc.xml
old mode 100644
new mode 100755
index eefc9e0..96ccbfe
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <option name="myDefaultNotNull" value="android.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="12">
+        <list size="15">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@@ -18,12 +18,15 @@
           <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
           <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
           <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="11">
+        <list size="14">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -35,11 +38,14 @@
           <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
           <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
           <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
old mode 100644
new mode 100755
index 7f68460..e497da9
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/app/.gitignore b/app/.gitignore
old mode 100644
new mode 100755
diff --git a/app/build.gradle b/app/build.gradle
old mode 100644
new mode 100755
index 38cba1e..96b2b3e
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,6 +33,4 @@ dependencies {
 
     // baato library
     implementation project(':baatolibrary')
-
-//    implementation 'com.github.baato:java-client:1.0.1'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/app/src/androidTest/java/com/kathmandulivinglabs/osmnavigationapp/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/kathmandulivinglabs/osmnavigationapp/ExampleInstrumentedTest.java
old mode 100644
new mode 100755
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
index 386d155..8a0f72b
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:targetApi="n">
         <activity android:name="com.baato.osmnavigationapp.MainActivity">
             <intent-filter>
diff --git a/app/src/main/java/com/baato/osmnavigationapp/Constants.java b/app/src/main/java/com/baato/osmnavigationapp/Constants.java
old mode 100644
new mode 100755
index b3daa07..12adf74
--- a/app/src/main/java/com/baato/osmnavigationapp/Constants.java
+++ b/app/src/main/java/com/baato/osmnavigationapp/Constants.java
@@ -1,5 +1,5 @@
 package com.baato.osmnavigationapp;
 
 public interface Constants {
-    String TOKEN = "{your-baato-token}";
+    String TOKEN = "your-baato-access-token";
 }
diff --git a/app/src/main/java/com/baato/osmnavigationapp/MainActivity.java b/app/src/main/java/com/baato/osmnavigationapp/MainActivity.java
old mode 100644
new mode 100755
index 6002e38..9d39339
--- a/app/src/main/java/com/baato/osmnavigationapp/MainActivity.java
+++ b/app/src/main/java/com/baato/osmnavigationapp/MainActivity.java
@@ -22,7 +22,6 @@
 public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "apple";
-    String encoded = "wv{gD_`lhOQvAO^c@h@Yj@IZKhADXj@|ABrAElB@NLLp@LHFDJJvDb@pBx@~B`AjBBP@fCArBW|KSxEQbHGbAYhBKVmA`C}A`EuBrGcAxC}@hBA^BJb@`@dBr@tBbAh@RdDbBs@fCYxAmBnKy@`F_Gj[]zBS~AWjDC~AA|BBbBj@|JpB~YRrDbAjONlDD~AAbCuArj@o@nSkB~w@CzB{@x\\e@rLa@jN@zBO|DE|EQjBKp@W~@Sf@o@dAs@x@i@d@_@RkAj@_AP_AJmCDkBD}IDoFF_ETc@@iARyAf@UKa@_@YKk@KuBGu@Kq@MkA[k@SsB{@wCwAgAo@g@SsDiBa@OcJmE{IcEiAm@kJmEmAc@U?QA[IUK]EmI_@wBCk@Dm@FiCt@k@ViNvJ_BlAcAj@{@Xc@JuALsGN{@F_@Da@NeAn@WXWb@]fAIf@Al@Bt@`AvKVhDDpAMjB[jASb@yAzBiAvAuCfEYxAe@SmE}AsGeA_FiBwG_CsB_@sGq@{AWcA]eASuC{@g@IiDs@_BWy@FiG`BqCx@sFvA{JlC_APq@DqA?[CcAOgCg@qFqAgGkA{@Gk@@i@Dg@Je@NmAl@_^~R^p@lAlAdAv@^T~Al@t@l@F?b@MjChANBl@ATIDCFl@APNH?Ho@`CTf@HJ`@FJN?Je@fA[d@CJBJHJ@POv@HPFVd@ZBJAJa@v@bAf@JjAw@`@yAf@s@d@SHQAAf@c@C@p@YAm@R?n@SPkAPAB?|@g@HCLaAB";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,7 +40,7 @@ private void performRouting() {
                 .setAccessToken(Constants.TOKEN)
                 .setMode("foot")
                 .setAlternatives(false)
-                .setInstructions(true)
+                .setInstructions(false)
                 .withListener(new BaatoRouting.BaatoRoutingRequestListener() {
                     @Override
                     public void onSuccess(DirectionsAPIResponse directionResponse) {
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
new file mode 100755
index 0000000..5d9b20d
--- /dev/null
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">baato.io</domain>
+        <domain includeSubdomains="true">192.168.123.240</domain>
+    </domain-config>
+</network-security-config>
\ No newline at end of file
diff --git a/app/src/test/java/com/kathmandulivinglabs/osmnavigationapp/ExampleUnitTest.java b/app/src/test/java/com/kathmandulivinglabs/osmnavigationapp/ExampleUnitTest.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/.gitignore b/baatolibrary/.gitignore
old mode 100644
new mode 100755
diff --git a/baatolibrary/build.gradle b/baatolibrary/build.gradle
old mode 100644
new mode 100755
index bc42556..f0d54c2
--- a/baatolibrary/build.gradle
+++ b/baatolibrary/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "29.0.2"
 
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -26,14 +26,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     //retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.6.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     //graphhopper
     implementation(group: 'com.graphhopper', name: 'graphhopper-core', version: '2.2') {
@@ -43,4 +43,5 @@ dependencies {
     }
 
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
+    implementation 'commons-codec:commons-codec:1.14'
 }
\ No newline at end of file
diff --git a/baatolibrary/consumer-rules.pro b/baatolibrary/consumer-rules.pro
old mode 100644
new mode 100755
diff --git a/baatolibrary/proguard-rules.pro b/baatolibrary/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/androidTest/java/com/kathmandulivinglabs/baatolibrary/ExampleInstrumentedTest.java b/baatolibrary/src/androidTest/java/com/kathmandulivinglabs/baatolibrary/ExampleInstrumentedTest.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/AndroidManifest.xml b/baatolibrary/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/assets/locale/en_US.txt b/baatolibrary/src/main/assets/locale/en_US.txt
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/assets/locale/ne.txt b/baatolibrary/src/main/assets/locale/ne.txt
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/application/BaatoLib.java b/baatolibrary/src/main/java/com/baato/baatolibrary/application/BaatoLib.java
old mode 100644
new mode 100755
index 894102b..1784958
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/application/BaatoLib.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/application/BaatoLib.java
@@ -1,21 +1,15 @@
 package com.baato.baatolibrary.application;
 
-import android.annotation.SuppressLint;
 import android.app.Application;
 import android.content.Context;
-import android.content.res.AssetManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
-import com.baato.baatolibrary.utilities.Retry;
+import com.baato.baatolibrary.utilities.RetryInterceptor;
 
-import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
@@ -43,7 +37,7 @@ public static Retrofit retrofitV2(String apiVersion, String apiBaseURL) {
                 .connectTimeout(15, TimeUnit.SECONDS)
                 .readTimeout(15, TimeUnit.SECONDS)
                 .writeTimeout(20, TimeUnit.SECONDS)
-                .addInterceptor(new Retry(4))
+                .addInterceptor(new RetryInterceptor(4))
                 .build();
         Retrofit.Builder builder = new Retrofit.Builder()
                 .baseUrl(apiBaseURL+ "v" + apiVersion + "/")
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/application/TinyDB.java b/baatolibrary/src/main/java/com/baato/baatolibrary/application/TinyDB.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/models/DirectionsAPIResponse.java b/baatolibrary/src/main/java/com/baato/baatolibrary/models/DirectionsAPIResponse.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/models/ErrorResponse.java b/baatolibrary/src/main/java/com/baato/baatolibrary/models/ErrorResponse.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/models/Geometry.java b/baatolibrary/src/main/java/com/baato/baatolibrary/models/Geometry.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/models/LatLon.java b/baatolibrary/src/main/java/com/baato/baatolibrary/models/LatLon.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/models/NavResponse.java b/baatolibrary/src/main/java/com/baato/baatolibrary/models/NavResponse.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/models/PlaceAPIResponse.java b/baatolibrary/src/main/java/com/baato/baatolibrary/models/PlaceAPIResponse.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/models/Points.java b/baatolibrary/src/main/java/com/baato/baatolibrary/models/Points.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/models/SearchAPIResponse.java b/baatolibrary/src/main/java/com/baato/baatolibrary/models/SearchAPIResponse.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/models/SearchDataModel.java b/baatolibrary/src/main/java/com/baato/baatolibrary/models/SearchDataModel.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/BaatoTranslationMap.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/BaatoTranslationMap.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/ConditionalDistanceVoiceInstructionConfig.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/ConditionalDistanceVoiceInstructionConfig.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DecodeLine.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DecodeLine.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DirectionForLine.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DirectionForLine.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DistanceConfig.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DistanceConfig.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DistanceUtils.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/DistanceUtils.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/FixedDistanceVoiceInstructionConfig.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/FixedDistanceVoiceInstructionConfig.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/InitialVoiceInstructionConfig.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/InitialVoiceInstructionConfig.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/InstructionResponse.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/InstructionResponse.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverter.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverter.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterTranslationMap.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverterTranslationMap.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/VoiceInstructionConfig.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/VoiceInstructionConfig.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/WebHelper.java b/baatolibrary/src/main/java/com/baato/baatolibrary/navigation/WebHelper.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/requests/BaatoAPI.java b/baatolibrary/src/main/java/com/baato/baatolibrary/requests/BaatoAPI.java
old mode 100644
new mode 100755
index 154dbde..dbab4ff
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/requests/BaatoAPI.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/requests/BaatoAPI.java
@@ -13,7 +13,7 @@
 
 public interface BaatoAPI {
     @GET("directions")
-    Call<DirectionsAPIResponse> getDirections(@Query("key") String key, @Query("points[]") String[] points, @Query("mode") String mode, @Query("alternatives") Boolean alternatives, @Query("instructions") Boolean instructions);
+    Call<DirectionsAPIResponse> getDirections(@QueryMap Map<String, Object> filters, @Query("points[]") String[] points);
 
     @GET("search")
     Call<SearchAPIResponse> searchQuery(@QueryMap Map<String, String> filters);
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoPlace.java b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoPlace.java
old mode 100644
new mode 100755
index 6443901..bc979f4
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoPlace.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoPlace.java
@@ -11,6 +11,7 @@
 import com.baato.baatolibrary.models.ErrorResponse;
 import com.baato.baatolibrary.models.PlaceAPIResponse;
 import com.baato.baatolibrary.requests.BaatoAPI;
+import com.baato.baatolibrary.utilities.BaatoUtil;
 import com.baato.baatolibrary.utilities.ErrorUtils;
 
 import java.io.IOException;
@@ -25,12 +26,13 @@
 public class BaatoPlace {
 
     private Context context;
-    private String accessToken;
+    private String accessToken, securityCode;
     private String apiVersion = "1";
     private String apiBaseUrl = "https://api.baato.io/api/";
     private BaatoPlaceListener baatoPlaceListener;
     private int placeId = 0;
     private Call<PlaceAPIResponse> placeAPIResponseCall;
+
     public interface BaatoPlaceListener {
         /**
          * onSuccess method called after it is successful
@@ -77,6 +79,14 @@ public BaatoPlace setAPIBaseURL(@NonNull String apiBaseURL) {
         return this;
     }
 
+    /**
+     * Set the securityCode is security enabled.
+     */
+    public BaatoPlace setSecurityCode(String securityCode) {
+        this.securityCode = securityCode;
+        return this;
+    }
+
     /**
      * Method to set the UpdateListener for the AppUpdaterUtils actions
      *
@@ -90,14 +100,14 @@ public BaatoPlace withListener(BaatoPlaceListener baatoPlaceListener) {
 
     public void doRequest() {
         BaatoAPI baatoAPI = BaatoLib.retrofitV2(apiVersion, apiBaseUrl).create(BaatoAPI.class);
-        placeAPIResponseCall = baatoAPI.performPlacesQuery(giveMeQueryFilter());
+        placeAPIResponseCall = baatoAPI.performPlacesQuery(giveMeQueryFilter(context));
         placeAPIResponseCall.enqueue(new Callback<PlaceAPIResponse>() {
             @Override
             public void onResponse(Call<PlaceAPIResponse> call, Response<PlaceAPIResponse> response) {
                 if (response.isSuccessful() && response.body() != null)
                     baatoPlaceListener.onSuccess(response.body());
                 else {
-                    ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl);
+                    ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl, context.getPackageName());
                     baatoPlaceListener.onFailed(new Throwable(errorResponse.getMessage()));
                 }
             }
@@ -108,16 +118,22 @@ public void onFailure(Call<PlaceAPIResponse> call, Throwable throwable) {
             }
         });
     }
+
     public void cancelRequest() {
-       placeAPIResponseCall.cancel();
+        placeAPIResponseCall.cancel();
     }
-    private Map<String, String> giveMeQueryFilter() {
+
+    private Map<String, String> giveMeQueryFilter(Context context) {
         Map<String, String> queryMap = new HashMap<>();
         //compulsory ones
         if (accessToken != null)
             queryMap.put("key", accessToken);
         if (placeId != 0)
             queryMap.put("placeId", placeId + "");
+
+        //optional ones
+        if (securityCode != null && !securityCode.isEmpty())
+            queryMap.put("hash", BaatoUtil.generateHash(context.getPackageName(), accessToken, securityCode));
         return queryMap;
     }
 }
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoReverse.java b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoReverse.java
old mode 100644
new mode 100755
index 25f9c1f..cec009e
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoReverse.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoReverse.java
@@ -1,7 +1,6 @@
 package com.baato.baatolibrary.services;
 
 import android.content.Context;
-import android.util.Log;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -12,6 +11,7 @@
 import com.baato.baatolibrary.models.LatLon;
 
 import com.baato.baatolibrary.requests.BaatoAPI;
+import com.baato.baatolibrary.utilities.BaatoUtil;
 import com.baato.baatolibrary.utilities.ErrorUtils;
 
 import java.util.HashMap;
@@ -27,7 +27,7 @@ public class BaatoReverse {
     private static final String TAG = "BaatoReverseGeoCode";
     private Context context;
     private BaatoReverseRequestListener baatoReverseRequestListener;
-    private String accessToken;
+    private String accessToken, securityCode;
     private String apiVersion = "1";
     private String apiBaseUrl = "https://api.baato.io/api/";
     private int radius, limit = 0;
@@ -97,6 +97,14 @@ public BaatoReverse setLimit(@NonNull int limit) {
         return this;
     }
 
+    /**
+     * Set the securityCode is security enabled.
+     */
+    public BaatoReverse setSecurityCode(String securityCode) {
+        this.securityCode = securityCode;
+        return this;
+    }
+
     /**
      * Method to set the UpdateListener for the AppUpdaterUtils actions
      *
@@ -110,7 +118,7 @@ public BaatoReverse withListener(BaatoReverseRequestListener baatoReverseRequest
 
     public void doRequest() {
         BaatoAPI baatoAPI = BaatoLib.retrofitV2(apiVersion, apiBaseUrl).create(BaatoAPI.class);
-        placeAPIResponseCall=baatoAPI.performReverseGeoCode(giveMeQueryFilter());
+        placeAPIResponseCall = baatoAPI.performReverseGeoCode(giveMeQueryFilter(context));
         placeAPIResponseCall.enqueue(new Callback<PlaceAPIResponse>() {
             @Override
             public void onResponse(Call<PlaceAPIResponse> call, Response<PlaceAPIResponse> response) {
@@ -118,9 +126,8 @@ public void onResponse(Call<PlaceAPIResponse> call, Response<PlaceAPIResponse> r
                     baatoReverseRequestListener.onSuccess(response.body());
                 else {
                     try {
-                        ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl);
+                        ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl, context.getPackageName());
                         baatoReverseRequestListener.onFailed(new Throwable(errorResponse.getMessage()));
-//                        baatoReverseRequestListener.onFailed(new Throwable(response.errorBody().string()));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -133,11 +140,12 @@ public void onFailure(Call<PlaceAPIResponse> call, Throwable throwable) {
             }
         });
     }
+
     public void cancelRequest() {
         placeAPIResponseCall.cancel();
     }
 
-    private Map<String, String> giveMeQueryFilter() {
+    private Map<String, String> giveMeQueryFilter(Context context) {
         Map<String, String> queryMap = new HashMap<>();
         //compulsory
         if (accessToken != null)
@@ -150,6 +158,8 @@ private Map<String, String> giveMeQueryFilter() {
             queryMap.put("lon", latLon.lon + "");
 
         //optional
+        if (securityCode != null && !securityCode.isEmpty())
+            queryMap.put("hash", BaatoUtil.generateHash(context.getPackageName(), accessToken, securityCode));
         if (radius != 0)
             queryMap.put("radius", radius + "");
 
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java
old mode 100644
new mode 100755
index ea7dec3..d4e0e77
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java
@@ -11,20 +11,25 @@
 import com.baato.baatolibrary.models.ErrorResponse;
 import com.baato.baatolibrary.navigation.NavigateResponseConverter;
 import com.baato.baatolibrary.requests.BaatoAPI;
+import com.baato.baatolibrary.utilities.BaatoUtil;
 import com.baato.baatolibrary.utilities.ErrorUtils;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
 
 @Keep
 public class BaatoRouting {
     private Context context;
     private BaatoRoutingRequestListener baatoRoutingRequestListener;
-    private String accessToken, query, mode;
+    private String accessToken, securityCode, mode;
     private String apiVersion = "1";
     private String apiBaseUrl = "https://api.baato.io/api/";
     private String[] points;
@@ -68,6 +73,7 @@ public BaatoRouting setLocale(Locale locale) {
         this.locale = locale;
         return this;
     }
+
     public BaatoRouting setContext(Context context) {
         this.context = context;
         return this;
@@ -115,6 +121,13 @@ public BaatoRouting setPoints(@NonNull String[] points) {
         return this;
     }
 
+    /**
+     * Set the securityCode is security enabled.
+     */
+    public BaatoRouting setSecurityCode(String securityCode) {
+        this.securityCode = securityCode;
+        return this;
+    }
 
     /**
      * Method to set the UpdateListener for the AppUpdaterUtils actions
@@ -129,7 +142,7 @@ public BaatoRouting withListener(BaatoRoutingRequestListener baatoRoutingRequest
 
     public void doRequest() {
         BaatoAPI baatoAPI = BaatoLib.retrofitV2(apiVersion, apiBaseUrl).create(BaatoAPI.class);
-        directionsAPIResponseCall = baatoAPI.getDirections(accessToken, points, mode, alternatives, instructions);
+        directionsAPIResponseCall = baatoAPI.getDirections(giveMeQueryFilter(context), points);
         directionsAPIResponseCall
                 .enqueue(new Callback<DirectionsAPIResponse>() {
                     @Override
@@ -137,9 +150,8 @@ public void onResponse(Call<DirectionsAPIResponse> call, Response<DirectionsAPIR
                         if (response.isSuccessful() && response.body() != null) {
                             baatoRoutingRequestListener.onSuccess(response.body());
                         } else {
-                            ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl);
+                            ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl, context.getPackageName());
                             baatoRoutingRequestListener.onFailed(new Throwable(errorResponse.getMessage()));
-//                                baatoRoutingRequestListener.onFailed(new Throwable(response.errorBody().string()));
                         }
                     }
 
@@ -150,14 +162,34 @@ public void onFailure(Call<DirectionsAPIResponse> call, Throwable t) {
                 });
 
     }
+
     public void cancelRequest() {
         directionsAPIResponseCall.cancel();
     }
 
-    public static String getParsedNavResponse(DirectionsAPIResponse response, String mode,Locale locale, Context context) {
+    public static String getParsedNavResponse(DirectionsAPIResponse response, String mode, Locale locale, Context context) {
         return NavigateResponseConverter.convertFromGHResponse(response.getData().get(0), mode, locale, context).toString();
     }
+
     public static String getParsedNavResponse(DirectionsAPIResponse response, String mode, Context context) {
         return NavigateResponseConverter.convertFromGHResponse(response.getData().get(0), mode, context).toString();
     }
+
+    private Map<String, Object> giveMeQueryFilter(Context context) {
+        Map<String, Object> queryMap = new HashMap<>();
+        //compulsory ones
+        if (accessToken != null)
+            queryMap.put("key", accessToken);
+        if (mode != null)
+            queryMap.put("mode", mode);
+        if (alternatives != null)
+            queryMap.put("instructions", instructions);
+        if (alternatives != null)
+            queryMap.put("alternatives", alternatives);
+
+        //optionals
+        if (securityCode != null && !securityCode.isEmpty())
+            queryMap.put("hash", BaatoUtil.generateHash(context.getPackageName(), accessToken, securityCode));
+        return queryMap;
+    }
 }
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoSearch.java b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoSearch.java
old mode 100644
new mode 100755
index 0e42986..9164521
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoSearch.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoSearch.java
@@ -9,9 +9,9 @@
 import com.baato.baatolibrary.models.ErrorResponse;
 import com.baato.baatolibrary.models.SearchAPIResponse;
 import com.baato.baatolibrary.requests.BaatoAPI;
+import com.baato.baatolibrary.utilities.BaatoUtil;
 import com.baato.baatolibrary.utilities.ErrorUtils;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,7 +24,7 @@ public class BaatoSearch {
     private Context context;
     private BaatoSearchRequestListener baatoSearchRequestListener;
     private String accessToken, query;
-    private String type;
+    private String type, securityCode;
     private String apiVersion = "1";
     private String apiBaseUrl = "https://api.baato.io/api/";
     private int radius = 0, limit = 0;
@@ -53,6 +53,14 @@ public BaatoSearch setAccessToken(@NonNull String accessToken) {
         return this;
     }
 
+    /**
+     * Set the securityCode is security enabled.
+     */
+    public BaatoSearch setSecurityCode(String securityCode) {
+        this.securityCode = securityCode;
+        return this;
+    }
+
     /**
      * Set the apiVersion. By default it takes version "1"
      */
@@ -125,16 +133,15 @@ public BaatoSearch withListener(BaatoSearchRequestListener baatoSearchRequestLis
 
     public void doRequest() {
         BaatoAPI baatoAPI = BaatoLib.retrofitV2(apiVersion, apiBaseUrl).create(BaatoAPI.class);
-        searchAPIResponseCall = baatoAPI.searchQuery(giveMeQueryFilter());
+        searchAPIResponseCall = baatoAPI.searchQuery(giveMeQueryFilter(context));
         searchAPIResponseCall.enqueue(new Callback<SearchAPIResponse>() {
             @Override
             public void onResponse(Call<SearchAPIResponse> call, Response<SearchAPIResponse> response) {
                 if (response.isSuccessful() && response.body() != null)
                     baatoSearchRequestListener.onSuccess(response.body());
                 else {
-                    ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl);
+                    ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl, context.getPackageName());
                     baatoSearchRequestListener.onFailed(new Throwable(errorResponse.getMessage()));
-//                        baatoSearchRequestListener.onFailed(new Throwable(response.errorBody().string()));
                 }
             }
 
@@ -146,9 +153,10 @@ public void onFailure(Call<SearchAPIResponse> call, Throwable throwable) {
     }
 
     public void cancelRequest() {
-       searchAPIResponseCall.cancel();
+        searchAPIResponseCall.cancel();
     }
-    private Map<String, String> giveMeQueryFilter() {
+
+    private Map<String, String> giveMeQueryFilter(Context context) {
         Map<String, String> queryMap = new HashMap<>();
         //compulsory ones
         if (accessToken != null)
@@ -156,8 +164,9 @@ private Map<String, String> giveMeQueryFilter() {
         if (query != null)
             queryMap.put("q", query);
 
-
         //optionals
+        if (securityCode != null && !securityCode.isEmpty())
+            queryMap.put("hash", BaatoUtil.generateHash(context.getPackageName(), accessToken, securityCode));
         if (type != null)
             queryMap.put("type", type);
         if (radius != 0)
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/BaatoUtil.java b/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/BaatoUtil.java
old mode 100644
new mode 100755
index e7abdc8..5add10a
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/BaatoUtil.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/BaatoUtil.java
@@ -1,24 +1,30 @@
 package com.baato.baatolibrary.utilities;
 
-import android.util.Log;
-
 import com.baato.baatolibrary.models.Geometry;
 
+import org.apache.commons.codec.digest.HmacAlgorithms;
+import org.apache.commons.codec.digest.HmacUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.content.ContentValues.TAG;
-
 public class BaatoUtil {
     public static Geometry getGeoJsonFromEncodedPolyLine(String encoded) {
         return new Geometry("LineString", decodePolyline(encoded, false));
     }
 
+    public static String generateHash(String packageName, String accessToken, String secret) {
+        byte[] key = secret.getBytes();
+
+        HmacUtils hm256 = new HmacUtils(HmacAlgorithms.HMAC_SHA_512, key);
+        // hm256 object can be used again and again
+        return hm256.hmacHex(packageName+accessToken);
+    }
+
     public static List<List<Double>> decodePolyline(String encoded, boolean is3D) {
         List<List<Double>> pointList = new ArrayList<>();
         int index = 0;
         int len = encoded.length();
-        Log.d(TAG, "decodePolyline: "+len);
         int lat = 0, lng = 0, ele = 0;
         while (index < len) {
             // latitude
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/ErrorUtils.java b/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/ErrorUtils.java
old mode 100644
new mode 100755
index 417be15..dc1cbf5
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/ErrorUtils.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/ErrorUtils.java
@@ -11,7 +11,7 @@
 import retrofit2.Response;
 
 public class ErrorUtils {
-    public static ErrorResponse parseError(Response<?> response, String apiVersion, String apiBaseURL) {
+    public static ErrorResponse parseError(Response<?> response, String apiVersion, String apiBaseURL,String appId) {
         Converter<ResponseBody, ErrorResponse> converter =
                 BaatoLib.retrofitV2(apiVersion,apiBaseURL)
                         .responseBodyConverter(ErrorResponse.class, new Annotation[0]);
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/Keys.java b/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/Keys.java
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/Retry.java b/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/RetryInterceptor.java
old mode 100644
new mode 100755
similarity index 88%
rename from baatolibrary/src/main/java/com/baato/baatolibrary/utilities/Retry.java
rename to baatolibrary/src/main/java/com/baato/baatolibrary/utilities/RetryInterceptor.java
index 6c56b63..349b082
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/Retry.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/RetryInterceptor.java
@@ -1,7 +1,5 @@
 package com.baato.baatolibrary.utilities;
 
-import android.util.Log;
-
 import androidx.annotation.NonNull;
 
 import java.io.IOException;
@@ -11,10 +9,10 @@
 import okhttp3.Response;
 
 
-public class Retry implements Interceptor {
+public class RetryInterceptor implements Interceptor {
     public int maxRetry; // maximum number of retries
     private int retryNum = 0; // If set to 3 retry, the maximum possible request 4 times (default 1 + 3 retry)
-    public Retry(int maxRetry) {
+    public RetryInterceptor(int maxRetry) {
         this.maxRetry = maxRetry;
     }
 
diff --git a/baatolibrary/src/main/res/raw/en_us.txt b/baatolibrary/src/main/res/raw/en_us.txt
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/res/raw/ne.txt b/baatolibrary/src/main/res/raw/ne.txt
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/main/res/values/strings.xml b/baatolibrary/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/baatolibrary/src/test/java/com/kathmandulivinglabs/baatolibrary/ExampleUnitTest.java b/baatolibrary/src/test/java/com/kathmandulivinglabs/baatolibrary/ExampleUnitTest.java
old mode 100644
new mode 100755
diff --git a/build.gradle b/build.gradle
old mode 100644
new mode 100755
diff --git a/gradle.properties b/gradle.properties
old mode 100644
new mode 100755
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
old mode 100644
new mode 100755
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/gradlew.bat b/gradlew.bat
old mode 100644
new mode 100755
diff --git a/routelibrary/.gitignore b/routelibrary/.gitignore
old mode 100644
new mode 100755
diff --git a/routelibrary/build.gradle b/routelibrary/build.gradle
old mode 100644
new mode 100755
diff --git a/routelibrary/consumer-rules.pro b/routelibrary/consumer-rules.pro
old mode 100644
new mode 100755
diff --git a/routelibrary/proguard-rules.pro b/routelibrary/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/routelibrary/src/androidTest/java/com/kathmandulivinglabs/routelibrary/ExampleInstrumentedTest.java b/routelibrary/src/androidTest/java/com/kathmandulivinglabs/routelibrary/ExampleInstrumentedTest.java
old mode 100644
new mode 100755
diff --git a/routelibrary/src/main/AndroidManifest.xml b/routelibrary/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/routelibrary/src/main/java/com/kathmandulivinglabs/routelibrary/BaatoUtil.java b/routelibrary/src/main/java/com/kathmandulivinglabs/routelibrary/BaatoUtil.java
old mode 100644
new mode 100755
diff --git a/routelibrary/src/main/java/com/kathmandulivinglabs/routelibrary/models/Geometry.java b/routelibrary/src/main/java/com/kathmandulivinglabs/routelibrary/models/Geometry.java
old mode 100644
new mode 100755
diff --git a/routelibrary/src/main/res/values/strings.xml b/routelibrary/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/routelibrary/src/test/java/com/kathmandulivinglabs/routelibrary/ExampleUnitTest.java b/routelibrary/src/test/java/com/kathmandulivinglabs/routelibrary/ExampleUnitTest.java
old mode 100644
new mode 100755
diff --git a/settings.gradle b/settings.gradle
old mode 100644
new mode 100755

From 0085dd9cb5b7187832ecb17b375362e5b3bf14f9 Mon Sep 17 00:00:00 2001
From: Ichchha <ichchhamoktan07@gmail.com>
Date: Wed, 19 May 2021 19:47:34 +0545
Subject: [PATCH 2/2] removed unnecessary code

---
 .../main/java/com/baato/baatolibrary/services/BaatoPlace.java   | 2 +-
 .../main/java/com/baato/baatolibrary/services/BaatoReverse.java | 2 +-
 .../main/java/com/baato/baatolibrary/services/BaatoRouting.java | 2 +-
 .../main/java/com/baato/baatolibrary/services/BaatoSearch.java  | 2 +-
 .../main/java/com/baato/baatolibrary/utilities/ErrorUtils.java  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoPlace.java b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoPlace.java
index bc979f4..77ecef4 100755
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoPlace.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoPlace.java
@@ -107,7 +107,7 @@ public void onResponse(Call<PlaceAPIResponse> call, Response<PlaceAPIResponse> r
                 if (response.isSuccessful() && response.body() != null)
                     baatoPlaceListener.onSuccess(response.body());
                 else {
-                    ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl, context.getPackageName());
+                    ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl);
                     baatoPlaceListener.onFailed(new Throwable(errorResponse.getMessage()));
                 }
             }
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoReverse.java b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoReverse.java
index cec009e..1957102 100755
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoReverse.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoReverse.java
@@ -126,7 +126,7 @@ public void onResponse(Call<PlaceAPIResponse> call, Response<PlaceAPIResponse> r
                     baatoReverseRequestListener.onSuccess(response.body());
                 else {
                     try {
-                        ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl, context.getPackageName());
+                        ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl);
                         baatoReverseRequestListener.onFailed(new Throwable(errorResponse.getMessage()));
                     } catch (Exception e) {
                         e.printStackTrace();
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java
index d4e0e77..e98245c 100755
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java
@@ -150,7 +150,7 @@ public void onResponse(Call<DirectionsAPIResponse> call, Response<DirectionsAPIR
                         if (response.isSuccessful() && response.body() != null) {
                             baatoRoutingRequestListener.onSuccess(response.body());
                         } else {
-                            ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl, context.getPackageName());
+                            ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl);
                             baatoRoutingRequestListener.onFailed(new Throwable(errorResponse.getMessage()));
                         }
                     }
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoSearch.java b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoSearch.java
index 9164521..e509ed1 100755
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoSearch.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoSearch.java
@@ -140,7 +140,7 @@ public void onResponse(Call<SearchAPIResponse> call, Response<SearchAPIResponse>
                 if (response.isSuccessful() && response.body() != null)
                     baatoSearchRequestListener.onSuccess(response.body());
                 else {
-                    ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl, context.getPackageName());
+                    ErrorResponse errorResponse = ErrorUtils.parseError(response, apiVersion, apiBaseUrl);
                     baatoSearchRequestListener.onFailed(new Throwable(errorResponse.getMessage()));
                 }
             }
diff --git a/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/ErrorUtils.java b/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/ErrorUtils.java
index dc1cbf5..417be15 100755
--- a/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/ErrorUtils.java
+++ b/baatolibrary/src/main/java/com/baato/baatolibrary/utilities/ErrorUtils.java
@@ -11,7 +11,7 @@
 import retrofit2.Response;
 
 public class ErrorUtils {
-    public static ErrorResponse parseError(Response<?> response, String apiVersion, String apiBaseURL,String appId) {
+    public static ErrorResponse parseError(Response<?> response, String apiVersion, String apiBaseURL) {
         Converter<ResponseBody, ErrorResponse> converter =
                 BaatoLib.retrofitV2(apiVersion,apiBaseURL)
                         .responseBodyConverter(ErrorResponse.class, new Annotation[0]);