Release beta.5 fixes

MapboxAndroidDemo/build.gradle

@@ -7,7 +7,7 @@ ext {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.mapbox.mapboxandroiddemo"
@@ -43,7 +43,7 @@ android {
 
     splits {
         abi {
-            enable true
+            enable false
             universalApk false
         }
     }

MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/MainActivity.java

@@ -25,10 +25,10 @@
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.example.sharedcode.analytics.AnalyticsTracker;
-import com.example.sharedcode.analytics.FirstTimeRunChecker;
 import com.github.javiersantos.materialstyleddialogs.MaterialStyledDialog;
 import com.mapbox.mapboxandroiddemo.adapter.ExampleAdapter;
+import com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker;
+import com.mapbox.mapboxandroiddemo.commons.FirstTimeRunChecker;
 import com.mapbox.mapboxandroiddemo.examples.annotations.AnimatedMarkerActivity;
 import com.mapbox.mapboxandroiddemo.examples.annotations.BasicMarkerViewActivity;
 import com.mapbox.mapboxandroiddemo.examples.annotations.CustomInfoWindowActivity;
@@ -92,16 +92,16 @@
 
 import java.util.ArrayList;
 
-import static com.example.sharedcode.analytics.AnalyticsTracker.CLICKED_ON_INFO_DIALOG_NOT_NOW;
-import static com.example.sharedcode.analytics.AnalyticsTracker.CLICKED_ON_INFO_DIALOG_START_LEARNING;
-import static com.example.sharedcode.analytics.AnalyticsTracker.CLICKED_ON_INFO_MENU_ITEM;
-import static com.example.sharedcode.analytics.AnalyticsTracker.CLICKED_ON_SETTINGS_IN_NAV_DRAWER;
-import static com.example.sharedcode.analytics.AnalyticsTracker.OPENED_APP;
-import static com.example.sharedcode.analytics.AnalyticsTracker.SKIPPED_ACCOUNT_CREATION;
-import static com.example.sharedcode.analytics.StringConstants.AVATAR_IMAGE_KEY;
-import static com.example.sharedcode.analytics.StringConstants.SKIPPED_KEY;
-import static com.example.sharedcode.analytics.StringConstants.TOKEN_SAVED_KEY;
-import static com.example.sharedcode.analytics.StringConstants.USERNAME_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.CLICKED_ON_INFO_DIALOG_NOT_NOW;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.CLICKED_ON_INFO_DIALOG_START_LEARNING;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.CLICKED_ON_INFO_MENU_ITEM;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.CLICKED_ON_SETTINGS_IN_NAV_DRAWER;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.OPENED_APP;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.SKIPPED_ACCOUNT_CREATION;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.AVATAR_IMAGE_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.SKIPPED_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.TOKEN_SAVED_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.USERNAME_KEY;
 
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
 

MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/AccountRetrievalService.java

@@ -8,7 +8,7 @@
 import android.util.Base64;
 import android.util.Log;
 
-import com.example.sharedcode.analytics.AnalyticsTracker;
+import com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker;
 import com.mapbox.mapboxandroiddemo.MainActivity;
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxandroiddemo.model.usermodel.UserResponse;
@@ -26,14 +26,14 @@
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
-import static com.example.sharedcode.analytics.StringConstants.AUTHCODE_KEY;
-import static com.example.sharedcode.analytics.StringConstants.AVATAR_IMAGE_KEY;
-import static com.example.sharedcode.analytics.StringConstants.CLIENT_ID_KEY;
-import static com.example.sharedcode.analytics.StringConstants.EMAIL_KEY;
-import static com.example.sharedcode.analytics.StringConstants.REDIRECT_URI_KEY;
-import static com.example.sharedcode.analytics.StringConstants.TOKEN_KEY;
-import static com.example.sharedcode.analytics.StringConstants.TOKEN_SAVED_KEY;
-import static com.example.sharedcode.analytics.StringConstants.USERNAME_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.AUTHCODE_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.AVATAR_IMAGE_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.CLIENT_ID_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.EMAIL_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.REDIRECT_URI_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.TOKEN_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.TOKEN_SAVED_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.USERNAME_KEY;
 
 
 /**

MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java

@@ -14,17 +14,17 @@
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.example.sharedcode.analytics.AnalyticsTracker;
+import com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker;
 import com.github.javiersantos.materialstyleddialogs.MaterialStyledDialog;
 import com.mapbox.mapboxandroiddemo.MainActivity;
 import com.mapbox.mapboxandroiddemo.R;
 
-import static com.example.sharedcode.analytics.AnalyticsTracker.CLICKED_ON_CREATE_ACCOUNT_BUTTON;
-import static com.example.sharedcode.analytics.AnalyticsTracker.CLICKED_ON_SIGN_IN_BUTTON;
-import static com.example.sharedcode.analytics.StringConstants.AUTHCODE_KEY;
-import static com.example.sharedcode.analytics.StringConstants.CLIENT_ID_KEY;
-import static com.example.sharedcode.analytics.StringConstants.REDIRECT_URI_KEY;
-import static com.example.sharedcode.analytics.StringConstants.TOKEN_SAVED_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.CLICKED_ON_CREATE_ACCOUNT_BUTTON;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.CLICKED_ON_SIGN_IN_BUTTON;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.AUTHCODE_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.CLIENT_ID_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.REDIRECT_URI_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.TOKEN_SAVED_KEY;
 
 
 public class LandingActivity extends AppCompatActivity {

MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/utils/SettingsDialogView.java

@@ -10,19 +10,19 @@
 import android.widget.Switch;
 import android.widget.Toast;
 
-import com.example.sharedcode.analytics.AnalyticsTracker;
+import com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker;
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxandroiddemo.account.LandingActivity;
 
-import static com.example.sharedcode.analytics.AnalyticsTracker.LOGGED_OUT_OF_MAPBOX_ACCOUNT;
-import static com.example.sharedcode.analytics.AnalyticsTracker.OPTED_IN_TO_ANALYTICS;
-import static com.example.sharedcode.analytics.AnalyticsTracker.OPTED_OUT_OF_ANALYTICS;
-import static com.example.sharedcode.analytics.StringConstants.AVATAR_IMAGE_KEY;
-import static com.example.sharedcode.analytics.StringConstants.EMAIL_KEY;
-import static com.example.sharedcode.analytics.StringConstants.FROM_LOG_OUT_BUTTON_KEY;
-import static com.example.sharedcode.analytics.StringConstants.TOKEN_KEY;
-import static com.example.sharedcode.analytics.StringConstants.TOKEN_SAVED_KEY;
-import static com.example.sharedcode.analytics.StringConstants.USERNAME_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.LOGGED_OUT_OF_MAPBOX_ACCOUNT;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.OPTED_IN_TO_ANALYTICS;
+import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.OPTED_OUT_OF_ANALYTICS;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.AVATAR_IMAGE_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.EMAIL_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.FROM_LOG_OUT_BUTTON_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.TOKEN_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.TOKEN_SAVED_KEY;
+import static com.mapbox.mapboxandroiddemo.commons.StringConstants.USERNAME_KEY;
 
 
 public class SettingsDialogView {

MapboxAndroidWearDemo/build.gradle

@@ -3,7 +3,7 @@ apply from: "$project.rootDir/script-git-version.gradle"
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.mapbox.mapboxandroiddemo"
@@ -24,8 +24,8 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     provided 'com.google.android.wearable:wearable:2.0.3'
     compile 'com.google.android.support:wearable:2.0.3'
-    compile 'com.google.android.gms:play-services-wearable:11.0.0'
-    compile 'com.google.android.gms:play-services-location:11.0.0'
+    compile 'com.google.android.gms:play-services-wearable:11.0.1'
+    compile 'com.google.android.gms:play-services-location:11.0.1'
     // Mapbox dependencies
     compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0-beta.5@aar') {
         transitive = true

MapboxAndroidWearDemo/src/main/java/com/mapbox/mapboxandroiddemo/MainActivity.java

@@ -5,10 +5,10 @@
 import android.support.wearable.activity.WearableActivity;
 import android.support.wearable.view.WearableRecyclerView;
 
-import com.example.sharedcode.analytics.AnalyticsTracker;
-import com.example.sharedcode.analytics.FirstTimeRunChecker;
 import com.mapbox.mapboxandroiddemo.adapter.ExampleAdapter;
 
+import com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker;
+import com.mapbox.mapboxandroiddemo.commons.FirstTimeRunChecker;
 import com.mapbox.mapboxandroiddemo.examples.LocationTrackingActivity;
 import com.mapbox.mapboxandroiddemo.examples.MapFragmentActivity;
 import com.mapbox.mapboxandroiddemo.examples.OfflineMapActivity;

SharedCode/.gitignore

@@ -1 +1,2 @@
 /build
+/src/main/res/values/developer-config.xml

SharedCode/build.gradle

@@ -2,32 +2,18 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:support-annotations:25.3.1'
     compile 'com.segment.analytics.java:analytics:2.0.0'
 }
 apply from: './gradle-config.gradle'

SharedCode/gradle-config.gradle

@@ -5,6 +5,10 @@
 task secretKeysSetup {
     def secretFile = new File("${projectDir}/src/main/res/values/developer-config.xml")
     if (!secretFile.exists()) {
+        // create values folder if non existent
+        def folder = new File("${projectDir}/src/main/res/values")
+        folder.mkdirs()
+
         String mapboxFlowSecret = "$System.env.MAPBOX_AUTH_FLOW_SECRET"
         if (mapboxFlowSecret == "null") {
             System.out.println("You should set the MAPBOX_AUTH_FLOW_SECRET environment variable.")

SharedCode/src/main/AndroidManifest.xml

@@ -1,13 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
-          package="com.example.sharedcode"
->
-
-    <application android:allowBackup="true"
-                 android:label="@string/app_name"
-                 android:supportsRtl="true"
-    >
-
-    </application>
-
-</manifest>
+<manifest package="com.mapbox.mapboxandroiddemo.commons"/>

SharedCode/src/main/java/com/example/sharedcode/analytics/AnalyticsTracker.java → SharedCode/src/main/java/com/mapbox/mapboxandroiddemo/commons/AnalyticsTracker.java

@@ -1,13 +1,11 @@
-package com.example.sharedcode.analytics;
+package com.mapbox.mapboxandroiddemo.commons;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
-import com.example.sharedcode.R;
 import com.segment.analytics.Analytics;
 import com.segment.analytics.messages.IdentifyMessage;
 import com.segment.analytics.messages.ScreenMessage;
@@ -17,9 +15,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import static com.example.sharedcode.analytics.StringConstants.EMAIL_KEY;
-import static com.example.sharedcode.analytics.StringConstants.USERNAME_KEY;
-
 /**
  * This class abstracts various analytics calls to Segment analytics' Java library.
  */
@@ -38,7 +33,7 @@ public class AnalyticsTracker {
   public static final String CLICKED_ON_CREATE_ACCOUNT_BUTTON = "Clicked on create account button";
   public static final String CLICKED_ON_SIGN_IN_BUTTON = "Clicked on sign in button";
 
-  private Context appContext = null;
+  private Context appContext;
   private static volatile AnalyticsTracker analyticsInstance;
   private static volatile Analytics analytics;
   private static final String CLICKED_ON_NAV_DRAWER_SECTION_EVENT_NAME = "Clicked on nav drawer section";
@@ -51,7 +46,7 @@ public class AnalyticsTracker {
   private static final String MAPBOX_SHARED_PREFERENCE_KEY_ANALYTICS_ENABLED = "mapboxAnalyticsEnabled";
   private static final String MAPBOX_SHARED_PREFERENCES_FILE = "MapboxSharedPreferences";
   private static String MAPBOX_USERNAME;
-  private Boolean analyticsEnabled = null;
+  private Boolean analyticsEnabled;
   private Boolean deviceIsWearable;
 
   /**
@@ -77,18 +72,18 @@ public static AnalyticsTracker getInstance(@NonNull Context context, boolean isW
 
   public void setMapboxUsername() {
     MAPBOX_USERNAME = PreferenceManager.getDefaultSharedPreferences(
-      analyticsInstance.appContext).getString(USERNAME_KEY, "not logged in");
+      analyticsInstance.appContext).getString(StringConstants.USERNAME_KEY, "not logged in");
   }
 
   /**
    * Gets and adds device information to analytics call. Ideally, this method is called
    * when app is opened for the first time or if shared preferences is cleared.
    **/
 
-  public void openedAppForFirstTime(@Nullable boolean isTablet, boolean loggedIn) {
+  public void openedAppForFirstTime(boolean isTablet, boolean loggedIn) {
     Map<String, String> properties = new HashMap<>();
     properties.put("email", getSharedPreferences(appContext)
-      .getString(EMAIL_KEY, "not logged in"));
+      .getString(StringConstants.EMAIL_KEY, "not logged in"));
     properties.put("model", Build.MODEL);
     properties.put("brand", Build.BRAND);
     properties.put("product", Build.PRODUCT);