mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-02 15:15:09 +00:00
Code Issues Releases Wiki Activity

Make use of the Java 8 Streams API in MprisPlugin.

Browse Source
This commit is contained in:
Isira Seneviratne
2020-07-01 08:32:09 +05:30
parent 6cfe45abfd
commit edbf3ccaab
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java
View File

@@ -342,14 +342,8 @@ public class MprisPlugin extends Plugin {
Iterator<HashMap.Entry<String, MprisPlayer>> iter = players.entrySet().iterator(); Iterator<HashMap.Entry<String, MprisPlayer>> iter = players.entrySet().iterator();
while (iter.hasNext()) { while (iter.hasNext()) {
String oldPlayer = iter.next().getKey(); String oldPlayer = iter.next().getKey();
final boolean found = newPlayerList.stream().anyMatch(newPlayer ->
boolean found = false; newPlayer.equals(oldPlayer));
for (String newPlayer : newPlayerList) {
if (newPlayer.equals(oldPlayer)) {
found = true;
break;
}
}
if (!found) { if (!found) {
iter.remove(); iter.remove();
@@ -424,12 +418,7 @@ public class MprisPlugin extends Plugin {
* @return null if no players are playing, a playing player otherwise * @return null if no players are playing, a playing player otherwise
*/ */
public MprisPlayer getPlayingPlayer() { public MprisPlayer getPlayingPlayer() {
for (MprisPlayer player : players.values()) { return players.values().stream().filter(MprisPlayer::isPlaying).findFirst().orElse(null);
if (player.isPlaying()) {
return player;
}
}
return null;
} }
boolean hasPlayer(MprisPlayer player) { boolean hasPlayer(MprisPlayer player) {
@@ -471,14 +460,7 @@ public class MprisPlugin extends Plugin {
} }
public void fetchedAlbumArt(String url) { public void fetchedAlbumArt(String url) {
boolean doEmitUpdate = false; if (players.values().stream().anyMatch(player -> url.equals(player.albumArtUrl))) {
for (MprisPlayer player : players.values()) {
if (url.equals(player.albumArtUrl)) {
doEmitUpdate = true;
}
}
if (doEmitUpdate) {
for (String key : playerStatusUpdated.keySet()) { for (String key : playerStatusUpdated.keySet()) {
try { try {
playerStatusUpdated.get(key).dispatchMessage(new Message()); playerStatusUpdated.get(key).dispatchMessage(new Message());