From 32d7939761aa8fd8ca9f80063280ccc6e3597ff6 Mon Sep 17 00:00:00 2001
From: Ryan Heise <ryan@ryanheise.com>
Date: Tue, 21 Apr 2020 23:38:40 +1000
Subject: [PATCH] Refactoring

---
 .../java/com/ryanheise/just_audio/AudioPlayer.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java b/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
index fa689a4..f5f4a2f 100644
--- a/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
+++ b/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
@@ -300,7 +300,14 @@ public class AudioPlayer implements MethodCallHandler, Player.EventListener, Met
 		event.add(updatePosition = getCurrentPosition());
 		event.add(updateTime = System.currentTimeMillis());
 		event.add(Math.max(updatePosition, bufferedPosition));
+		event.add(collectIcyMetadata());
 
+		if (eventSink != null) {
+			eventSink.success(event);
+		}
+	}
+
+	private ArrayList<Object> collectIcyMetadata() {
 		final ArrayList<Object> icyData = new ArrayList<>();
 		final ArrayList<String> info;
 		final ArrayList<Object> headers;
@@ -324,11 +331,7 @@ public class AudioPlayer implements MethodCallHandler, Player.EventListener, Met
 		}
 		icyData.add(info);
 		icyData.add(headers);
-		event.add(icyData);
-
-		if (eventSink != null) {
-			eventSink.success(event);
-		}
+		return icyData;
 	}
 
 	private long getCurrentPosition() {