Preparing release 2.2.3

Author: queue-it

README.md

@@ -17,7 +17,7 @@ This whitepaper contains the needed information to perform a successful integrat
 Using Gradle:
 
 ```gradle
-implementation 'com.queue-it.androidsdk:library:2.2.2'
+implementation 'com.queue-it.androidsdk:library:2.2.3'
 ```
 
 ## How to use the library (Mobile SDK integration only, no API protection)

build.gradle

@@ -35,7 +35,7 @@ allprojects {
         groupId = 'com.queue-it.androidsdk'
         libraryName = 'com.queue_it.androidsdk'
         libraryDescription = 'Android SDK to integrate with Queue-it'
-        libraryVersion = "2.2.2"
+        libraryVersion = "2.2.3"
         organization = "Queue-it"
         organizationUrl = "https://queue-it.com"
 

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

@@ -108,6 +108,13 @@ public boolean handleNavigationRequest(final String destinationUrlStr, WebView w
             return true;
         }
 
+        if (isTargetUri(destinationUri)) {
+            String queueItToken = destinationUri.getQueryParameter("queueittoken");
+            uriOverride.onPassed(queueItToken);
+
+            return true;
+        }
+
         String navigationHost = destinationUri.getHost();
         String queueHost = queue.getHost();
 
@@ -129,13 +136,6 @@ public boolean handleNavigationRequest(final String destinationUrlStr, WebView w
             }
         }
 
-        if (isTargetUri(destinationUri)) {
-            String queueItToken = destinationUri.getQueryParameter("queueittoken");
-            uriOverride.onPassed(queueItToken);
-
-            return true;
-        }
-
         if (!isQueueItUrl) {
             Intent browserIntent = new Intent(Intent.ACTION_VIEW, destinationUri);
             webview.getContext().startActivity(browserIntent);

library/src/test/java/com/queue_it/androidsdk/UriOverriderTest.java

@@ -126,7 +126,7 @@ protected void onSessionRestart() {
     }
 
     @Test
-    public void givenuserIsNavigatingToUrlOnTargetDomainButNotTargetUrl_ThenQueueSHouldNotBePassedAndWebBrowserShouldOpen() {
+    public void givenUserIsNavigatingToUrlOnTargetDomainButNotTargetUrl_ThenQueueShouldNotBePassedAndWebBrowserShouldOpen() {
         String destinationUrl = "https://queue-it.com/what-is-this.html?customerId=vavatest&eventId=testendedroom&queueId=00000000-0000-0000-0000-000000000000&language=en-US";
         UriOverrider testObj = new UriOverrider();
         testObj.setQueue(Uri.parse("https://vavatest.queue-it.net/app/enqueue"));
@@ -192,6 +192,39 @@ protected void onSessionRestart() {
         assertTrue(queuePassed.get());
     }
 
+    @Test
+    public void givenUserIsRedirectedToTargetInSameDomainLoadShouldBeCancelled() {
+        UriOverrider testObj = new UriOverrider();
+        testObj.setQueue(Uri.parse("https://useraccount.queue-it.net/app/enqueue"));
+        testObj.setTarget(Uri.parse("https://useraccount.queue-it.net/"));
+        WebView webView = getMockedWebview();
+        final AtomicBoolean queuePassed = new AtomicBoolean(false);
+        boolean loadCancelled = testObj.handleNavigationRequest("https://useraccount.queue-it.net/?queueittoken=a", webView, new UriOverrideWrapper() {
+            @Override
+            protected void onQueueUrlChange(String uri) {
+                System.out.print(uri);
+            }
+
+            @Override
+            protected void onPassed(String queueItToken) {
+                queuePassed.set(true);
+            }
+
+            @Override
+            protected void onCloseClicked() {
+
+            }
+
+            @Override
+            protected void onSessionRestart() {
+
+            }
+        });
+
+        assertTrue(loadCancelled);
+        assertTrue(queuePassed.get());
+    }
+
     @Test
     public void givenUserIsNavigatingToExternalPageThenLoadShouldBeCancelledAndIntentShouldBeStarted() {
         UriOverrider testObj = new UriOverrider();