Update user agent header (#11)

* Update Gradle and Android build tools

* Fix User-Agent format

* This change is required for Bridge to correctly identify platform and app version

Author: liujoshua

app/src/main/java/org/researchstack/sampleapp/SampleDataProvider.java

@@ -45,8 +45,13 @@ protected String getStudyId()
     }
 
     @Override
-    protected String getUserAgent()
-    {
-        return BuildConfig.STUDY_NAME + "/" + BuildConfig.VERSION_CODE;
+    protected String getStudyName() {
+        return BuildConfig.STUDY_NAME;
     }
+
+    @Override
+    protected int getAppVersion() {
+        return BuildConfig.VERSION_CODE;
+    }
+
 }

app/src/main/java/org/researchstack/sampleapp/bridge/BridgeDataProvider.java

@@ -2,8 +2,10 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -99,7 +101,43 @@ public abstract class BridgeDataProvider extends DataProvider
 
     protected abstract String getStudyId();
 
-    protected abstract String getUserAgent();
+    protected final String getUserAgent() {
+        return getStudyName() + "/" + getAppVersion() + " (" + getDeviceName() + "; Android " + Build.VERSION.RELEASE + ") BridgeSDK/0";
+    }
+
+    protected abstract String getStudyName();
+
+    protected abstract int getAppVersion();
+
+    private String getDeviceName() {
+        String manufacturer = Build.MANUFACTURER;
+        if (TextUtils.isEmpty(manufacturer)){
+            manufacturer = "Unknown";
+        }
+
+        String model = Build.MODEL;
+        if(TextUtils.isEmpty(model)){
+            model = "Android";
+        }
+
+        if (model.startsWith(manufacturer)) {
+            return capitalize(model);
+        } else {
+            return capitalize(manufacturer) + " " + model;
+        }
+    }
+
+    private String capitalize(String s) {
+        if (s == null || s.length() == 0) {
+            return "";
+        }
+        char first = s.charAt(0);
+        if (Character.isUpperCase(first)) {
+            return s;
+        } else {
+            return Character.toUpperCase(first) + s.substring(1);
+        }
+    }
 
     public BridgeDataProvider()
     {

app/src/test/java/org/researchstack/molemapper/TestMoleMapperApplication.java

@@ -0,0 +1,49 @@
+package org.researchstack.molemapper;
+
+import android.app.Application;
+import android.content.Context;
+import android.support.multidex.MultiDex;
+
+import org.researchstack.backbone.storage.database.AppDatabase;
+import org.researchstack.skin.ResearchStack;
+import org.robolectric.TestLifecycleApplication;
+
+import java.lang.reflect.Method;
+
+import static org.mockito.Mockito.mock;
+
+/**
+ * Replaces MoleMapperApplication for unit test purposes.
+ */
+public class TestMoleMapperApplication extends Application implements TestLifecycleApplication {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        MultiDex.install(this);
+
+        ResearchStack.init(this, new MoleMapperResearchStack() {
+            @Override
+            protected AppDatabase createAppDatabaseImplementation(Context context) {
+                // Used to initialize ResearchStack using a mock AppDatabase. Roboelectric and
+                // ORMLite do not play nicely
+                return mock(AppDatabase.class);
+            }
+
+        });
+    }
+
+    @Override
+    public void beforeTest(Method method) {
+
+    }
+
+    @Override
+    public void prepareTest(Object test) {
+
+    }
+
+    @Override
+    public void afterTest(Method method) {
+
+    }
+}

app/src/test/java/org/researchstack/molemapper/bridge/BridgeDataProviderTest.java

@@ -0,0 +1,55 @@
+package org.researchstack.molemapper.bridge;
+
+import android.util.Log;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.researchstack.molemapper.BuildConfig;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.util.regex.Pattern;
+
+
+/**
+ * Created by liujoshua on 8/10/16.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(constants = BuildConfig.class)
+public class BridgeDataProviderTest {
+    /**
+     * For example, "App Name/14".
+     */
+    private static final Pattern SHORT_STRING = Pattern.compile("^([^/]+)\\/(\\d{1,9})($)");
+    /**
+     * For example, "Unknown Client/14 BridgeJavaSDK/10".
+     */
+    private static final Pattern MEDIUM_STRING = Pattern.compile("^([^/]+)\\/(\\d{1,9})\\s([^/\\(]*)\\/(\\d{1,9})($)");
+    /**
+     * For example, "Asthma/26 (Unknown iPhone; iPhone OS 9.1) BridgeSDK/4" or
+     * "Asthma/26 (Unknown iPhone; iPhone OS/9.1) BridgeSDK/4"
+     */
+    private static final Pattern LONG_STRING = Pattern.compile("^([^/]+)\\/(\\d{1,9})\\s\\(([^;]+);([^\\)]*)\\)\\s([^/]*)\\/(\\d{1,9})($)");
+
+    private BridgeDataProvider bridgeDataProvider;
+
+    @Before
+    public void setUp() {
+        bridgeDataProvider = new MoleMapperDataProvider();
+    }
+
+    @Test
+    public void testGetUserAgent_MatchesValidFormat() {
+        String userAgent = bridgeDataProvider.getUserAgent();
+
+        boolean isMatchForShortString = SHORT_STRING.matcher(userAgent).matches();
+        boolean isMatchForMediumString = MEDIUM_STRING.matcher(userAgent).matches();
+        boolean isMatchForLongString = LONG_STRING.matcher(userAgent).matches();
+
+        assertTrue(isMatchForShortString || isMatchForMediumString || isMatchForLongString);
+    }
+}

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 
     dependencies {
         // change this to 1.5.x if you're not on Android Studio 2.0.0 beta
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.3'
         classpath 'me.tatarka:gradle-retrolambda:3.2.3'
         classpath "com.neenbedankt.gradle.plugins:android-apt:1.4"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Thu Sep 01 21:25:55 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip