Use lists instead of varargs which have to be spread

zayuim · Jul 19, 2017 · a10987d · a10987d
1 parent 6826223
commit a10987d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/audiobook/src/main/java/de/ph1b/audiobook/features/chapterReader/matroska/MatroskaChapter.kt b/audiobook/src/main/java/de/ph1b/audiobook/features/chapterReader/matroska/MatroskaChapter.kt
@@ -6,7 +6,7 @@ data class MatroskaChapter(
  val children: List<MatroskaChapter>
 ) {
 
- fun getName(vararg preferredLanguages: String): String? = preferredLanguages
+ fun getName(preferredLanguages: List<String> = emptyList<String>()): String? = preferredLanguages
  .mapNotNull { language ->
  names.find { language in it.languages }
  ?.name

diff --git a/...c/main/java/de/ph1b/audiobook/features/chapterReader/matroska/MatroskaChapterFlattener.kt b/...c/main/java/de/ph1b/audiobook/features/chapterReader/matroska/MatroskaChapterFlattener.kt
@@ -5,7 +5,7 @@ import android.util.SparseArray
 
 object MatroskaChapterFlattener {
 
- fun toSparseArray(list: List<MatroskaChapter>, vararg preferredLanguages: String): SparseArray<String> {
+ fun toSparseArray(list: List<MatroskaChapter>, preferredLanguages: List<String>): SparseArray<String> {
  val res = SparseArray<String>()
 
  fun addChapter(chapters: List<MatroskaChapter>, depth: Int) {
@@ -14,7 +14,7 @@ object MatroskaChapterFlattener {
  if (i == 0) depth else 0
  // Simple hack with adding depth is needed because chapter
  // and it's first sub-chapter have usually the same starting time.
- val name = "+ ".repeat(depth) + (chapter.getName(*preferredLanguages) ?: "Chapter ${i + 1}")
+ val name = "+ ".repeat(depth) + (chapter.getName(preferredLanguages) ?: "Chapter ${i + 1}")
  res.put(duration, name)
  addChapter(chapter.children, depth + 1)
  }

diff --git a/.../src/main/java/de/ph1b/audiobook/features/chapterReader/matroska/MatroskaChapterReader.kt b/.../src/main/java/de/ph1b/audiobook/features/chapterReader/matroska/MatroskaChapterReader.kt
@@ -12,7 +12,7 @@ object MatroskaChapterReader {
  fun read(file: File): SparseArray<String> {
  try {
  val chapters = ReadAsMatroskaChapters.read(file)
- return MatroskaChapterFlattener.toSparseArray(chapters, Locale.getDefault().isO3Language, "eng")
+ return MatroskaChapterFlattener.toSparseArray(chapters, listOf(Locale.getDefault().isO3Language, "eng"))
  } catch (ex: RuntimeException) {
  // JEBML documentation just say's that it throws RuntimeException.
  // For example NullPointerException is thrown if unknown EBML Element

diff --git a/...book/src/test/java/de/ph1b/audiobook/features/chapterReader/MatroskaChapterReadingTest.kt b/...book/src/test/java/de/ph1b/audiobook/features/chapterReader/MatroskaChapterReadingTest.kt
@@ -56,13 +56,13 @@ class MatroskaChapterReadingTest {
  MatroskaChapterName("サブパート1", setOf("jpn"))
  ), listOf())
  assertThat(chapter.getName()).isEqualTo("Podczęść 1")
- assertThat(chapter.getName("ger", "jpn")).isEqualTo("Subpart 1")
- assertThat(chapter.getName("ind", "kac", "jpn", "eng")).isEqualTo("サブパート1")
+ assertThat(chapter.getName(listOf("ger", "jpn"))).isEqualTo("Subpart 1")
+ assertThat(chapter.getName(listOf("ind", "kac", "jpn", "eng"))).isEqualTo("サブパート1")
  }
 
  @Test
  fun flattenMatroskaChapterListTest() {
- assertThat(MatroskaChapterFlattener.toSparseArray(testFileMatroskaChapters, "pol", "eng")
+ assertThat(MatroskaChapterFlattener.toSparseArray(testFileMatroskaChapters, listOf("pol", "eng"))
  .toMap()).isEqualTo(testFileChapters)
  }