Move self model syncing to local model persister

Author: georgeduckett

TeamCoding/VisualStudio/Models/ChangePersisters/LocalModelPersisterBase.cs

@@ -10,6 +10,7 @@ namespace TeamCoding.VisualStudio.Models.ChangePersisters
 {
     public abstract class LocalModelPersisterBase : ILocalModelPerisister
     {
+        private readonly UserSettings UserSettings;
         private readonly LocalIDEModel IdeModel;
         private readonly SettingProperty<string>[] SettingProperties;
         public LocalModelPersisterBase(LocalIDEModel model, params SettingProperty<string>[] settingProperties)
@@ -23,6 +24,20 @@ public LocalModelPersisterBase(LocalIDEModel model, params SettingProperty<strin
                 property.Changing += SettingProperty_ChangingAsync;
                 property.Changed += SettingProperty_ChangedAsync;
             }
+            UserSettings = TeamCodingPackage.Current.Settings.UserSettings;
+            UserSettings.ShowSelfChanged += UserSettings_ShowSelfChangedAsync;
+        }
+
+        private async void UserSettings_ShowSelfChangedAsync(object sender, EventArgs e)
+        {
+            if (UserSettings.ShowSelf)
+            {
+                await TeamCodingPackage.Current.LocalModelChangeManager.SendUpdateAsync();
+            }
+            else
+            {
+                SendModel(new RemoteIDEModel(new LocalIDEModel()));
+            }
         }
         private async void SettingProperty_ChangingAsync(object sender, EventArgs e)
         {
@@ -68,6 +83,7 @@ public virtual void Dispose()
                 property.Changing += SettingProperty_ChangingAsync;
                 property.Changed += SettingProperty_ChangedAsync;
             }
+            UserSettings.ShowSelfChanged -= UserSettings_ShowSelfChangedAsync;
         }
     }
 }

TeamCoding/VisualStudio/Models/ChangePersisters/RemoteModelPersisterBase.cs

@@ -36,24 +36,6 @@ public IEnumerable<IRemotelyAccessedDocumentData> GetOpenFiles()
                 })).ToArray();
             }
         }
-        public RemoteModelPersisterBase()
-        {
-            UserSettings = TeamCodingPackage.Current.Settings.UserSettings;
-            UserSettings.ShowSelfChanged += SharedSettings_ShowSelfChangedAsync;
-        }
-
-        private async void SharedSettings_ShowSelfChangedAsync(object sender, EventArgs e)
-        {
-            if (UserSettings.ShowSelf)
-            {
-                await TeamCodingPackage.Current.LocalModelChangeManager.SendUpdateAsync();
-            }
-            else if (RemoteModels.ContainsKey(LocalIDEModel.Id.Value))
-            {
-                RemoteModels.Remove(LocalIDEModel.Id.Value);
-                RemoteModelReceived?.Invoke(this, EventArgs.Empty);
-            }
-        }
 
         public void ClearRemoteModels()
         {
@@ -96,7 +78,7 @@ public void OnRemoteModelReceived(RemoteIDEModel remoteModel)
         }
         public virtual void Dispose()
         {
-            UserSettings.ShowSelfChanged -= SharedSettings_ShowSelfChangedAsync;
+
         }
 
     }