diff --git a/app/src/main/java/com/stormtales/notevault/network/sync/SongSyncModule.java b/app/src/main/java/com/stormtales/notevault/network/sync/SongSyncModule.java index 20620a9..d048963 100644 --- a/app/src/main/java/com/stormtales/notevault/network/sync/SongSyncModule.java +++ b/app/src/main/java/com/stormtales/notevault/network/sync/SongSyncModule.java @@ -100,7 +100,19 @@ public class SongSyncModule { public void getRemotelyModifiedSongData(List freshlyCreatedSongs) { songSyncRepository.loadRemotelyModifiedSongs(songs -> { - songs.addAll(freshlyCreatedSongs); + for(Song song : freshlyCreatedSongs) { + boolean freshlyCreatedSongFound = false; + for(Song s : songs) { + if(s.getServerID().equals(song.getServerID())) { + freshlyCreatedSongFound = true; + break; + } + } + if(!freshlyCreatedSongFound) { + songs.add(song); + } + + } if(songs.isEmpty()) { syncViewModel.finishFetching(); } else {