From 2725d8dc5b59cd6da488023538464cd32b5108a0 Mon Sep 17 00:00:00 2001 From: Snowyfox Date: Fri, 3 Jun 2022 01:40:42 -0400 Subject: [PATCH] Fixed false assumption for newer Mastodon accounts. --- JKomasto2.jar | Bin 436532 -> 436580 bytes NotificationsWindow.java | 12 ++++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/JKomasto2.jar b/JKomasto2.jar index 0519244883a598745e75cae22e9f9f80fa5f1661..820fa31aea972ecca757804b1f79b02dbdf6354b 100644 GIT binary patch delta 4061 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 E05Q-=p#T5? diff --git a/NotificationsWindow.java b/NotificationsWindow.java index 37bc9d0..9939a99 100644 --- a/NotificationsWindow.java +++ b/NotificationsWindow.java @@ -260,8 +260,7 @@ implements ActionListener { public void showNotifications(List notifications) { - assert notifications.size() == rows.size(); - for (int o = 0; o < rows.size(); ++o) + for (int o = 0; o < notifications.size(); ++o) { Notification n = notifications.get(o); NotificationComponent c = rows.get(o); @@ -278,6 +277,15 @@ implements ActionListener { } c.setText(n.postText); } + for (int o = notifications.size(); o < rows.size(); ++o) + { + NotificationComponent c = rows.get(o); + c.setName(""); + c.setType(""); + c.setText(""); + } + prev.setEnabled(true); + next.setEnabled(!notifications.isEmpty()); } // - -%- -