Better handling of MPRIS failures

Fixes issue 3102

Change-Id: I5d41eddc174a63db1bd301f1cb757d21ef840126
Reviewed-on: http://gerrit.dmdirc.com/386
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

src/com/dmdirc/addons/mediasource_dbus/DBusMediaSource.java

@@ -79,11 +79,17 @@ public class DBusMediaSource extends Plugin implements MediaSourceManager {
     @Override
     public List<MediaSource> getSources() {
         for (String mpris : doDBusCall("org.mpris.*", "/", "/")) {
-            final String service = mpris.substring(10);
-
-            if (!mprisSources.containsKey(service)) {
-                mprisSources.put(service, new MPRISSource(this, service));
-                sources.add(mprisSources.get(service));
+            try {
+                final String service = mpris.substring(10);
+
+                if (!mprisSources.containsKey(service)) {
+                    mprisSources.put(service, new MPRISSource(this, service));
+                    sources.add(mprisSources.get(service));
+                }
+            } catch (IllegalArgumentException ex) {
+                // The service either stopped after the initial call and before
+                // we created an MRPIS Source, or otherwise doesn't correctly
+                // implement MPRIS. Either way, ignore it.
             }
         }
 

src/com/dmdirc/addons/mediasource_dbus/MPRISSource.java

@@ -54,8 +54,14 @@ public class MPRISSource implements MediaSource {
         this.source = source;
         this.service = service;
 
-        this.name = source.doDBusCall("org.mpris." + service, "/",
-                "org.freedesktop.MediaPlayer.Identity").get(0).replace(' ', '_');
+        final List<String> info = source.doDBusCall("org.mpris." + service, "/",
+                "org.freedesktop.MediaPlayer.Identity");
+
+        if (info.isEmpty()) {
+            throw new IllegalArgumentException("No service with that name found");
+        }
+
+        this.name = info.get(0).replace(' ', '_');
     }
 
     /** {@inheritDoc} */