bug fixes

Author: Bhawak

app/src/main/java/com/baato/osmnavigationapp/MainActivity.java

@@ -31,7 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
         ToasterMessage.s(this, "Hello Good Morning");
         Geometry geometry = BaatoUtil.getGeoJsonFromEncodedPolyLine(encoded);
-        BaatoTranslationMap trMap = new BaatoTranslationMap().doImport("locale/");
+        BaatoTranslationMap trMap = new BaatoTranslationMap().doImport(getApplicationContext());
         performRouting();
         performReverseGeoCoding();
         performSearch();

baatolibrary/src/main/AndroidManifest.xml

@@ -6,6 +6,5 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name="com.baato.baatolibrary.application.BaatoLib"
         tools:targetApi="n" />
 </manifest>

baatolibrary/src/main/java/com/baato/baatolibrary/application/BaatoLib.java

@@ -21,16 +21,16 @@
 
 public class BaatoLib extends Application {
     private static TinyDB tinyDB;
-    @SuppressLint("StaticFieldLeak")
-    private static Context mContext;
+//    @SuppressLint("StaticFieldLeak")
+//    private static Context mContext;
 
 
     @Override
     public void onCreate() {
         super.onCreate();
         //tiny db config
         tinyDB = new TinyDB(getApplicationContext());
-        mContext = this;
+//        mContext = this;
     }
 
     public static TinyDB db() {
@@ -65,7 +65,7 @@ public static boolean isConnectedToNetwork(Context context) {
         }
         return isConnected;
     }
-    public static Context getContext(){
-        return mContext;
-    }
+//    public static Context getContext(){
+//        return mContext;
+//    }
 }

baatolibrary/src/main/java/com/baato/baatolibrary/navigation/BaatoTranslationMap.java

@@ -1,5 +1,6 @@
 package com.baato.baatolibrary.navigation;
 
+import android.content.Context;
 import android.content.res.AssetManager;
 import android.content.res.Resources;
 import android.util.Log;
@@ -32,18 +33,18 @@ public static int countOccurence(String phrase, String splitter) {
         return Helper.isEmpty(phrase) ? 0 : phrase.trim().split(splitter).length;
     }
 
-    public BaatoTranslationMap doImport(String folder) {
-//        AssetManager gi = BaatoLib.getContext().getAssets();
-        Resources resources = BaatoLib.getContext().getResources();
+    public BaatoTranslationMap doImport(Context context) {
+        AssetManager gi = context.getAssets();
+//        Resources resources = context.getResources();
 
         try {
             Iterator var2 = LOCALES.iterator();
             while(var2.hasNext()) {
                 String locale = (String)var2.next();
                 BaatoTranslationMap.TranslationHashMap trMap = new BaatoTranslationMap.TranslationHashMap(Helper.getLocale(locale));
-                int identifier = resources.getIdentifier(locale.toLowerCase(),"raw", BaatoLib.getContext().getPackageName());
-//                InputStream is = gi.open(folder+locale + ".txt");
-                InputStream is = resources.openRawResource(identifier);
+//                int identifier = resources.getIdentifier(locale.toLowerCase(),"raw", context.getPackageName());
+                InputStream is = gi.open("locale/"+locale + ".txt");
+//                InputStream is = resources.openRawResource(identifier);
                 trMap.doImport(is);
                 this.add(trMap);
             }

baatolibrary/src/main/java/com/baato/baatolibrary/navigation/NavigateResponseConverter.java

@@ -21,6 +21,7 @@
 
 import androidx.annotation.Nullable;
 
+import android.content.Context;
 import android.util.Log;
 
 import com.baato.baatolibrary.models.NavResponse;
@@ -108,18 +109,18 @@ private enum Profile {
     /**
      * Converts a GHResponse into a json that follows the Mapbox API specification
      */
-    public static ObjectNode convertFromGHResponse(NavResponse ghResponsee, String type) {
+    public static ObjectNode convertFromGHResponse(NavResponse ghResponsee, String type, Context context) {
         ghResponse = ghResponsee;
         mtrMap = new NavigateResponseConverterTranslationMap(locale.getLanguage()).doImport();
-        trMap = new BaatoTranslationMap().doImport("locale/");
+        trMap = new BaatoTranslationMap().doImport(context);
         return navConverter(type);
     }
-    public static ObjectNode convertFromGHResponse(NavResponse ghResponsee, String type, Locale localevar) {
+    public static ObjectNode convertFromGHResponse(NavResponse ghResponsee, String type, Locale localevar, Context context) {
         ObjectNode json = JsonNodeFactory.instance.objectNode();
         ghResponse = ghResponsee;
         locale = localevar;
         mtrMap = new NavigateResponseConverterTranslationMap(locale.getLanguage()).doImport();
-        trMap = new BaatoTranslationMap().doImport("locale/");
+        trMap = new BaatoTranslationMap().doImport(context);
         return  navConverter(type);
 //        if (ghResponse.hasErrors())
 //            throw new IllegalStateException("If the response has errors, you should use the method NavigateResponseConverter#convertFromGHResponseError");

baatolibrary/src/main/java/com/baato/baatolibrary/services/BaatoRouting.java

@@ -64,6 +64,10 @@ public BaatoRouting setLocale(Locale locale) {
         this.locale = locale;
         return this;
     }
+    public BaatoRouting setContext(Context context) {
+        this.context = context;
+        return this;
+    }
 
     /**
      * Set the apiBaseURL.
@@ -148,11 +152,10 @@ public void cancelRequest() {
         directionsAPIResponseCall.cancel();
     }
 
-    public static String getParsedNavResponse(DirectionsAPIResponse response, String mode, Locale locale) {
-        return NavigateResponseConverter.convertFromGHResponse(response.getData().get(0), mode, locale).toString();
-    }
-
-    public static String getParsedNavResponse(DirectionsAPIResponse response, String mode) {
-        return NavigateResponseConverter.convertFromGHResponse(response.getData().get(0), mode).toString();
+    public static String getParsedNavResponse(DirectionsAPIResponse response, String mode, Context context) {
+        return NavigateResponseConverter.convertFromGHResponse(response.getData().get(0), mode,context).toString();
     }
+//    public static String getParsedNavResponse(DirectionsAPIResponse response, String mode) {
+//        return NavigateResponseConverter.convertFromGHResponse(response.getData().get(0), mode).toString();
+//    }
 }