From d52be109ee3e66b7cdc98a10046363d38e7941de Mon Sep 17 00:00:00 2001
From: Albert Vaca <albertvaka@gmail.com>
Date: Thu, 8 Dec 2016 23:47:17 +0100
Subject: [PATCH] Revert "Add support to deal with album arts sent by mpris
 plugin."

This was very poorly implemented and can't stay as it is right now:
 - Every second or so the art image was being loaded from disk, scaled,
   base64 encoded and sent over the freakin network!
 - The Android interface didn't take into account small screens, and
   adding the image would cut stuff out of the screen.
 - Didn't manage "edge cases" like playing a song without cover after one
   with cover (previous image was still being shown) or changing players.

This reverts commit 24c404400f6e5092d38d4e26a948777c1545ca2b.

# Conflicts:
#	src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
#	src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
---
 res/layout/mpris_control.xml                      |  5 -----
 .../Plugins/MprisPlugin/MprisActivity.java        |  8 --------
 .../Plugins/MprisPlugin/MprisPlugin.java          | 15 +--------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/res/layout/mpris_control.xml b/res/layout/mpris_control.xml
index 52d466cf..139f331c 100644
--- a/res/layout/mpris_control.xml
+++ b/res/layout/mpris_control.xml
@@ -20,11 +20,6 @@
         android:id="@+id/no_players"
         android:layout_gravity="center_horizontal" />
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/artImageView" />
-
     <Spinner
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
index e7a6e3e7..3fabd6e7 100644
--- a/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java
@@ -21,7 +21,6 @@
 package org.kde.kdeconnect.Plugins.MprisPlugin;
 
 import android.content.SharedPreferences;
-import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -34,7 +33,6 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -95,12 +93,6 @@ public class MprisActivity extends ActionBarActivity {
                                 TextView nowPlaying = (TextView) findViewById(R.id.now_playing_textview);
                                 if (!nowPlaying.getText().toString().equals(song)) {
                                     nowPlaying.setText(song);
-
-                                    Bitmap currentArt = mpris.getCurrentArt();
-                                    ImageView artView = (ImageView) findViewById(R.id.artImageView);
-                                    if (currentArt != null) {
-                                        artView.setImageBitmap(currentArt);
-                                    }
                                 }
 
                                 //Hacks for Spotify because it reports incorrect info about what it supports
diff --git a/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
index 797fb916..433bc4a7 100644
--- a/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
@@ -22,13 +22,10 @@ package org.kde.kdeconnect.Plugins.MprisPlugin;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.content.ContextCompat;
-import android.util.Base64;
 import android.util.Log;
 
 import org.kde.kdeconnect.NetworkPackage;
@@ -47,7 +44,6 @@ public class MprisPlugin extends Plugin {
     private String player = "";
     private boolean playing = false;
     private String currentSong = "";
-    private Bitmap currentArt;
     private int volume = 50;
     private long length = -1;
     private long lastPosition;
@@ -130,8 +126,7 @@ public class MprisPlugin extends Plugin {
     @Override
     public boolean onPackageReceived(NetworkPackage np) {
 
-        if (np.has("nowPlaying") || np.has("volume") || np.has("isPlaying") || np.has("length") ||
-                np.has("pos") || np.has("artImage")) {
+        if (np.has("nowPlaying") || np.has("volume") || np.has("isPlaying") || np.has("length") || np.has("pos")) {
             if (np.getString("player").equals(player)) {
                 currentSong = np.getString("nowPlaying", currentSong);
                 volume = np.getInt("volume", volume);
@@ -140,11 +135,6 @@ public class MprisPlugin extends Plugin {
                     lastPosition = np.getLong("pos", lastPosition);
                     lastPositionTime = System.currentTimeMillis();
                 }
-                if (np.has("artImage")) {
-                    String base64Image = np.getString("artImage");
-                    byte[] decodedBytes = Base64.decode(base64Image, 0);
-                    currentArt = BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.length);
-                }
                 playing = np.getBoolean("isPlaying", playing);
                 playAllowed = np.getBoolean("canPlay", playAllowed);
                 pauseAllowed = np.getBoolean("canPause", pauseAllowed);
@@ -228,7 +218,6 @@ public class MprisPlugin extends Plugin {
         if (player == null || player.equals(this.player)) return;
         this.player = player;
         currentSong = "";
-        currentArt = null;
         volume = 50;
         playing = false;
         playAllowed = true;
@@ -256,8 +245,6 @@ public class MprisPlugin extends Plugin {
         return currentSong;
     }
 
-    public Bitmap getCurrentArt() { return currentArt; }
-
     public String getPlayer() {
         return player;
     }