Fix critical delete bug: don't mass-delete on EntryID change

Two fixes for delete propagation in Phase 1:

1. When Outlook contact not found by EntryID, try to re-match
   by name/email/phone before assuming it was deleted. Outlook
   can change EntryIDs on restart or profile changes, causing
   the sync to think ALL contacts were deleted.

2. When Starface contact not found in current list, DON'T delete
   from Outlook. The contact may belong to a different address
   book. Just drop the mapping and let Phase 2/3 re-link it.

These changes make delete propagation much safer and prevent
accidental mass-deletion of contacts.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

README.md

@@ -42,6 +42,32 @@ Windows-Anwendung zur bidirektionalen Synchronisation von Kontakten zwischen Mic
 5. Starface-Adressbuch und Outlook-Kontaktordner waehlen
 6. Speichern und "Jetzt synchronisieren"
 
+### Outlook-Sicherheitsabfrage unterdruecken
+
+Beim Zugriff auf Outlook-Kontakte zeigt Outlook standardmaessig einen
+Sicherheitsdialog ("Ein Programm versucht auf Ihre E-Mail-Adressinformationen
+zuzugreifen"). Dieser kann in den Einstellungen der App deaktiviert werden:
+
+1. In der App auf "Einstellungen" klicken
+2. "Outlook-Sicherheitsabfrage automatisch erlauben" aktivieren
+3. Speichern
+
+**Auf Domaenen-PCs / Terminal Servern:**
+
+Die Outlook-Sicherheitseinstellungen werden dort per Gruppenrichtlinie (GPO)
+gesteuert und sind im Trust Center ausgegraut. In diesem Fall muss die App
+**einmalig als Administrator** gestartet werden, damit die Registry-Keys
+unter HKLM geschrieben werden koennen:
+
+1. Rechtsklick auf die App -> "Als Administrator ausfuehren"
+2. Einstellungen -> "Outlook-Sicherheitsabfrage automatisch erlauben" aktivieren
+3. Speichern und App schliessen
+4. Outlook neu starten
+5. App kann danach wieder normal (ohne Admin) gestartet werden
+
+Die Einstellung bleibt dauerhaft bestehen und gilt fuer alle Benutzer
+auf dem Rechner.
+
 ### Deinstallation
 
 Ueber Windows Einstellungen -> Apps oder die Systemsteuerung.

installer/setup.iss

@@ -2,7 +2,7 @@
 ; Erfordert Inno Setup 6.x (https://jrsoftware.org/isinfo.php)
 
 #define MyAppName "Starface Outlook Sync"
-#define MyAppVersion "0.0.0.18"
+#define MyAppVersion "0.0.0.23"
 #define MyAppPublisher "HackerSoft - Hacker-Net Telekommunikation"
 #define MyAppURL "https://www.hacker-net.de"
 #define MyAppExeName "StarfaceOutlookSync.exe"

src/StarfaceOutlookSync/Models/UserSettings.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Microsoft.Win32;
 using Newtonsoft.Json;
 
 namespace StarfaceOutlookSync.Models
@@ -7,6 +8,8 @@ namespace StarfaceOutlookSync.Models
     public class UserSettings
     {
         public bool StartMinimized { get; set; } = false;
+        public bool SyncOnStart { get; set; } = false;
+        public bool AutoAcceptOutlookPrompt { get; set; } = false;
 
         private static readonly string SettingsFile = Path.Combine(
             Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
@@ -32,6 +35,86 @@ namespace StarfaceOutlookSync.Models
                 File.WriteAllText(SettingsFile, JsonConvert.SerializeObject(this, Formatting.Indented));
             }
             catch { }
+
+            ApplyOutlookSecuritySetting();
+        }
+
+        public void ApplyOutlookSecuritySetting()
+        {
+            var versions = new[] { "16.0", "15.0" };
+
+            var securityValues = new (string name, int value)[]
+            {
+                ("ObjectModelGuard", 2),
+                ("PromptOOMAddressBookAccess", 2),
+                ("PromptOOMAddressInformationAccess", 2),
+                ("PromptOOMSend", 2),
+                ("PromptOOMSaveAs", 2),
+                ("PromptOOMFormulaAccess", 2),
+                ("PromptOOMCustomAction", 2),
+                ("PromptSimpleMAPISend", 2),
+                ("PromptSimpleMAPINameResolve", 2),
+                ("PromptSimpleMAPIOpenMessage", 2),
+                ("AdminSecurityMode", 3),
+            };
+
+            // In alle moeglichen Pfade schreiben (HKCU + HKLM, Policies + direkt)
+            var roots = new[] { Registry.CurrentUser, Registry.LocalMachine };
+            var prefixes = new[]
+            {
+                @"Software\Policies\Microsoft\Office",
+                @"Software\Microsoft\Office"
+            };
+
+            foreach (var ver in versions)
+            {
+                foreach (var root in roots)
+                {
+                    foreach (var prefix in prefixes)
+                    {
+                        var regPath = $@"{prefix}\{ver}\Outlook\Security";
+                        try
+                        {
+                            if (AutoAcceptOutlookPrompt)
+                            {
+                                var key = root.CreateSubKey(regPath);
+                                if (key != null)
+                                {
+                                    foreach (var (name, value) in securityValues)
+                                        key.SetValue(name, value, RegistryValueKind.DWord);
+                                    key.Close();
+                                }
+                            }
+                            else
+                            {
+                                try { root.DeleteSubKey(regPath, false); } catch { }
+                            }
+                        }
+                        catch { } // Kein Fehler wenn Rechte fehlen - naechsten Pfad versuchen
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Prueft ob die Outlook-Sicherheitseinstellung per GPO blockiert wird.
+        /// </summary>
+        public static bool IsOutlookSecurityLockedByPolicy()
+        {
+            try
+            {
+                // Wenn HKLM Policies gesetzt sind und wir dort nicht schreiben koennen
+                var key = Registry.LocalMachine.OpenSubKey(
+                    @"Software\Policies\Microsoft\Office\16.0\Outlook\Security", false);
+                if (key != null)
+                {
+                    var val = key.GetValue("AdminSecurityMode");
+                    key.Close();
+                    if (val != null) return true;
+                }
+            }
+            catch { }
+            return false;
         }
     }
 }

src/StarfaceOutlookSync/Services/OutlookContactsService.cs

@@ -394,29 +394,40 @@ namespace StarfaceOutlookSync.Services
             }
         }
 
+        private static string SafeGet(dynamic ci, string property)
+        {
+            try
+            {
+                object val = ci.GetType().InvokeMember(property,
+                    System.Reflection.BindingFlags.GetProperty, null, ci, null);
+                return val?.ToString() ?? "";
+            }
+            catch { return ""; }
+        }
+
         private UnifiedContact MapFromOutlook(dynamic ci)
         {
             return new UnifiedContact
             {
-                OutlookEntryId = (string)(ci.EntryID ?? ""),
-                FirstName = (string)(ci.FirstName ?? ""),
-                LastName = (string)(ci.LastName ?? ""),
-                Company = (string)(ci.CompanyName ?? ""),
-                JobTitle = (string)(ci.JobTitle ?? ""),
-                Email = (string)(ci.Email1Address ?? ""),
-                EmailSecondary = (string)(ci.Email2Address ?? ""),
-                PhoneWork = (string)(ci.BusinessTelephoneNumber ?? ""),
-                PhoneMobile = (string)(ci.MobileTelephoneNumber ?? ""),
-                PhoneHome = (string)(ci.HomeTelephoneNumber ?? ""),
-                Fax = (string)(ci.BusinessFaxNumber ?? ""),
-                Street = (string)(ci.BusinessAddressStreet ?? ""),
-                City = (string)(ci.BusinessAddressCity ?? ""),
-                PostalCode = (string)(ci.BusinessAddressPostalCode ?? ""),
-                State = (string)(ci.BusinessAddressState ?? ""),
-                Country = (string)(ci.BusinessAddressCountry ?? ""),
-                Website = (string)(ci.WebPage ?? ""),
-                Notes = (string)(ci.Body ?? ""),
-                Salutation = (string)(ci.Title ?? ""),
+                OutlookEntryId = SafeGet(ci, "EntryID"),
+                FirstName = SafeGet(ci, "FirstName"),
+                LastName = SafeGet(ci, "LastName"),
+                Company = SafeGet(ci, "CompanyName"),
+                JobTitle = SafeGet(ci, "JobTitle"),
+                Email = SafeGet(ci, "Email1Address"),
+                EmailSecondary = SafeGet(ci, "Email2Address"),
+                PhoneWork = SafeGet(ci, "BusinessTelephoneNumber"),
+                PhoneMobile = SafeGet(ci, "MobileTelephoneNumber"),
+                PhoneHome = SafeGet(ci, "HomeTelephoneNumber"),
+                Fax = SafeGet(ci, "BusinessFaxNumber"),
+                Street = SafeGet(ci, "BusinessAddressStreet"),
+                City = SafeGet(ci, "BusinessAddressCity"),
+                PostalCode = SafeGet(ci, "BusinessAddressPostalCode"),
+                State = SafeGet(ci, "BusinessAddressState"),
+                Country = SafeGet(ci, "BusinessAddressCountry"),
+                Website = SafeGet(ci, "WebPage"),
+                Notes = SafeGet(ci, "Body"),
+                Salutation = SafeGet(ci, "Title"),
                 Birthday = GetBirthdayString(ci)
             };
         }
@@ -425,8 +436,9 @@ namespace StarfaceOutlookSync.Services
         {
             try
             {
-                DateTime bday = ci.Birthday;
-                if (bday.Year > 1900 && bday != DateTime.MinValue)
+                object val = ci.GetType().InvokeMember("Birthday",
+                    System.Reflection.BindingFlags.GetProperty, null, ci, null);
+                if (val is DateTime bday && bday.Year > 1900 && bday != DateTime.MinValue)
                     return bday.ToString("yyyy-MM-dd");
             }
             catch { }

src/StarfaceOutlookSync/Services/StarfaceApiClient.cs

@@ -304,12 +304,27 @@ namespace StarfaceOutlookSync.Services
         {
             var sfContact = MapToStarface(contact);
             sfContact["id"] = contactId;
+
+            // Tag beibehalten
+            if (!string.IsNullOrEmpty(book.TagId))
+            {
+                sfContact["tags"] = new JArray { new JObject { ["id"] = book.TagId } };
+            }
+
             var query = "";
             if (book.Type == "user" && !string.IsNullOrEmpty(book.UserId))
                 query = $"?userId={book.UserId}";
 
-            var content = new StringContent(sfContact.ToString(), Encoding.UTF8, "application/json");
+            var body = sfContact.ToString();
+            var content = new StringContent(body, Encoding.UTF8, "application/json");
             var resp = await _http.PutAsync($"{_baseUrl}/contacts/{contactId}{query}", content);
+
+            if (!resp.IsSuccessStatusCode)
+            {
+                var respBody = await resp.Content.ReadAsStringAsync();
+                OnDebug?.Invoke($"PUT /contacts/{contactId} fehlgeschlagen: {(int)resp.StatusCode}\n{respBody}");
+            }
+
             return resp.IsSuccessStatusCode;
         }
 

src/StarfaceOutlookSync/Services/SyncEngine.cs

@@ -56,9 +56,11 @@ namespace StarfaceOutlookSync.Services
             // Leere Firma vs. gefuellte Firma = verschiedene Kontakte
             if (!FieldsCompatible(a.Company, b.Company)) return false;
 
-            // Telefon: wenn auf einer Seite vorhanden, muss sie gleich sein
+            // Telefon/Fax: wenn auf einer Seite vorhanden, muss es gleich sein
             if (!PhoneFieldsCompatible(a.PhoneWork, b.PhoneWork)) return false;
             if (!PhoneFieldsCompatible(a.PhoneMobile, b.PhoneMobile)) return false;
+            if (!PhoneFieldsCompatible(a.PhoneHome, b.PhoneHome)) return false;
+            if (!PhoneFieldsCompatible(a.Fax, b.Fax)) return false;
 
             // Mindestens ein starkes Match muss vorhanden sein
             bool emailMatch = !string.IsNullOrEmpty(a.Email) && !string.IsNullOrEmpty(b.Email)
@@ -67,10 +69,15 @@ namespace StarfaceOutlookSync.Services
                              && a.FirstName.Equals(b.FirstName, StringComparison.OrdinalIgnoreCase)
                              && a.LastName.Equals(b.LastName, StringComparison.OrdinalIgnoreCase)
                              && (!string.IsNullOrEmpty(a.FirstName) || !string.IsNullOrEmpty(a.LastName));
-            bool phoneMatch = !string.IsNullOrEmpty(a.PhoneWork) && !string.IsNullOrEmpty(b.PhoneWork)
-                              && NormalizePhone(a.PhoneWork) == NormalizePhone(b.PhoneWork);
+            bool phoneMatch = (!string.IsNullOrEmpty(a.PhoneWork) && !string.IsNullOrEmpty(b.PhoneWork)
+                               && NormalizePhone(a.PhoneWork) == NormalizePhone(b.PhoneWork))
+                              || (!string.IsNullOrEmpty(a.Fax) && !string.IsNullOrEmpty(b.Fax)
+                               && NormalizePhone(a.Fax) == NormalizePhone(b.Fax));
+            bool companyMatch = !string.IsNullOrEmpty(a.Company) && !string.IsNullOrEmpty(b.Company)
+                                && a.Company.Equals(b.Company, StringComparison.OrdinalIgnoreCase);
 
-            return emailMatch || nameMatch || phoneMatch;
+            // Email oder Name reicht. Telefon/Fax nur mit Firma zusammen.
+            return emailMatch || nameMatch || (phoneMatch && companyMatch) || (companyMatch && phoneMatch);
         }
 
         /// <summary>
@@ -176,7 +183,21 @@ namespace StarfaceOutlookSync.Services
 
                         if (oc == null && sc != null)
                         {
-                            // In Outlook geloescht -> in Starface auch loeschen
+                            // Outlook-Kontakt nicht gefunden.
+                            // Erst pruefen ob er vielleicht nur eine neue EntryID hat
+                            var reMatch = FindMatch(sc, outlookContacts.Where(c =>
+                                !processedOutlookIds.Contains(c.OutlookEntryId)).ToList());
+                            if (reMatch != null)
+                            {
+                                // Kontakt existiert noch in Outlook, nur EntryID geaendert
+                                Log($"  EntryID geaendert, verknuepfe neu: {sc.DisplayName}");
+                                mapping.OutlookEntryId = reMatch.OutlookEntryId;
+                                processedOutlookIds.Add(reMatch.OutlookEntryId);
+                                newMappings.Add(mapping);
+                                continue;
+                            }
+
+                            // Wirklich geloescht -> in Starface auch loeschen
                             if (profile.SyncDirection == SyncDirection.Both || profile.SyncDirection == SyncDirection.OutlookToStarface)
                             {
                                 if (await starface.DeleteContactAsync(mapping.StarfaceId))
@@ -187,7 +208,6 @@ namespace StarfaceOutlookSync.Services
                             }
                             else
                             {
-                                // Richtung erlaubt kein Loeschen -> Mapping behalten
                                 newMappings.Add(mapping);
                             }
                             continue;
@@ -195,20 +215,12 @@ namespace StarfaceOutlookSync.Services
 
                         if (oc != null && sc == null)
                         {
-                            // In Starface geloescht -> in Outlook auch loeschen
-                            if (profile.SyncDirection == SyncDirection.Both || profile.SyncDirection == SyncDirection.StarfaceToOutlook)
-                            {
-                                if (_outlookService.DeleteContact(mapping.OutlookEntryId))
-                                {
-                                    result.Updated++;
-                                    Log($"  Geloescht (SF->OL): {oc.DisplayName}");
-                                }
-                            }
-                            else
-                            {
-                                // Richtung erlaubt kein Loeschen -> Mapping behalten
-                                newMappings.Add(mapping);
-                            }
+                            // Starface-Kontakt nicht gefunden.
+                            // Kann passieren wenn der Kontakt einem anderen Adressbuch gehoert.
+                            // NICHT loeschen, nur Mapping entfernen - wird in Phase 2/3 neu verknuepft
+                            Log($"  Starface-Kontakt nicht in Liste (anderes Adressbuch?): {oc.DisplayName}");
+                            // Mapping verwerfen, Outlook-Kontakt als unverarbeitet belassen
+                            // damit er in Phase 2 neu zugeordnet oder erstellt werden kann
                             continue;
                         }
 

src/StarfaceOutlookSync/StarfaceOutlookSync.csproj

@@ -7,9 +7,9 @@
     <AssemblyTitle>Starface Outlook Sync</AssemblyTitle>
     <Company>HackerSoft - Hacker-Net Telekommunikation</Company>
     <Product>Starface Outlook Sync</Product>
-    <Version>0.0.0.18</Version>
-    <AssemblyVersion>0.0.0.18</AssemblyVersion>
-    <FileVersion>0.0.0.18</FileVersion>
+    <Version>0.0.0.23</Version>
+    <AssemblyVersion>0.0.0.23</AssemblyVersion>
+    <FileVersion>0.0.0.23</FileVersion>
     <Description>Synchronisiert Outlook-Kontakte mit Starface Telefonanlage</Description>
     <Copyright>Stefan Hacker - HackerSoft</Copyright>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

src/StarfaceOutlookSync/UI/AboutForm.cs

@@ -27,7 +27,7 @@ namespace StarfaceOutlookSync.UI
 
             var lblVersion = new Label
             {
-                Text = "Version 0.0.0.18",
+                Text = "Version 0.0.0.23",
                 Left = 0, Top = 56, Width = 340, Height = 20,
                 TextAlign = ContentAlignment.MiddleCenter,
                 ForeColor = Color.Gray

src/StarfaceOutlookSync/UI/MainForm.cs

@@ -22,6 +22,7 @@ namespace StarfaceOutlookSync.UI
         private StatusStrip _statusBar;
         private ToolStripStatusLabel _statusLabel;
         private Timer _autoSyncTimer;
+        private volatile bool _syncRunning = false;
 
         public MainForm()
         {
@@ -30,14 +31,31 @@ namespace StarfaceOutlookSync.UI
             SetupAutoSync();
             RefreshProfileList();
 
-            // Minimiert starten falls in Einstellungen aktiviert
+            // Einstellungen laden und anwenden
             var settings = UserSettings.Load();
+            settings.ApplyOutlookSecuritySetting();
+
             if (settings.StartMinimized)
             {
                 WindowState = FormWindowState.Minimized;
                 ShowInTaskbar = false;
                 Visible = false;
             }
+
+            // Beim Start automatisch synchronisieren
+            if (settings.SyncOnStart)
+            {
+                _ = SyncAllProfiles();
+            }
+        }
+
+        private async Task SyncAllProfiles()
+        {
+            var profiles = _profileManager.GetProfiles().Where(p => p.Enabled).ToList();
+            foreach (var profile in profiles)
+            {
+                await RunSync(profile);
+            }
         }
 
         protected override void SetVisibleCore(bool value)
@@ -58,8 +76,8 @@ namespace StarfaceOutlookSync.UI
         private void InitializeComponent()
         {
             Text = "Starface Kontakt-Sync";
-            Size = new Size(620, 450);
-            MinimumSize = new Size(500, 350);
+            Size = new Size(830, 450);
+            MinimumSize = new Size(830, 350);
             StartPosition = FormStartPosition.CenterScreen;
             Font = new Font("Segoe UI", 9);
             Icon = AppIcon.GetIcon();
@@ -158,6 +176,7 @@ namespace StarfaceOutlookSync.UI
             if (profiles.Any(p => p.Enabled))
                 _trayMenu.Items.Add("-");
 
+            _trayMenu.Items.Add("Ueber", null, (s, e) => ShowAbout());
             _trayMenu.Items.Add("Beenden", null, (s, e) => ExitApplication());
         }
 
@@ -318,6 +337,13 @@ namespace StarfaceOutlookSync.UI
 
         private async Task RunSync(SyncProfile profile)
         {
+            if (_syncRunning)
+            {
+                SetStatus("Sync laeuft bereits, bitte warten...");
+                return;
+            }
+
+            _syncRunning = true;
             try
             {
                 SetStatus($"Synchronisiere '{profile.Name}'...");
@@ -340,6 +366,10 @@ namespace StarfaceOutlookSync.UI
                     ex.Message, ToolTipIcon.Error);
                 SetStatus($"Fehler: {ex.Message}");
             }
+            finally
+            {
+                _syncRunning = false;
+            }
         }
 
         private void SetStatus(string text)

src/StarfaceOutlookSync/UI/SettingsForm.cs

@@ -6,7 +6,7 @@ namespace StarfaceOutlookSync.UI
 {
     public class SettingsForm : Form
     {
-        private CheckBox _chkStartMinimized;
+        private CheckBox _chkStartMinimized, _chkSyncOnStart, _chkAutoAcceptOutlook;
         private Button _btnSave, _btnCancel;
         private readonly UserSettings _settings;
 
@@ -19,7 +19,7 @@ namespace StarfaceOutlookSync.UI
         private void InitializeComponent()
         {
             Text = "Einstellungen";
-            Size = new Size(350, 180);
+            Size = new Size(380, 250);
             FormBorderStyle = FormBorderStyle.FixedDialog;
             MaximizeBox = false;
             MinimizeBox = false;
@@ -33,20 +33,47 @@ namespace StarfaceOutlookSync.UI
                 Checked = _settings.StartMinimized
             };
 
+            _chkSyncOnStart = new CheckBox
+            {
+                Text = "Beim Start automatisch synchronisieren",
+                Left = 20, Top = 52, AutoSize = true,
+                Checked = _settings.SyncOnStart
+            };
+
+            _chkAutoAcceptOutlook = new CheckBox
+            {
+                Text = "Outlook-Sicherheitsabfrage automatisch erlauben",
+                Left = 20, Top = 80, AutoSize = true,
+                Checked = _settings.AutoAcceptOutlookPrompt
+            };
+
+            var hintText = "Hinweis: Outlook muss nach Aenderung neu gestartet werden.";
+            if (UserSettings.IsOutlookSecurityLockedByPolicy())
+                hintText += "\nAuf Domaenen-PCs: App einmalig als Admin starten!";
+
+            var lblHint = new Label
+            {
+                Text = hintText,
+                Left = 38, Top = 102, Width = 310, Height = 36,
+                ForeColor = UserSettings.IsOutlookSecurityLockedByPolicy() ? Color.OrangeRed : Color.Gray,
+                Font = new Font("Segoe UI", 8)
+            };
+
             _btnSave = new Button
             {
-                Text = "Speichern", Left = 80, Top = 100, Width = 85, Height = 28,
+                Text = "Speichern", Left = 95, Top = 170, Width = 85, Height = 28,
                 DialogResult = DialogResult.None
             };
             _btnSave.Click += (s, e) => Save();
 
             _btnCancel = new Button
             {
-                Text = "Abbrechen", Left = 174, Top = 100, Width = 85, Height = 28,
+                Text = "Abbrechen", Left = 189, Top = 170, Width = 85, Height = 28,
                 DialogResult = DialogResult.Cancel
             };
 
-            Controls.AddRange(new Control[] { _chkStartMinimized, _btnSave, _btnCancel });
+            Size = new Size(380, 260);
+            Controls.AddRange(new Control[] { _chkStartMinimized, _chkSyncOnStart, _chkAutoAcceptOutlook, lblHint, _btnSave, _btnCancel });
             AcceptButton = _btnSave;
             CancelButton = _btnCancel;
         }
@@ -54,6 +81,8 @@ namespace StarfaceOutlookSync.UI
         private void Save()
         {
             _settings.StartMinimized = _chkStartMinimized.Checked;
+            _settings.SyncOnStart = _chkSyncOnStart.Checked;
+            _settings.AutoAcceptOutlookPrompt = _chkAutoAcceptOutlook.Checked;
             _settings.Save();
             DialogResult = DialogResult.OK;
             Close();