Use equals for host name checks

startsWith could match e.g. makecode.com.example.com
microbit-foundation · Jul 24, 2024 · 14aa7e1 · 14aa7e1
1 parent 8e47156
commit 14aa7e1
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java b/app/src/main/java/com/samsung/microbit/ui/activity/MakeCodeWebView.java
@@ -282,35 +282,35 @@ private boolean overrideUri( final Uri uri) {
         host = host == null ? "" : host.toLowerCase();
         path = path == null ? "" : path.toLowerCase();
 
-        if ( host.startsWith( "makecode.microbit.org")) {
+        if ( host.equals("makecode.microbit.org")) {
             if ( url.startsWith( makecodeUrl))
                 return false;
             else if ( path.startsWith( "/oauth/login"))
                 return false;
             else if ( path.equals( "/") && uri.getQueryParameter("authcallback") != null)
                 return false;
         }
-        else if ( host.startsWith( "makecode.com")) {
+        else if ( host.equals( "makecode.com")) {
             if ( path.startsWith("/oauth/callback"))
                 return false;
             else if ( path.startsWith("/auth/callback"))
                 return false;
         }
-        else if ( host.startsWith( "login.live.com"))
+        else if ( host.equals( "login.live.com"))
             return false;
-        else if ( host.startsWith( "login.microsoftonline.com"))
+        else if ( host.equals( "login.microsoftonline.com"))
             return false;
-        else if ( host.startsWith( "www.pxt.io"))
+        else if ( host.equals( "www.pxt.io"))
             return false;
-        else if ( host.startsWith( "trg-microbit.userpxt.io"))
+        else if ( host.equals( "trg-microbit.userpxt.io"))
             return false;
-        else if ( host.startsWith( "pxt.azureedge.net"))
+        else if ( host.equals( "pxt.azureedge.net"))
             return false;
-        else if ( host.startsWith( "accounts.google.com"))
+        else if ( host.equals( "accounts.google.com"))
             return false;
-        else if ( host.startsWith( "clever.com"))
+        else if ( host.equals( "clever.com"))
             return false;
-        else if ( host.startsWith( "github.com")) {
+        else if ( host.equals( "github.com")) {
             if ( path.startsWith( "/login/oauth/"))
                 return false;
             if ( path.equals( "/login"))