From 79708ff9d8a364ad83d390edb402f03761f0c885 Mon Sep 17 00:00:00 2001
From: Antonio Zugaldia <antonio@mapbox.com>
Date: Mon, 19 Sep 2016 18:30:56 -0400
Subject: [PATCH] Adjust logging level for failed OkHttp requests (#6378)

* log level depending on the error type
* Squashing and Merging
* remove unnecessary log (with wrong tag)
---
 .../com/mapbox/mapboxsdk/MapboxAccountManager.java |  2 --
 .../com/mapbox/mapboxsdk/http/HTTPRequest.java     | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapboxAccountManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapboxAccountManager.java
index 4930384f5..5770f54a8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapboxAccountManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/MapboxAccountManager.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.exceptions.InvalidAccessTokenException;
@@ -94,7 +93,6 @@ public class MapboxAccountManager {
         ConnectivityManager cm = (ConnectivityManager) applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
         boolean result = (activeNetwork != null && activeNetwork.isConnected());
-        Log.v("IOUtils", "isConnected result = " + result);
         return result;
     }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
index a573f7d87..8c818c2f5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
@@ -138,8 +138,6 @@ class HTTPRequest implements Callback {
     }
 
     private void onFailure(Exception e) {
-        Log.w(LOG_TAG, String.format("[HTTP] Request could not be executed: %s", e.getMessage()));
-
         int type = PERMANENT_ERROR;
         if ((e instanceof NoRouteToHostException) || (e instanceof UnknownHostException) || (e instanceof SocketException) || (e instanceof ProtocolException) || (e instanceof SSLException)) {
             type = CONNECTION_ERROR;
@@ -149,6 +147,18 @@ class HTTPRequest implements Callback {
 
         String errorMessage = e.getMessage() != null ? e.getMessage() : "Error processing the request";
 
+        if (type == TEMPORARY_ERROR) {
+            Log.d(LOG_TAG, String.format(MapboxConstants.MAPBOX_LOCALE,
+                "Request failed due to a temporary error: %s", errorMessage));
+        } else if (type == CONNECTION_ERROR) {
+            Log.i(LOG_TAG, String.format(MapboxConstants.MAPBOX_LOCALE,
+                "Request failed due to a connection error: %s", errorMessage));
+        } else {
+            // PERMANENT_ERROR
+            Log.w(LOG_TAG, String.format(MapboxConstants.MAPBOX_LOCALE,
+                "Request failed due to a permanent error: %s", errorMessage));
+        }
+
         mLock.lock();
         if (mNativePtr != 0) {
             nativeOnFailure(type, errorMessage);