Replace Application.Current with HostAnalyticsInfo.HostName check (#1…

…4574) * Fix PostDiff job * replace application.current * tests * refactor after Bogdans PR --------- Co-authored-by: Aaron (Qilong) <[email protected]>
DynamoDS · Nov 27, 2023 · c5df6f9 · c5df6f9
1 parent 11b1f7c
commit c5df6f9
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 22 deletions.
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -537,7 +537,7 @@ public interface IStartConfiguration
             bool NoNetworkMode => false;
 
             /// <summary>
-            /// Configuration object that contains host information like Host name, version and session id.
+            /// Configuration object that contains host information like Host name, parent id and session id.
             /// </summary>
             HostAnalyticsInfo HostAnalyticsInfo { get; set; }
         }

diff --git a/src/DynamoCoreWpf/Controls/InPortContextMenu.xaml.cs b/src/DynamoCoreWpf/Controls/InPortContextMenu.xaml.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Controls;
+using Dynamo.Models;
 using Dynamo.ViewModels;
 
 namespace Dynamo.UI.Controls
@@ -15,8 +16,10 @@ public partial class InPortContextMenu : UserControl
         public InPortContextMenu()
         {
             InitializeComponent();
-
-            if (Application.Current != null) Application.Current.Deactivated += CurrentApplicationDeactivated;
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
+            {
+                Application.Current.Deactivated += CurrentApplicationDeactivated;
+            }
             Unloaded += InPortContextMenuControl_Unloaded;
         }
 
@@ -27,7 +30,7 @@ public InPortContextMenu()
         /// <param name="e"></param>
         private void InPortContextMenuControl_Unloaded(object sender, RoutedEventArgs e)
         {
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated -= CurrentApplicationDeactivated;
             }

diff --git a/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml.cs b/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml.cs
@@ -8,6 +8,7 @@
 using System.Windows.Input;
 using System.Windows.Threading;
 using Dynamo.Logging;
+using Dynamo.Models;
 using Dynamo.Utilities;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.ViewModels;
@@ -31,7 +32,7 @@ public SearchViewModel ViewModel
         public InCanvasSearchControl()
         {
             InitializeComponent();
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated += CurrentApplicationDeactivated;
                 Application.Current.MainWindow.Closing += InCanvasSearchControl_Unloaded;
@@ -40,7 +41,7 @@ public InCanvasSearchControl()
 
         private void InCanvasSearchControl_Unloaded(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated -= CurrentApplicationDeactivated;
                 Application.Current.MainWindow.Closing -= InCanvasSearchControl_Unloaded;

diff --git a/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs b/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs
@@ -42,10 +42,10 @@ public partial class NodeAutoCompleteSearchControl : IDisposable
         public NodeAutoCompleteSearchControl()
         {
             InitializeComponent();
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated += CurrentApplicationDeactivated;
-                if (Application.Current.MainWindow != null)
+                if (Application.Current?.MainWindow != null)
                 {
                     Application.Current.MainWindow.Closing += NodeAutoCompleteSearchControl_Unloaded;
                 }
@@ -55,10 +55,10 @@ public NodeAutoCompleteSearchControl()
 
         private void NodeAutoCompleteSearchControl_Unloaded(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated -= CurrentApplicationDeactivated;
-                if (Application.Current.MainWindow != null)
+                if (Application.Current?.MainWindow != null)
                 {
                     Application.Current.MainWindow.Closing -= NodeAutoCompleteSearchControl_Unloaded;
                 }

diff --git a/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml.cs b/src/DynamoCoreWpf/Controls/OutPortContextMenu.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using Dynamo.Models;
 using Dynamo.ViewModels;
 
 namespace Dynamo.UI.Controls
@@ -19,7 +20,10 @@ public OutPortContextMenu()
         {
             InitializeComponent();
 
-            if (Application.Current != null) Application.Current.Deactivated += CurrentApplicationDeactivated;
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
+            {
+                Application.Current.Deactivated += CurrentApplicationDeactivated;
+            }
             Unloaded += OutPortContextMenuControl_Unloaded;
         }
 
@@ -30,7 +34,7 @@ public OutPortContextMenu()
         /// <param name="e"></param>
         private void OutPortContextMenuControl_Unloaded(object sender, RoutedEventArgs e)
         {
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.Deactivated -= CurrentApplicationDeactivated;
             }

diff --git a/src/DynamoCoreWpf/Services/UsageReportingManager.cs b/src/DynamoCoreWpf/Services/UsageReportingManager.cs
@@ -105,15 +105,14 @@ public void ToggleIsAnalyticsReportingApproved(object parameter)
         private void ShowUsageReportingPrompt(Window ownerWindow)
         {
             // If an owner window is not supplied, then we will fallback onto 
-            // using the application's main window. In native host application
-            // scenario (e.g. Revit), the "Application.Current" will be "null".
+            // using the application's main window.
             // The owner window is important so that usage report window always 
             // get shown on top of the owner window, otherwise it is possible 
             // for usage report window to show up in the background (behind all
             // other full screen windows), and Dynamo main window will appear 
             // to be frozen because control cannot return to it.
             // 
-            if (ownerWindow == null && (null != Application.Current))
+            if (ownerWindow == null && string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
                 ownerWindow = Application.Current.MainWindow;
 
             var usageReportingPrompt = new UsageReportingAgreementPrompt(resourceProvider, dynamoViewModel)

diff --git a/src/DynamoCoreWpf/ViewModels/RunSettingsViewModel.cs b/src/DynamoCoreWpf/ViewModels/RunSettingsViewModel.cs
@@ -314,9 +314,9 @@ void NotifyOfGraphRunChanged()
             RaisePropertyChanged(nameof(RunButtonEnabled));
             RaisePropertyChanged(nameof(RunButtonToolTip));
 
-            if (Application.Current != null)
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName))
             {
-                Application.Current.Dispatcher.Invoke(new Action(() =>
+                Application.Current?.Dispatcher.Invoke(new Action(() =>
                 {
                     dynamoViewModel.ShowOpenDialogAndOpenResultCommand.RaiseCanExecuteChanged();
                     dynamoViewModel.NewHomeWorkspaceCommand.RaiseCanExecuteChanged();

diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -256,7 +256,7 @@ public DynamoView(DynamoViewModel dynamoViewModel)
             {
                 fileTrustWarningPopup = new FileTrustWarning(this);
             }
-            if (!DynamoModel.IsTestMode && Application.Current != null)
+            if (!DynamoModel.IsTestMode && string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
             {
                 Application.Current.MainWindow = this;
             }
@@ -1372,9 +1372,10 @@ private void DynamoView_Loaded(object sender, EventArgs e)
 
             TrackStartupAnalytics();
 
-            // In native host scenario (e.g. Revit), the "Application.Current" will be "null". Therefore, the InCanvasSearchControl.OnRequestShowInCanvasSearch
-            // will not work. Instead, we have to check if the Owner Window (DynamoView) is deactivated or not.  
-            if (Application.Current == null)
+            // In native host scenario (e.g. Revit), the InCanvasSearchControl.OnRequestShowInCanvasSearch
+            // will not work. Instead, we have to check if the Owner Window (DynamoView) is deactivated or not.
+
+            if (!string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName))
             {
                 this.Deactivated += (s, args) => { HidePopupWhenWindowDeactivated(null); };
             }