GCM release v2.2.1 (#1316)

**Changes since 2.2.0:** - Workaround Avalonia crashing issue on macOS (#1314)
git-ecosystem · Jul 5, 2023 · 2f5264d · 2f5264d
2 parents de28bd9 + 43ec9ae
commit 2f5264d
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 13 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.0.0
+2.2.1.0
diff --git a/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs b/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs
@@ -1,6 +1,7 @@
 using Atlassian.Bitbucket.UI.ViewModels;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitCredentialManager.UI.Controls;
 
 namespace Atlassian.Bitbucket.UI.Views
@@ -44,11 +45,15 @@ public void SetFocus()
                 _tabControl.SelectedIndex = 1;
                 if (string.IsNullOrWhiteSpace(vm.UserName))
                 {
-                    _userNameTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _userNameTextBox.Focus();
                 }
                 else
                 {
-                    _passwordTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _passwordTextBox.Focus();
                 }
             }
         }

diff --git a/src/shared/Core/UI/Views/CredentialsView.axaml.cs b/src/shared/Core/UI/Views/CredentialsView.axaml.cs
@@ -32,11 +32,15 @@ public void SetFocus()
 
             if (string.IsNullOrWhiteSpace(vm.UserName))
             {
-                _userNameTextBox.Focus();
+                // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                if (!PlatformUtils.IsMacOS())
+                    _userNameTextBox.Focus();
             }
             else
             {
-                _passwordTextBox.Focus();
+                // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                if (!PlatformUtils.IsMacOS())
+                    _passwordTextBox.Focus();
             }
         }
     }

diff --git a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
@@ -8,6 +8,7 @@
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitCredentialManager.UI.Controls;
 
 namespace GitHub.UI.Controls
@@ -86,7 +87,9 @@ private void SetTextBoxes(string text)
 
         public void SetFocus()
         {
-            KeyboardDevice.Instance.SetFocusedElement(_textBoxes[0], NavigationMethod.Tab, KeyModifiers.None);
+            // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+            if (!PlatformUtils.IsMacOS())
+                KeyboardDevice.Instance.SetFocusedElement(_textBoxes[0], NavigationMethod.Tab, KeyModifiers.None);
         }
 
         private void SetUpTextBox(TextBox textBox)

diff --git a/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs b/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitHub.UI.ViewModels;
 using GitCredentialManager.UI.Controls;
 
@@ -53,19 +54,25 @@ public void SetFocus()
             else if (vm.ShowTokenLogin)
             {
                 _tabControl.SelectedIndex = 1;
-                _tokenTextBox.Focus();
+                // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                if (!PlatformUtils.IsMacOS())
+                    _tokenTextBox.Focus();
 
             }
             else if (vm.ShowBasicLogin)
             {
                 _tabControl.SelectedIndex = 2;
                 if (string.IsNullOrWhiteSpace(vm.UserName))
                 {
-                    _userNameTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _userNameTextBox.Focus();
                 }
                 else
                 {
-                    _passwordTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _passwordTextBox.Focus();
                 }
             }
         }

diff --git a/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs b/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitHub.UI.Controls;
 using GitCredentialManager.UI.Controls;
 
@@ -23,7 +24,9 @@ private void InitializeComponent()
 
         public void SetFocus()
         {
-            _codeInput.SetFocus();
+            // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+            if (!PlatformUtils.IsMacOS())
+                _codeInput.SetFocus();
         }
     }
 }
diff --git a/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs b/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using GitCredentialManager;
 using GitLab.UI.ViewModels;
 using GitCredentialManager.UI.Controls;
 
@@ -48,18 +49,24 @@ public void SetFocus()
             else if (vm.ShowTokenLogin)
             {
                 _tabControl.SelectedIndex = 1;
-                _tokenTextBox.Focus();
+                // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                if (!PlatformUtils.IsMacOS())
+                    _tokenTextBox.Focus();
             }
             else if (vm.ShowBasicLogin)
             {
                 _tabControl.SelectedIndex = 2;
                 if (string.IsNullOrWhiteSpace(vm.UserName))
                 {
-                    _userNameTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _userNameTextBox.Focus();
                 }
                 else
                 {
-                    _passwordTextBox.Focus();
+                    // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
+                    if (!PlatformUtils.IsMacOS())
+                        _passwordTextBox.Focus();
                 }
             }
         }