Merge pull request #279 from Automattic/improve_user_agent

Improve UserAgent string for Tracks client

Author: anandnalya

AutomatticTracks/src/main/java/com/automattic/android/tracks/DeviceInformation.java

@@ -63,6 +63,8 @@
     private final JSONObject mImmutableDeviceInfoJSON;
     private final boolean mIsPortraitDefault;
 
+    private final String deviceUserAgent;
+
     public DeviceInformation(Context context) {
         mContext = context;
 
@@ -145,6 +147,9 @@ public DeviceInformation(Context context) {
             }
         }
 
+        // pre-populate Tracks client user agent
+        deviceUserAgent = String.format("Nosara Client for %s; %s/%s", mModel, mOs, mOsVersion);
+
         // pre-populate the JSON version with immutable info here for performance reasons
         mImmutableDeviceInfoJSON = new JSONObject();
         try {
@@ -406,4 +411,8 @@ public boolean isRtlLanguage() {
     public String getDeviceLanguage() {
         return mDeviceLanguage;
     }
+
+    public String getDeviceUserAgent() {
+        return deviceUserAgent;
+    }
 }

AutomatticTracks/src/main/java/com/automattic/android/tracks/TracksClient.java

@@ -32,7 +32,6 @@
 public class TracksClient {
     public static final String LOGTAG = "NosaraClient";
 
-    protected static final String DEFAULT_USER_AGENT = "Nosara Client for Android";
     protected static final String NOSARA_REST_API_ENDPOINT_URL_V1_1 = "https://public-api.wordpress.com/rest/v1.1/";
     protected static final int DEFAULT_EVENTS_QUEUE_THRESHOLD = 9;
     protected static final int DEFAULT_EVENTS_QUEUE_MAX_SIZE = 10000;
@@ -53,7 +52,7 @@ public static enum NosaraUserType {ANON, WPCOM, SIMPLENOTE, POCKETCASTS, DAYONE}
     final static String PROTOCOL_CONTENT_TYPE = String.format("application/json; charset=%s", PROTOCOL_CHARSET);
 
     private final Context mContext;
-    private String mUserAgent = TracksClient.DEFAULT_USER_AGENT;
+    private final String mUserAgent;
     private String mRestApiEndpointURL;
     private final String mTracksRestEndpointURL;
     private DeviceInformation deviceInformation;
@@ -89,6 +88,7 @@ private TracksClient(Context ctx) {
         mRestApiEndpointURL = NOSARA_REST_API_ENDPOINT_URL_V1_1;
         mTracksRestEndpointURL = getAbsoluteURL("tracks/record");
         deviceInformation = new DeviceInformation(ctx);
+        mUserAgent = deviceInformation.getDeviceUserAgent();
 
         // This is the thread that reads from the "fast" (in-memory) input events queue and actually writes data to the DB.
         Thread bufferCopyThread = new Thread(new Runnable() {
@@ -495,11 +495,6 @@ private String getAbsoluteURL(String url) {
         return String.format("%s%s", mRestApiEndpointURL, url);
     }
 
-    //Sets the User-Agent header to be sent with each future request.
-    public void setUserAgent(String userAgent) {
-        mUserAgent = userAgent;
-    }
-
     public String getUserAgent() {
         return mUserAgent;
     }