From db4d182356dfd32c7c236e188478847739dfdab7 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanth@stacklighting.com>
Date: Mon, 10 Dec 2018 13:24:43 +0530
Subject: [PATCH] Scroll crash fixed

---
 .../ui/adapter/song/AbsOffsetSongAdapter.kt     |  6 +++---
 .../retromusic/ui/adapter/song/SongAdapter.kt   | 17 +++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt
index 92e25f58..935867e7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/AbsOffsetSongAdapter.kt
@@ -52,9 +52,9 @@ abstract class AbsOffsetSongAdapter : SongAdapter {
     }
 
     override fun getSectionName(position: Int): String {
-        var positionFinal = position
-        positionFinal--
-        return if (position < 0) "" else super.getSectionName(positionFinal)
+        var positionF = position
+        positionF--
+        return if (positionF < 0) "" else super.getSectionName(positionF)
     }
 
     open inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt
index a88b6338..301b597b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt
@@ -157,12 +157,17 @@ open class SongAdapter @JvmOverloads constructor(protected val activity: AppComp
     }
 
     override fun getSectionName(position: Int): String {
-        var sectionName: String? = null
-        when (PreferenceUtil.getInstance().songSortOrder) {
-            SortOrder.SongSortOrder.SONG_A_Z, SortOrder.SongSortOrder.SONG_Z_A -> sectionName = dataSet[position].title
-            SortOrder.SongSortOrder.SONG_ALBUM -> sectionName = dataSet[position].albumName
-            SortOrder.SongSortOrder.SONG_ARTIST -> sectionName = dataSet[position].artistName
+        if (!showSectionName) {
+            return "";
+        }
+        val sectionName: String? = when (PreferenceUtil.getInstance().songSortOrder) {
+            SortOrder.SongSortOrder.SONG_A_Z, SortOrder.SongSortOrder.SONG_Z_A -> dataSet[position].title
+            SortOrder.SongSortOrder.SONG_ALBUM -> dataSet[position].albumName
+            SortOrder.SongSortOrder.SONG_ARTIST -> dataSet[position].artistName
             SortOrder.SongSortOrder.SONG_YEAR -> return MusicUtil.getYearString(dataSet[position].year)
+            else -> {
+                return ""
+            }
         }
 
         return MusicUtil.getSectionName(sectionName)
@@ -221,6 +226,6 @@ open class SongAdapter @JvmOverloads constructor(protected val activity: AppComp
 
     companion object {
 
-        val TAG = SongAdapter::class.java.simpleName
+        val TAG:String = SongAdapter::class.java.simpleName
     }
 }