removable-media-manager: rework Android detection

Since there are very few new MTP devices being made that aren't
using the Android MTP implementation (but not none), it makes sense
to assume any MTP device we see is Android based unless we know
otherwise.  To do this, if built with libmtp, we only treat a device
as non-Android if it matches an entry in the libmtp device list
that doesn't have the set of flags applied to all Android devices.
This means we don't need to keep a manually updated list of Android
vendor and device names.

Author: Jonathan Matthew

config.h.meson

@@ -34,3 +34,6 @@
 
 /* Define if pthread_getname_np is available. */
 #mesondefine HAVE_PTHREAD_GETNAME_NP
+
+/* Define if libmtp support is enabled */
+#mesondefine WITH_LIBMTP

meson.build

@@ -210,6 +210,7 @@ endif
 
 libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
 if libmtp.found()
+  cdata.set('WITH_LIBMTP', 1)
   if gudev.found()
     plugins += 'mtpdevice'
   elif get_option('mtp').enabled()

shell/meson.build

@@ -91,7 +91,7 @@ librhythmbox_core = shared_library('rhythmbox-core',
   c_args: shell_c_args,
   include_directories: rhythmbox_core_include_directories,
   dependencies: [common_deps, mediaplayerid_dep, librb_dep, rhythmdb_dep,
-    rbbackends_dep, rbmetadata_dep, rbpodcast_dep, rbwidgets_dep, sources_dep],
+    rbbackends_dep, rbmetadata_dep, rbpodcast_dep, rbwidgets_dep, sources_dep, libmtp],
   install: true,
   link_whole: [librb, rbwidgets_lib, sources_lib],
   version: '@0@.@1@.@2@'.format(RHYTHMBOX_CORE_CURRENT, RHYTHMBOX_CORE_REVISION, RHYTHMBOX_CORE_AGE)

shell/rb-removable-media-manager.c

@@ -44,7 +44,29 @@
 #if defined(HAVE_GUDEV)
 #define G_UDEV_API_IS_SUBJECT_TO_CHANGE
 #include <gudev/gudev.h>
-#endif
+
+#if defined(WITH_LIBMTP)
+#include <libmtp.h>
+
+/* bug flags set for Android devices */
+#define DEVICE_FLAG_UNLOAD_DRIVER		0x00000002
+#define DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST	0x00000004
+#define DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST  0x00000100
+#define DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST 0x00008000
+#define DEVICE_FLAG_LONG_TIMEOUT		0x08000000
+#define DEVICE_FLAG_FORCE_RESET_ON_CLOSE	0x10000000
+
+/* Nexus/Pixel (MTP) (1831:4ee1) masks off BROKEN_MTPGETOBJPROPLIST */
+#define DEVICE_FLAGS_ANDROID_BUGS (\
+	/*DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST |*/ \
+	DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST | \
+	DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST | \
+	DEVICE_FLAG_UNLOAD_DRIVER | \
+	DEVICE_FLAG_LONG_TIMEOUT | \
+	DEVICE_FLAG_FORCE_RESET_ON_CLOSE)
+
+#endif /* WITH_LIBMTP */
+#endif /* HAVE_GUDEV */
 
 #include "rb-removable-media-manager.h"
 #include "rb-library-source.h"
@@ -917,6 +939,21 @@ rb_removable_media_manager_get_gudev_device (RBRemovableMediaManager *manager, G
 #endif
 }
 
+#if defined(HAVE_GUDEV)
+static int
+get_property_as_int (GUdevDevice *device, const char *property, int base)
+{
+	const char *strvalue;
+
+	strvalue = g_udev_device_get_property (device, property);
+	if (strvalue == NULL) {
+		return 0;
+	}
+
+	return strtol (strvalue, NULL, base);
+}
+#endif
+
 /**
  * rb_removable_media_manager_device_is_android:
  * @manager: the #RBRemovableMediaManager
@@ -927,50 +964,58 @@ rb_removable_media_manager_get_gudev_device (RBRemovableMediaManager *manager, G
  * Return value: %TRUE if the device appears to be Android-based
  */
 gboolean
-rb_removable_media_manager_device_is_android (RBRemovableMediaManager *manager, GObject *device)
+rb_removable_media_manager_device_is_android (RBRemovableMediaManager *manager, GObject *gdevice)
 {
-#if defined(HAVE_GUDEV)
-	gboolean match;
-	const char *model;
-	const char *vendor;
+#if !defined(HAVE_GUDEV)
+	return TRUE;
+#else
+	GUdevDevice *device = G_UDEV_DEVICE (gdevice);
+#if defined(WITH_LIBMTP)
+	LIBMTP_device_entry_t *device_list;
+	int numdevs;
 	int i;
+#endif
+	int vendor;
+	int model;
 
-	const char *androids[] = {
-		"Android",
-		"Nexus",
-		"Pixel",
-		"Nexus_5X"
-	};
-	const char *android_vendors[] = {
-		"motorola",
-		"OnePlus",
-		"Google",
-		"bq",
-		"HMD_Global",
-		"LENOVO",
-		"asus",
-	};
+	if (g_strcmp0 (g_udev_device_get_subsystem (device), "usb") != 0) {
+		rb_debug ("device %s is not a USB device", g_udev_device_get_name (device));
+		return FALSE;
+	}
 
-	match = FALSE;
+	/* check that it's not an iPhone or iPod Touch */
+	if (g_udev_device_get_property_as_boolean (device, "USBMUX_SUPPORTED")) {
+		rb_debug ("device %s is supported through AFC, ignore", g_udev_device_get_name (device));
+		return FALSE;
+	}
 
-	model = g_udev_device_get_property (G_UDEV_DEVICE (device), "ID_MODEL");
-	if (model != NULL) {
-		for (i = 0; i < G_N_ELEMENTS (androids); i++) {
-			if (strstr (model, androids[i]))
-				match = TRUE;
-		}
+	if (g_udev_device_has_property (device, "ID_MTP_DEVICE") == FALSE) {
+		rb_debug ("device %s does not support mtp, ignore", g_udev_device_get_name (device));
+		return FALSE;
 	}
 
-	vendor = g_udev_device_get_property (G_UDEV_DEVICE (device), "ID_VENDOR");
-	if (vendor != NULL) {
-		for (i = 0; i < G_N_ELEMENTS (android_vendors); i++) {
-			if (strstr (vendor, android_vendors[i]))
-				match = TRUE;
+	vendor = get_property_as_int (device, "ID_VENDOR_ID", 16);
+	model = get_property_as_int (device, "ID_MODEL_ID", 16);
+#if defined(WITH_LIBMTP)
+
+	rb_debug ("matching device %x:%x against libmtp device list", vendor, model);
+	LIBMTP_Get_Supported_Devices_List(&device_list, &numdevs);
+	for (i = 0; i < numdevs; i++) {
+		if (device_list[i].vendor_id == vendor &&
+		    device_list[i].product_id == model) {
+			rb_debug ("matched libmtp device vendor %s product %s", device_list[i].vendor, device_list[i].product);
+			if ((device_list[i].device_flags & DEVICE_FLAGS_ANDROID_BUGS) != DEVICE_FLAGS_ANDROID_BUGS) {
+				rb_debug ("device doesn't have all android bug flags set");
+				return FALSE;
+			} else {
+				rb_debug ("device has android bug flags set");
+				return TRUE;
+			}
 		}
 	}
-
-	return match;
-#else
-	return FALSE;
+#endif
+	rb_debug ("unable to match device %x:%x against device list, assuming android", vendor, model);
+	return TRUE;
 #endif
 }
+