From 34df8c81e797b6a7c0ab7290254fd74c193b257f Mon Sep 17 00:00:00 2001 From: Paul Konstantin Gerke Date: Sun, 1 Sep 2024 23:15:41 +0200 Subject: [PATCH] Fix doubly added notes and diaper editors --- .../eu/pkgsoftware/babybuddywidgets/BabyLayoutHolder.java | 4 ++++ .../babybuddywidgets/networking/ChildrenStateTracker.java | 4 ++++ .../pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/BabyLayoutHolder.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/BabyLayoutHolder.java index 6412ce9..7d86f55 100644 --- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/BabyLayoutHolder.java +++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/BabyLayoutHolder.java @@ -84,6 +84,10 @@ private void resetChildHistoryLoader() { } public void updateChild(BabyBuddyClient.Child c, ChildrenStateTracker stateTracker) { + if (childObserver != null && child == c && stateTracker == childObserver.getTracker()) { + return; + } + clear(); this.child = c; diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ChildrenStateTracker.java b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ChildrenStateTracker.java index 625a72c..881b264 100644 --- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ChildrenStateTracker.java +++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/networking/ChildrenStateTracker.java @@ -265,6 +265,10 @@ public boolean isClosed() { return closed || ChildrenStateTracker.this.closed; } + public ChildrenStateTracker getTracker() { + return ChildrenStateTracker.this; + } + private void update() { if (isClosed()) { return; diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt index 5f45a6c..1823a78 100644 --- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt +++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt @@ -1055,4 +1055,4 @@ class LoggingButtonController( } } } -} \ No newline at end of file +}