[android] - modularise the sdk

platform/android/MapboxGLAndroidSDK/build.gradle

@@ -13,7 +13,6 @@ dependencies {
     implementation dependenciesList.mapboxJavaTurf
     implementation dependenciesList.supportAnnotations
     implementation dependenciesList.supportFragmentV4
-    implementation dependenciesList.timber
     implementation dependenciesList.okhttp3
     testImplementation dependenciesList.junit
     testImplementation dependenciesList.mockito
@@ -160,4 +159,4 @@ apply from: "${rootDir}/gradle/gradle-javadoc.gradle"
 apply from: "${rootDir}/gradle/gradle-publish.gradle"
 apply from: "${rootDir}/gradle/gradle-checkstyle.gradle"
 apply from: "${rootDir}/gradle/gradle-tests-staticblockremover.gradle"
-apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle"
+apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle"

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/LibraryLoader.java

@@ -1,6 +1,6 @@
 package com.mapbox.mapboxsdk;
 
-import timber.log.Timber;
+import com.mapbox.mapboxsdk.log.Logger;
 
 /**
  * Loads the mapbox-gl shared library
@@ -11,6 +11,8 @@
  */
 public abstract class LibraryLoader {
 
+  private static final String TAG = "Mbgl-LibraryLoader";
+
   private static final LibraryLoader DEFAULT = new LibraryLoader() {
     @Override
     public void load(String name) {
@@ -39,7 +41,7 @@ public static void load() {
     try {
       loader.load("mapbox-gl");
     } catch (UnsatisfiedLinkError error) {
-      Timber.e(error, "Failed to load native shared library.");
+      Logger.e(TAG, "Failed to load native shared library.", error);
     }
   }
 

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java

@@ -9,13 +9,12 @@
 import android.support.annotation.UiThread;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.exceptions.MapboxConfigurationException;
-import com.mapbox.mapboxsdk.maps.Telemetry;
+import com.mapbox.mapboxsdk.log.Logger;
+import com.mapbox.mapboxsdk.maps.TelemetryDefinition;
 import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
 import com.mapbox.mapboxsdk.storage.FileSource;
 import com.mapbox.mapboxsdk.utils.ThreadUtils;
 
-import timber.log.Timber;
-
 /**
  * The entry point to initialize the Mapbox Android SDK.
  * <p>
@@ -25,13 +24,18 @@
  * </p>
  */
 @UiThread
+@SuppressLint("StaticFieldLeak")
 public final class Mapbox {
 
-  @SuppressLint("StaticFieldLeak")
+  private static final String TAG = "Mbgl-Mapbox";
+
+  private static ModuleProvider moduleProvider;
   private static Mapbox INSTANCE;
+
   private Context context;
   private String accessToken;
   private Boolean connected;
+  private TelemetryDefinition telemetry;
 
   /**
    * Get an instance of Mapbox.
@@ -121,10 +125,33 @@ public static synchronized Boolean isConnected() {
    */
   private static void initializeTelemetry() {
     try {
-      Telemetry.initialize();
+      INSTANCE.telemetry = getModuleProvider().obtainTelemetry();
     } catch (Exception exception) {
-      Timber.e(exception);
+      Logger.e(TAG, "Error occured while initializing telemetry", exception);
+    }
+  }
+
+  /**
+   * Get an instance of Telemetry if initialised
+   *
+   * @return instance of telemetry
+   */
+  @Nullable
+  public static TelemetryDefinition getTelemetry() {
+    return INSTANCE.telemetry;
+  }
+
+  /**
+   * Get the module provider
+   *
+   * @return moduleProvider
+   */
+  @NonNull
+  public static ModuleProvider getModuleProvider() {
+    if (moduleProvider == null) {
+      moduleProvider = new ModuleProviderImpl();
     }
+    return moduleProvider;
   }
 
   /**
@@ -150,4 +177,4 @@ static boolean isAccessTokenValid(String accessToken) {
     accessToken = accessToken.trim().toLowerCase(MapboxConstants.MAPBOX_LOCALE);
     return accessToken.length() != 0 && (accessToken.startsWith("pk.") || accessToken.startsWith("sk."));
   }
-}
+}

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java

@@ -0,0 +1,29 @@
+package com.mapbox.mapboxsdk;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import com.mapbox.mapboxsdk.http.HttpRequest;
+import com.mapbox.mapboxsdk.maps.TelemetryDefinition;
+
+/**
+ * Injects concrete instances of configurable abstractions
+ */
+public interface ModuleProvider {
+
+  /**
+   * Create a new concrete implementation of HttpRequest.
+   *
+   * @return a new instance of an HttpRequest
+   */
+  @NonNull
+  HttpRequest createHttpRequest();
+
+  /**
+   * Get the concrete implementation of TelemetryDefinition
+   *
+   * @return a single instance of Telemetry
+   */
+  @Nullable
+  TelemetryDefinition obtainTelemetry();
+
+}

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java

@@ -0,0 +1,26 @@
+package com.mapbox.mapboxsdk;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import com.mapbox.mapboxsdk.http.HttpRequest;
+import com.mapbox.mapboxsdk.maps.TelemetryDefinition;
+import com.mapbox.mapboxsdk.module.http.HttpRequestImpl;
+import com.mapbox.mapboxsdk.module.telemetry.TelemetryImpl;
+
+public class ModuleProviderImpl implements ModuleProvider {
+
+  @Override
+  @NonNull
+  public HttpRequest createHttpRequest() {
+    return new HttpRequestImpl();
+  }
+
+  @Override
+  @Nullable
+  public TelemetryDefinition obtainTelemetry() {
+    // TODO remove singleton with next major release,
+    // this is needed to make static methods on TelemetryImpl
+    // backwards compatible without breaking semver
+    return TelemetryImpl.getInstance();
+  }
+}

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java

@@ -0,0 +1,13 @@
+package com.mapbox.mapboxsdk.constants;
+
+public class TelemetryConstants {
+
+  public static final String TWO_FINGER_TAP = "TwoFingerTap";
+  public static final String DOUBLE_TAP = "DoubleTap";
+  public static final String SINGLE_TAP = "SingleTap";
+  public static final String PAN = "Pan";
+  public static final String PINCH = "Pinch";
+  public static final String ROTATION = "Rotation";
+  public static final String PITCH = "Pitch";
+
+}