Fix UriOverrider::isTargetUri with different paths

qoqa · Jan 25, 2024 · 833d614 · 833d614
1 parent b811d56
commit 833d614
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/library/src/main/java/com/queue_it/androidsdk/UriOverrider.java b/library/src/main/java/com/queue_it/androidsdk/UriOverrider.java
@@ -50,7 +50,7 @@ private boolean isTargetUri(Uri destinationUri) {
         String destinationPath = destinationUri.getPath();
 
         String targetHost = target.getHost();
-        String targetPath = destinationUri.getPath();
+        String targetPath = target.getPath();
 
         return destinationHost.equalsIgnoreCase(targetHost)
                 && destinationPath.equals(targetPath);

diff --git a/library/src/test/java/com/queue_it/androidsdk/UriOverriderTest.java b/library/src/test/java/com/queue_it/androidsdk/UriOverriderTest.java
@@ -230,6 +230,44 @@ protected void onSessionRestart() {
         verify(webView.getContext()).startActivity(argument.capture());
     }
 
+    @Test
+    public void givenUserIsNavigatingToOtherPathThenLoadShouldBeCancelledAndIntentShouldBeStarted() {
+        UriOverrider testObj = new UriOverrider();
+        testObj.setQueue(Uri.parse("https://useraccount.queue-it.net/app/enqueue"));
+        testObj.setTarget(Uri.parse("https://www.qoqa.ch/"));
+        WebView webView = getMockedWebview();
+        final AtomicBoolean queuePassed = new AtomicBoolean(false);
+        ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);
+        String otherPage = "https://www.qoqa.ch/concept";
+
+        boolean loadCancelled = testObj.handleNavigationRequest(otherPage, 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);
+        assertFalse(queuePassed.get());
+
+        verify(webView.getContext()).startActivity(argument.capture());
+    }
+
     @Test
     public void givenAppUserIsRedirectedToDeepLinkThenLoadShouldBeCancelled() {
         UriOverrider testObj = new UriOverrider();