[Android] Improve ext storages management

[Geoffrey Métais]

vlc-android | branch: 2.5.x | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Nov 22 14:18:06 2017 +0100| [8fa95d2d37816b2fdc6660a5a1dbb66bf0ca1527] | committer: Geoffrey Métais

Improve ext storages management

(cherry picked from commit b41e68f8e868ba206d8b08f41f64dd3bf89f644f)

> https://code.videolan.org/videolan/vlc-android/commit/8fa95d2d37816b2fdc6660a5a1dbb66bf0ca1527
---

 .../src/org/videolan/vlc/ExternalMonitor.java      | 54 +++++++++++++---------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/ExternalMonitor.java b/vlc-android/src/org/videolan/vlc/ExternalMonitor.java
index 3b6da7a8d..6d965da41 100644
--- a/vlc-android/src/org/videolan/vlc/ExternalMonitor.java
+++ b/vlc-android/src/org/videolan/vlc/ExternalMonitor.java
@@ -55,9 +55,6 @@ import java.util.Enumeration;
 import java.util.LinkedList;
 import java.util.List;
 
-import static org.videolan.vlc.MediaParsingService.ACTION_NEW_STORAGE;
-import static org.videolan.vlc.MediaParsingService.EXTRA_PATH;
-
 public class ExternalMonitor extends BroadcastReceiver {
     public final static String TAG = "VLC/ExternalMonitor";
     private static volatile boolean connected = true;
@@ -93,28 +90,31 @@ public class ExternalMonitor extends BroadcastReceiver {
             public void run() {
                 final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(ctx);
                 final List<String> devices = AndroidDevices.getExternalStorageDirectories();
-                if (Util.isListEmpty(devices))
-                    return;
                 final String[] knownDevices = ml.getDevices();
+                final List<String> missingDevices = Util.arrayToArrayList(knownDevices);
+                missingDevices.remove("file://"+AndroidDevices.EXTERNAL_PUBLIC_DIRECTORY);
+                boolean refresh = false;
                 for (final String device : devices) {
                     final String uuid = FileUtils.getFileNameFromPath(device);
-                    if (TextUtils.isEmpty(device) || TextUtils.isEmpty(uuid)
-                            || containsDevice(knownDevices, device))
+                    if (TextUtils.isEmpty(device) || TextUtils.isEmpty(uuid))
+                        continue;
+                    if (containsDevice(knownDevices, device)) {
+                        missingDevices.remove("file://"+device);
                         continue;
+                    }
                     final boolean isNew = ml.addDevice(uuid, device, true);
                     final boolean isIgnored = sharedPreferences.getBoolean("ignore_"+ uuid, false);
-                    if (isNew && !isIgnored)
-                        LocalBroadcastManager.getInstance(ctx).sendBroadcast(new Intent(ACTION_NEW_STORAGE).putExtra(EXTRA_PATH, device));
+                    if (!isIgnored) {
+                        if (isNew)
+                            LocalBroadcastManager.getInstance(ctx).sendBroadcast(new Intent(MediaParsingService.ACTION_NEW_STORAGE).putExtra(MediaParsingService.EXTRA_PATH, device));
+                        else
+                            refresh = true;
+                    }
                 }
-            }
-
-            private boolean containsDevice(String[] devices, String device) {
-                if (Util.isArrayEmpty(devices))
-                    return false;
-                for (String dev : devices)
-                    if (device.startsWith(Strings.removeFileProtocole(dev)))
-                        return true;
-                return false;
+                for (String device : missingDevices)
+                    ml.removeDevice(FileUtils.getFileNameFromPath(device));
+                if (refresh || !missingDevices.isEmpty())
+                    LocalBroadcastManager.getInstance(ctx).sendBroadcast(new Intent(MediaParsingService.ACTION_SERVICE_ENDED));
             }
         });
     }
@@ -172,10 +172,13 @@ public class ExternalMonitor extends BroadcastReceiver {
                     removeMessages(ACTION_MEDIA_UNMOUNTED);
                     if (!TextUtils.isEmpty(uuid)
                             && !PreferenceManager.getDefaultSharedPreferences(appCtx).getBoolean("ignore_" + uuid, false)) {
-                        if (VLCApplication.getMLInstance().addDevice(uuid, path, true)) {
+                        final Medialibrary ml = VLCApplication.getMLInstance();
+                        final String[] knownDevices = ml.getDevices();
+                        if (!containsDevice(knownDevices, path) && ml.addDevice(uuid, path, true)) {
                             notifyStorageChanges(path);
-                        } else
+                        } else {
                             LocalBroadcastManager.getInstance(appCtx).sendBroadcast(new Intent(MediaParsingService.ACTION_SERVICE_ENDED));
+                        }
                     }
                     break;
                 case ACTION_MEDIA_UNMOUNTED:
@@ -191,7 +194,7 @@ public class ExternalMonitor extends BroadcastReceiver {
             obs.onNetworkConnectionChanged(connected);
     }
 
-    private synchronized void notifyStorageChanges(String path) {
+    private static synchronized void notifyStorageChanges(String path) {
         final Activity activity = storageObserver != null ? storageObserver.get() : null;
         if (activity != null)
             UiTools.newStorageDetected(activity, path);
@@ -257,4 +260,13 @@ public class ExternalMonitor extends BroadcastReceiver {
             return false;
         }
     }
+
+    private static boolean containsDevice(String[] devices, String device) {
+        if (Util.isArrayEmpty(devices))
+            return false;
+        for (String dev : devices)
+            if (device.startsWith(Strings.removeFileProtocole(dev)))
+                return true;
+        return false;
+    }
 }