From a17b2f978c859645796b7255ae40a4cd032bc473 Mon Sep 17 00:00:00 2001
From: biconou <rcocula@gmail.com>
Date: Wed, 10 Feb 2016 21:55:32 +0100
Subject: [PATCH] Dont't bypass the context menu in long click on album view.
 (cherry picked from commit 2aa31e0)

---
 .../ultrasonic/activity/SelectAlbumActivity.java      | 11 +++++++++--
 .../java/org/moire/ultrasonic/view/AlbumView.java     |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java
index b80074b6..7409680f 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SelectAlbumActivity.java
@@ -145,16 +145,23 @@ public class SelectAlbumActivity extends SubsonicTabActivity
 			public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
 				if (view instanceof AlbumView) {
 					AlbumView albumView = (AlbumView) view;
-					albumView.maximizeOrMinimize();
+					if (!albumView.isMaximized()) {
+						albumView.maximizeOrMinimize();
+						return true;
+					} else {
+						return false;
+					}
 				}
 				if (view instanceof SongView) {
 					SongView songView = (SongView) view;
 					songView.maximizeOrMinimize();
+					return true;
 				}
-				return true;
+				return false;
 			}
 		});
 
+
 		selectButton = (ImageView) findViewById(R.id.select_album_select);
 		playNowButton = (ImageView) findViewById(R.id.select_album_play_now);
 		playNextButton = (ImageView) findViewById(R.id.select_album_play_next);
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java
index 8ae6785f..2b2a2434 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/view/AlbumView.java
@@ -95,6 +95,10 @@ public class AlbumView extends UpdateView
 		return this.entry;
 	}
 
+	public boolean isMaximized() {
+		return maximized;
+	}
+
 	public void maximizeOrMinimize() {
 		if (maximized) {
 			maximized = false;