narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

made iterating over hashmap in notification service thread safe

Browse source
This commit is contained in:
iNPUTmice 2014-10-21 23:59:02 +02:00
parent 63704b114c
commit 40c74b432e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/eu/siacs/conversations/services/NotificationService.java
View file

@ -1,7 +1,9 @@
package eu.siacs.conversations.services; package eu.siacs.conversations.services;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map.Entry;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -130,7 +132,11 @@ public class NotificationService {
.getString(R.string.unread_conversations)); .getString(R.string.unread_conversations));
StringBuilder names = new StringBuilder(); StringBuilder names = new StringBuilder();
Conversation conversation = null; Conversation conversation = null;
for (ArrayList<Message> messages : notifications.values()) { Iterator<Entry<String, ArrayList<Message>>> it = notifications
.entrySet().iterator();
while (it.hasNext()) {
Entry<String, ArrayList<Message>> entry = it.next();
ArrayList<Message> messages = entry.getValue();
if (messages.size() > 0) { if (messages.size() > 0) {
conversation = messages.get(0).getConversation(); conversation = messages.get(0).getConversation();
String name = conversation.getName(); String name = conversation.getName();
@ -142,6 +148,7 @@ public class NotificationService {
names.append(name); names.append(name);
names.append(", "); names.append(", ");
} }
it.remove();
} }
if (names.length() >= 2) { if (names.length() >= 2) {
names.delete(names.length() - 2, names.length()); names.delete(names.length() - 2, names.length());