[dotnet] SlowLoadableComponent ignores UnableToLoadMessage

Fixes issue #8550
SeleniumHQ · Oct 12, 2021 · 54aba4c · 54aba4c
1 parent d3b35ef
commit 54aba4c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/dotnet/src/support/UI/SlowLoadableComponent{T}.cs b/dotnet/src/support/UI/SlowLoadableComponent{T}.cs
@@ -1,4 +1,4 @@
-// <copyright file="SlowLoadableComponent{T}.cs" company="WebDriver Committers">
+// <copyright file="SlowLoadableComponent{T}.cs" company="WebDriver Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements. See the NOTICE file
 // distributed with this work for additional information
@@ -104,8 +104,12 @@ public override T Load()
             }
             else
             {
-                string timeoutMessage = string.Format(CultureInfo.InvariantCulture, "Timed out after {0} seconds.", this.timeout.TotalSeconds);
-                throw new WebDriverTimeoutException(timeoutMessage);
+                if (string.IsNullOrEmpty(UnableToLoadMessage))
+                {
+                    this.UnableToLoadMessage = string.Format(CultureInfo.InvariantCulture, "Timed out after {0} seconds.", this.timeout.TotalSeconds);
+                }
+
+                throw new WebDriverTimeoutException(this.UnableToLoadMessage);
             }
         }
 

diff --git a/dotnet/src/webdriver/Firefox/FirefoxAndroidOptions.cs b/dotnet/src/webdriver/Firefox/FirefoxAndroidOptions.cs
@@ -27,9 +27,6 @@ namespace OpenQA.Selenium.Firefox
     /// </summary>
     public class FirefoxAndroidOptions : AndroidOptions
     {
-        private string androidPackage;
-        private string androidDeviceSerial;
-        private string androidActivity;
         private List<string> androidIntentArguments = new List<string>();
 
         /// <summary>
@@ -54,7 +51,7 @@ public ReadOnlyCollection<string> AndroidIntentArguments
         /// <param name="arguments">The argument to add.</param>
         public void AddIntentArgument(string argument)
         {
-            this.AddIntentArguments(argument);
+            this.ddIntentArguments(argument);
         }
 
         /// <summary>