From dfb356196591b7e901accf2deac9217e43f47b97 Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Mon, 1 Nov 2021 14:20:57 +0100
Subject: [PATCH] Remove custom Pair implementation

---
 .../fragment/BookmarksFragment.java           |  6 +--
 .../java/org/moire/ultrasonic/util/Pair.java  | 47 -------------------
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/BookmarksFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/BookmarksFragment.java
index 0b350604..36897f5f 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/BookmarksFragment.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/BookmarksFragment.java
@@ -1,6 +1,7 @@
 package org.moire.ultrasonic.fragment;
 
 import android.os.Bundle;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -25,7 +26,6 @@ import org.moire.ultrasonic.subsonic.VideoPlayer;
 import org.moire.ultrasonic.util.CancellationToken;
 import org.moire.ultrasonic.util.Constants;
 import org.moire.ultrasonic.util.FragmentBackgroundTask;
-import org.moire.ultrasonic.util.Pair;
 import org.moire.ultrasonic.util.Util;
 import org.moire.ultrasonic.view.EntryAdapter;
 
@@ -341,7 +341,7 @@ public class BookmarksFragment extends Fragment {
         @Override
         protected void done(Pair<MusicDirectory, Boolean> result)
         {
-            MusicDirectory musicDirectory = result.getFirst();
+            MusicDirectory musicDirectory = result.first;
             List<MusicDirectory.Entry> entries = musicDirectory.getChildren();
 
             int songCount = 0;
@@ -371,7 +371,7 @@ public class BookmarksFragment extends Fragment {
                 deleteButton.setVisibility(View.GONE);
                 playNowButton.setVisibility(View.GONE);
 
-                if (listSize == 0 || result.getFirst().getChildren().size() < listSize)
+                if (listSize == 0 || result.first.getChildren().size() < listSize)
                 {
                     albumButtons.setVisibility(View.GONE);
                 }
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java
deleted file mode 100644
index 4bedd194..00000000
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Pair.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2009 (C) Sindre Mehus
- */
-package org.moire.ultrasonic.util;
-
-import java.io.Serializable;
-
-/**
- * @author Sindre Mehus
- */
-public class Pair<S, T> implements Serializable
-{
-	private static final long serialVersionUID = -8903987928477888234L;
-	private final S first;
-	private final T second;
-
-	public Pair(S first, T second)
-	{
-		this.first = first;
-		this.second = second;
-	}
-
-	public S getFirst()
-	{
-		return first;
-	}
-
-	public T getSecond()
-	{
-		return second;
-	}
-}