Fix a crash that would happen when trying to remove a listener during

channel list update
MCMrARM · Nov 23, 2017 · b97696b · b97696b
1 parent 17d5b40
commit b97696b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/src/main/java/io/mrarm/irc/ServerConnectionInfo.java b/app/src/main/java/io/mrarm/irc/ServerConnectionInfo.java
@@ -296,14 +296,15 @@ public List<String> getChannels() {
     }
 
     public void setChannels(List<String> channels) {
+        Collections.sort(channels, String::compareToIgnoreCase);
         synchronized (this) {
-            Collections.sort(channels, String::compareToIgnoreCase);
             mChannels = channels;
             mManager.notifyChannelListChanged(this, channels);
             mManager.saveAutoconnectListAsync();
         }
         synchronized (mChannelsListeners) {
-            for (ChannelListChangeListener listener : mChannelsListeners)
+            List<ChannelListChangeListener> listeners = new ArrayList<>(mChannelsListeners);
+            for (ChannelListChangeListener listener : listeners)
                 listener.onChannelListChanged(this, channels);
         }
     }