Release v0.0.0.19

- Include tags in PUT request (Starface may require it)
- Log failed updates with status code and response body
- Also committed: SafeGet for Outlook COM property reading

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

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.17"
+#define MyAppVersion "0.0.0.19"
 #define MyAppPublisher "HackerSoft - Hacker-Net Telekommunikation"
 #define MyAppURL "https://www.hacker-net.de"
 #define MyAppExeName "StarfaceOutlookSync.exe"

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

@@ -17,61 +17,94 @@ namespace StarfaceOutlookSync.Services
 
         /// <summary>
         /// Findet einen passenden Kontakt in der Kandidatenliste.
-        /// Matching-Reihenfolge: E-Mail, dann Vorname+Nachname+Firma, dann Vorname+Nachname.
+        /// Strenges Matching: Felder die auf einer Seite gefuellt sind muessen
+        /// auf der anderen auch gefuellt (und gleich) sein.
+        /// Ein leeres Feld auf einer Seite und ein gefuelltes auf der anderen
+        /// bedeutet: verschiedene Kontakte.
         /// </summary>
         private static UnifiedContact FindMatch(UnifiedContact contact, List<UnifiedContact> candidates)
         {
             if (candidates == null || candidates.Count == 0) return null;
 
-            // 1. Exakte E-Mail
-            if (!string.IsNullOrEmpty(contact.Email))
+            foreach (var c in candidates)
             {
-                var byEmail = candidates.FirstOrDefault(c =>
-                    !string.IsNullOrEmpty(c.Email) &&
-                    c.Email.Equals(contact.Email, StringComparison.OrdinalIgnoreCase));
-                if (byEmail != null) return byEmail;
-            }
-
-            // 2. Vorname + Nachname + Firma (staerkstes Match ohne E-Mail)
-            if ((!string.IsNullOrEmpty(contact.FirstName) || !string.IsNullOrEmpty(contact.LastName))
-                && !string.IsNullOrEmpty(contact.Company))
-            {
-                var byNameCompany = candidates.FirstOrDefault(c =>
-                    c.FirstName.Equals(contact.FirstName, StringComparison.OrdinalIgnoreCase) &&
-                    c.LastName.Equals(contact.LastName, StringComparison.OrdinalIgnoreCase) &&
-                    c.Company.Equals(contact.Company, StringComparison.OrdinalIgnoreCase));
-                if (byNameCompany != null) return byNameCompany;
-            }
-
-            // 3. Vorname + Nachname (ohne Firma)
-            if (!string.IsNullOrEmpty(contact.FirstName) || !string.IsNullOrEmpty(contact.LastName))
-            {
-                var byName = candidates.FirstOrDefault(c =>
-                    c.FirstName.Equals(contact.FirstName, StringComparison.OrdinalIgnoreCase) &&
-                    c.LastName.Equals(contact.LastName, StringComparison.OrdinalIgnoreCase) &&
-                    (!string.IsNullOrEmpty(c.FirstName) || !string.IsNullOrEmpty(c.LastName)));
-                if (byName != null) return byName;
-            }
-
-            // 4. Telefonnummer (Buero oder Mobil)
-            if (!string.IsNullOrEmpty(contact.PhoneWork))
-            {
-                var byPhone = candidates.FirstOrDefault(c =>
-                    !string.IsNullOrEmpty(c.PhoneWork) &&
-                    NormalizePhone(c.PhoneWork) == NormalizePhone(contact.PhoneWork));
-                if (byPhone != null) return byPhone;
-            }
-            if (!string.IsNullOrEmpty(contact.PhoneMobile))
-            {
-                var byMobile = candidates.FirstOrDefault(c =>
-                    !string.IsNullOrEmpty(c.PhoneMobile) &&
-                    NormalizePhone(c.PhoneMobile) == NormalizePhone(contact.PhoneMobile));
-                if (byMobile != null) return byMobile;
+                if (IsMatch(contact, c))
+                    return c;
             }
 
             return null;
         }
 
+        private static bool IsMatch(UnifiedContact a, UnifiedContact b)
+        {
+            // Mindestens ein identifizierendes Feld muss vorhanden sein
+            bool hasName = !string.IsNullOrEmpty(a.FirstName) || !string.IsNullOrEmpty(a.LastName);
+            bool hasEmail = !string.IsNullOrEmpty(a.Email);
+            bool hasPhone = !string.IsNullOrEmpty(a.PhoneWork) || !string.IsNullOrEmpty(a.PhoneMobile);
+
+            if (!hasName && !hasEmail && !hasPhone) return false;
+
+            // E-Mail: wenn auf beiden Seiten vorhanden, muss sie gleich sein
+            // Wenn nur auf einer Seite vorhanden -> kein Match
+            if (!FieldsCompatible(a.Email, b.Email)) return false;
+
+            // Name: wenn auf einer Seite vorhanden, muss er gleich sein
+            if (!FieldsCompatible(a.FirstName, b.FirstName)) return false;
+            if (!FieldsCompatible(a.LastName, b.LastName)) return false;
+
+            // Firma: wenn auf einer Seite vorhanden, muss sie gleich sein
+            // Leere Firma vs. gefuellte Firma = verschiedene Kontakte
+            if (!FieldsCompatible(a.Company, b.Company)) return false;
+
+            // 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)
+                              && a.Email.Equals(b.Email, StringComparison.OrdinalIgnoreCase);
+            bool nameMatch = hasName
+                             && 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))
+                              || (!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);
+
+            // Email oder Name reicht. Telefon/Fax nur mit Firma zusammen.
+            return emailMatch || nameMatch || (phoneMatch && companyMatch) || (companyMatch && phoneMatch);
+        }
+
+        /// <summary>
+        /// Prueft ob zwei Felder kompatibel sind.
+        /// Beide leer = kompatibel. Beide gleich = kompatibel.
+        /// Eins leer, eins gefuellt = NICHT kompatibel (verschiedene Kontakte).
+        /// </summary>
+        private static bool FieldsCompatible(string a, string b)
+        {
+            bool aEmpty = string.IsNullOrEmpty(a);
+            bool bEmpty = string.IsNullOrEmpty(b);
+
+            if (aEmpty && bEmpty) return true;
+            if (aEmpty != bEmpty) return false; // Einer leer, anderer nicht
+            return a.Equals(b, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private static bool PhoneFieldsCompatible(string a, string b)
+        {
+            bool aEmpty = string.IsNullOrEmpty(a);
+            bool bEmpty = string.IsNullOrEmpty(b);
+
+            if (aEmpty && bEmpty) return true;
+            if (aEmpty != bEmpty) return false;
+            return NormalizePhone(a) == NormalizePhone(b);
+        }
+
         private static string NormalizePhone(string phone)
         {
             if (string.IsNullOrEmpty(phone)) return "";

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.17</Version>
-    <AssemblyVersion>0.0.0.17</AssemblyVersion>
-    <FileVersion>0.0.0.17</FileVersion>
+    <Version>0.0.0.19</Version>
+    <AssemblyVersion>0.0.0.19</AssemblyVersion>
+    <FileVersion>0.0.0.19</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.17",
+                Text = "Version 0.0.0.19",
                 Left = 0, Top = 56, Width = 340, Height = 20,
                 TextAlign = ContentAlignment.MiddleCenter,
                 ForeColor = Color.Gray