[Android] Thread-safe LinkedList for adapters

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Feb 17 15:54:29 2015 +0100| [88d64a9de9c7a8f24b63a10f8705c3fea81bfe36] | committer: Geoffrey Métais

Thread-safe LinkedList for adapters

CID #1270658

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=88d64a9de9c7a8f24b63a10f8705c3fea81bfe36
---

 .../vlc/gui/audio/AudioBrowserFragment.java        |   34 +++++++-------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
index 46e7cd1..ac7cd0d 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
@@ -68,6 +68,8 @@ import org.videolan.vlc.widget.HeaderScrollView;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -86,7 +88,7 @@ public class AudioBrowserFragment extends BrowserFragment implements SwipeRefres
     private AudioBrowserListAdapter mAlbumsAdapter;
     private AudioBrowserListAdapter mSongsAdapter;
     private AudioBrowserListAdapter mGenresAdapter;
-    private ArrayList<AudioBrowserListAdapter> mAdaptersToNotify = new ArrayList<AudioBrowserListAdapter>();
+    private ConcurrentLinkedQueue<AudioBrowserListAdapter> mAdaptersToNotify = new ConcurrentLinkedQueue<>();
 
     private View mEmptyView;
 
@@ -495,11 +497,9 @@ public class AudioBrowserFragment extends BrowserFragment implements SwipeRefres
             getActivity().runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    synchronized (mAdaptersToNotify) {
-                        for (AudioBrowserListAdapter adapter : mAdaptersToNotify)
-                            adapter.notifyDataSetChanged();
-                        mAdaptersToNotify.clear();
-                    }
+                    for (AudioBrowserListAdapter adapter : mAdaptersToNotify)
+                        adapter.notifyDataSetChanged();
+                    mAdaptersToNotify.clear();
 
                     // Refresh the fast scroll data, since SectionIndexer doesn't respect notifyDataSetChanged
                     int[] lists = {R.id.artists_list, R.id.albums_list, R.id.songs_list, R.id.genres_list};
@@ -570,10 +570,8 @@ public class AudioBrowserFragment extends BrowserFragment implements SwipeRefres
             tasks.add(new Runnable() {
                 @Override
                 public void run() {
-                    synchronized (mAdaptersToNotify) {
-                        if (!mAdaptersToNotify.isEmpty())
-                            display();
-                    }
+                    if (!mAdaptersToNotify.isEmpty())
+                        display();
                 }
             });
             for (Runnable task : tasks)
@@ -586,9 +584,7 @@ public class AudioBrowserFragment extends BrowserFragment implements SwipeRefres
         public void run() {
             Collections.sort(mAudioList, MediaComparators.byArtist);
             mArtistsAdapter.addAll(mAudioList, AudioBrowserListAdapter.TYPE_ARTISTS);
-            synchronized (mAdaptersToNotify) {
-                mAdaptersToNotify.add(mArtistsAdapter);
-            }
+            mAdaptersToNotify.add(mArtistsAdapter);
             if (mReadyToDisplay && !mDisplaying)
                 display();
         }
@@ -599,9 +595,7 @@ public class AudioBrowserFragment extends BrowserFragment implements SwipeRefres
         public void run() {
             Collections.sort(mAudioList, MediaComparators.byAlbum);
             mAlbumsAdapter.addAll(mAudioList, AudioBrowserListAdapter.TYPE_ALBUMS);
-            synchronized (mAdaptersToNotify) {
-                mAdaptersToNotify.add(mAlbumsAdapter);
-            }
+            mAdaptersToNotify.add(mAlbumsAdapter);
             if (mReadyToDisplay && !mDisplaying)
                 display();
         }
@@ -612,9 +606,7 @@ public class AudioBrowserFragment extends BrowserFragment implements SwipeRefres
         public void run() {
             Collections.sort(mAudioList, MediaComparators.byName);
             mSongsAdapter.addAll(mAudioList, AudioBrowserListAdapter.TYPE_SONGS);
-            synchronized (mAdaptersToNotify) {
-                mAdaptersToNotify.add(mSongsAdapter);
-            }
+            mAdaptersToNotify.add(mSongsAdapter);
             if (mReadyToDisplay && !mDisplaying)
                 display();
         }
@@ -625,9 +617,7 @@ public class AudioBrowserFragment extends BrowserFragment implements SwipeRefres
         public void run() {
             Collections.sort(mAudioList, MediaComparators.byGenre);
             mGenresAdapter.addAll(mAudioList, AudioBrowserListAdapter.TYPE_GENRES);
-            synchronized (mAdaptersToNotify) {
-                mAdaptersToNotify.add(mGenresAdapter);
-            }
+            mAdaptersToNotify.add(mGenresAdapter);
             if (mReadyToDisplay && !mDisplaying)
                 display();
         }