Merged PR 2513: Add SDK version to user-agent

SDK Version is now appended to the user-agent.
AppEnqueue requests now contain the new user-agent value.

Related work items: #7481

Author: sp0x

library/src/main/java/com/queue_it/androidsdk/QueueActivityBase.java

@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
 import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Build;
@@ -108,9 +109,9 @@ public void initialize(Bundle savedInstanceState) {
         _context.setContentView(R.layout.activity_queue);
         readActivityUrls(savedInstanceState);
         cleanupWebView();
-        final ProgressBar progressBar = (ProgressBar) _context.findViewById(R.id.progressBar);
+        final ProgressBar progressBar = _context.findViewById(R.id.progressBar);
 
-        FrameLayout layout = (FrameLayout) _context.findViewById(R.id.relativeLayout);
+        FrameLayout layout = _context.findViewById(R.id.relativeLayout);
         webview = new WebView(_context);
         layout.addView(webview);
         previousWebView = webview;
@@ -130,7 +131,7 @@ public void onProgressChanged(WebView view, int newProgress) {
         });
         webview.setWebViewClient(webviewClient);
         Log.v("QueueITEngine", "Loading initial URL: " + queueUrl);
-        setUserAgent();
+        setUserAgent(UserAgentManager.getUserAgent());
         webview.loadUrl(queueUrl);
     }
 
@@ -172,10 +173,8 @@ private void disposeWebview(WebView webView) {
         _context.finish();
     }
 
-    private void setUserAgent(){
-        String defaultUserAgent = new WebView(_context).getSettings().getUserAgentString();
-        defaultUserAgent += "(sdk: " + QueueITEngine.getVerboseSdkVersion() + ")";
-        System.setProperty("http.agent", defaultUserAgent);
-        webview.getSettings().setUserAgentString(defaultUserAgent);
+    private void setUserAgent(String userAgent) {
+        System.setProperty("http.agent", userAgent);
+        webview.getSettings().setUserAgentString(userAgent);
     }
 }

library/src/main/java/com/queue_it/androidsdk/QueueITEngine.java

@@ -10,7 +10,6 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
-import android.webkit.WebView;
 
 import java.util.Calendar;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -44,6 +43,7 @@ public QueueITEngine(Activity applicationContext, String customerId, String even
     public QueueITEngine(Activity activityContext, String customerId, String eventOrAliasId, String layoutName,
                          String language, QueueListener queueListener) {
         _requestInProgress = new AtomicBoolean(false);
+        UserAgentManager.initialize(activityContext);
         if (TextUtils.isEmpty(customerId)) {
             throw new IllegalArgumentException("customerId must have a value");
         }
@@ -246,7 +246,7 @@ private String getUserId() {
 
     private void tryEnqueue() {
         String userId = getUserId();
-        String userAgent = new WebView(_context).getSettings().getUserAgentString();
+        String userAgent = UserAgentManager.getUserAgent();
         String sdkVersion = getSdkVersion();
 
         QueueServiceListener queueServiceListener = new QueueServiceListener() {
@@ -324,8 +324,4 @@ private void updateQueuePageUrl(String queueUrl) {
     public String getSdkVersion() {
         return "Android-" + BuildConfig.VERSION_NAME;
     }
-
-    public static String getVerboseSdkVersion(){
-        return BuildConfig.LIBRARY_PACKAGE_NAME + "@" + BuildConfig.VERSION_NAME;
-    }
 }

library/src/main/java/com/queue_it/androidsdk/QueueUrlHelper.java

@@ -29,6 +29,9 @@ public static Uri updateUrl(Uri queueUrl, String userId) {
     }
 
     public static boolean urlUpdateNeeded(String queueUrl, String userId) {
+        if(queueUrl==null || userId==null){
+            return false;
+        }
         Uri uri = Uri.parse(queueUrl);
         return urlUpdateNeeded(uri, userId);
     }

library/src/main/java/com/queue_it/androidsdk/UserAgentManager.java

@@ -0,0 +1,20 @@
+package com.queue_it.androidsdk;
+
+import android.app.Activity;
+import android.webkit.WebView;
+
+public class UserAgentManager {
+    public static final String SDKVersion = BuildConfig.LIBRARY_PACKAGE_NAME + "@" + BuildConfig.VERSION_NAME;
+    private static String DeviceUserAgent;
+
+    private UserAgentManager(){
+    }
+
+    public static void initialize(Activity context) {
+        DeviceUserAgent = new WebView(context).getSettings().getUserAgentString();
+    }
+
+    public static String getUserAgent() {
+        return DeviceUserAgent + " (sdk: " + SDKVersion + ")";
+    }
+}