Make track import behavior on duplicate UUID configurable (default: import with a new UUID).

2020-08-13 17:58:22 +02:00
parent f8afa9dbad
commit c26a5edc03
6 changed files with 26 additions and 14 deletions
@@ -273,7 +273,18 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
            trackData.trackStatisticsUpdater.updateTime(trackData.importTime);
        }
        trackData.track.setTrackStatistics(trackData.trackStatisticsUpdater.getTrackStatistics());
-        contentProviderUtils.updateTrack(trackData.track);
+
+        try {
+            contentProviderUtils.updateTrack(trackData.track);
+        } catch (SQLiteConstraintException e) {
+            if (PreferencesUtils.getPreventReimportTracks(context)) {
+                throw e;
+            }
+
+            //TODO This is a workaround until we have proper UI.
+            trackData.track.setUuid(UUID.randomUUID());
+            contentProviderUtils.updateTrack(trackData.track);
+        }
    }

    /**