[rhythmbox] android: always upload from a temporary file

[Jonathan Matthew <jmatthew src gnome org>]

commit 0f5c0ef099a44aded8c082c8724bb45811176ade
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sun Dec 30 09:11:41 2018 +1000

    android: always upload from a temporary file
    
    Previously this was only needed for Samsung phones, but it appears
    that starting with Android 9 (Pie) this is necessary for new media
    files to be added to the media library.

 plugins/android/rb-android-source.c | 46 ++++++++++---------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)
---
diff --git a/plugins/android/rb-android-source.c b/plugins/android/rb-android-source.c
index e96628b77..dc0cdb543 100644
--- a/plugins/android/rb-android-source.c
+++ b/plugins/android/rb-android-source.c
@@ -101,8 +101,6 @@ typedef struct
 
        GtkWidget *grid;
        GtkWidget *info_bar;
-
-       gboolean samsung;
 } RBAndroidSourcePrivate;
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
@@ -744,12 +742,7 @@ impl_build_dest_uri (RBTransferTarget *target,
                     const char *media_type,
                     const char *extension)
 {
-       RBAndroidSourcePrivate *priv = GET_PRIVATE (target);
-       if (priv->samsung) {
-               return g_strdup (RB_ENCODER_DEST_TEMPFILE);
-       } else {
-               return build_device_uri (RB_ANDROID_SOURCE (target), entry, media_type, extension);
-       }
+       return g_strdup (RB_ENCODER_DEST_TEMPFILE);
 }
 
 static void
@@ -835,26 +828,19 @@ impl_track_added (RBTransferTarget *target,
                  const char *media_type)
 {
        RBAndroidSource *source = RB_ANDROID_SOURCE (target);
-       RBAndroidSourcePrivate *priv = GET_PRIVATE (source);
-
-       if (priv->samsung) {
-               char *realdest;
-               GFile *dfile, *sfile;
-               GTask *task;
+       char *realdest;
+       GFile *dfile, *sfile;
+       GTask *task;
 
-               realdest = build_device_uri (source, entry, media_type, rb_gst_media_type_to_extension 
(media_type));
-               dfile = g_file_new_for_uri (realdest);
-               sfile = g_file_new_for_uri (dest);
-               g_free (realdest);
+       realdest = build_device_uri (source, entry, media_type, rb_gst_media_type_to_extension (media_type));
+       dfile = g_file_new_for_uri (realdest);
+       sfile = g_file_new_for_uri (dest);
+       g_free (realdest);
 
-               task = g_task_new (dfile, NULL, track_copy_cb, g_object_ref (source));
-               g_task_set_task_data (task, sfile, g_object_unref);
-               g_task_run_in_thread (task, copy_track_task);
-               return FALSE;
-       } else {
-               update_free_space (source);
-               return TRUE;
-       }
+       task = g_task_new (dfile, NULL, track_copy_cb, g_object_ref (source));
+       g_task_set_task_data (task, sfile, g_object_unref);
+       g_task_run_in_thread (task, copy_track_task);
+       return FALSE;
 }
 
 
@@ -897,7 +883,6 @@ impl_constructed (GObject *object)
        RBAndroidSourcePrivate *priv;
        RhythmDBEntryType *entry_type;
        RBShell *shell;
-       const char *vendor;
        char **output_formats;
 
        source = RB_ANDROID_SOURCE (object);
@@ -947,13 +932,6 @@ impl_constructed (GObject *object)
        }
        g_strfreev (output_formats);
 
-       /* some vendors are worse than others */
-       vendor = g_udev_device_get_property (priv->gudev_device, "ID_VENDOR");
-       if (g_ascii_strcasecmp (vendor, "samsung") == 0) {
-               rb_debug ("samsung mode: transfers will use local temporary files");
-               priv->samsung = TRUE;
-       }
-
        g_object_unref (shell);
 }