From decf60fb0a2bb2cb4de9b25e42d9ff357211ca86 Mon Sep 17 00:00:00 2001 From: Julian Arndt Date: Tue, 15 Nov 2022 10:14:09 +0100 Subject: [PATCH] Fix duplicate google calendar events --- .../jeyp91/googlecalendar/TippligaGoogleEventManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/jeyp91/googlecalendar/TippligaGoogleEventManager.java b/src/main/java/de/jeyp91/googlecalendar/TippligaGoogleEventManager.java index ccd6e59..7e110e4 100644 --- a/src/main/java/de/jeyp91/googlecalendar/TippligaGoogleEventManager.java +++ b/src/main/java/de/jeyp91/googlecalendar/TippligaGoogleEventManager.java @@ -61,9 +61,10 @@ public class TippligaGoogleEventManager { String description = getDescription(season, league, matchday, deliveryDateNumber); String descriptionHtml = getDescriptionHTML(season, league, matchday, deliveryDateNumber); for (Event event : allEvents) { + String eventDescription = event.getDescription(); if ( - (event.getDescription().replaceAll("\\s+","").equals(description.replaceAll("\\s+",""))) - || event.getDescription().equals(descriptionHtml) + (eventDescription.replaceAll("\\s+","").equals(description.replaceAll("\\s+",""))) + || eventDescription.equals(descriptionHtml) ) { return event; } @@ -176,7 +177,7 @@ public class TippligaGoogleEventManager { private static String getDescriptionHTML(Integer season, Integer league, Integer matchday, Integer deliverDateNumber) { league = league == 2 ? 1 : league; - return "Saison: " + season + "
" + "Liga: " + league + "
" + "Spieltag: " + matchday + "
" + "Abgabeschluss: " + deliverDateNumber + "
"; + return "Saison: " + season + "
" + "Liga: " + league + "
" + "Spieltag: " + matchday + "
" + "Abgabeschluss: " + deliverDateNumber; } public static void updateAllMatchdays(ArrayList matchdays) {