fixed crash after deleting an item in the list of installed games

Author: btimofeev

app/build.gradle

@@ -147,6 +147,9 @@ dependencies {
     implementation "ch.acra:acra-mail:$acraVersion"
     implementation "ch.acra:acra-notification:$acraVersion"
 
+    // Logging
+    implementation 'com.jakewharton.timber:timber:4.7.1'
+
     // LeakCanary
     //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-3'
 }

app/src/main/kotlin/org/emunix/insteadlauncher/InsteadLauncher.kt

@@ -21,6 +21,7 @@ import org.emunix.insteadlauncher.di.AppComponent
 import org.emunix.insteadlauncher.di.AppModule
 import org.emunix.insteadlauncher.di.DaggerAppComponent
 import org.emunix.insteadlauncher.helpers.ThemeHelper
+import timber.log.Timber
 
 
 @AcraCore(stopServicesOnCrash = true,
@@ -58,6 +59,9 @@ class InsteadLauncher: Application() {
 
     override fun onCreate() {
         super.onCreate()
+        if(BuildConfig.DEBUG)
+            Timber.plant(Timber.DebugTree())
+
         appComponent = DaggerAppComponent.builder()
                 .appModule(AppModule(this))
                 .build()

app/src/main/kotlin/org/emunix/insteadlauncher/data/GameStateConverter.kt

@@ -12,5 +12,5 @@ class GameStateConverter {
     fun toState(ordinal: Int): Game.State = Game.State.values()[ordinal]
 
     @TypeConverter
-    fun toOrdinal(state: Game.State): Int? = state.ordinal
+    fun toOrdinal(state: Game.State): Int = state.ordinal
 }

app/src/main/kotlin/org/emunix/insteadlauncher/ui/installedgames/InstalledGamesAdapter.kt

@@ -16,12 +16,12 @@ import org.emunix.insteadlauncher.data.Game
 import org.emunix.insteadlauncher.helpers.loadUrl
 import androidx.recyclerview.widget.ListAdapter
 import org.emunix.insteadlauncher.data.GameDiffCallback
+import timber.log.Timber
 
 class InstalledGamesAdapter(val onClickListener: (Game) -> Unit) : ListAdapter<Game, InstalledGamesAdapter.ViewHolder>(GameDiffCallback()) {
 
-    private lateinit var longClickedGame: Game
-
-    fun getLongClickedGame(): Game = longClickedGame
+    lateinit var longClickedGame: Game
+    private set
 
     class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val name = itemView.findViewById<TextView>(R.id.name)!!
@@ -33,16 +33,19 @@ class InstalledGamesAdapter(val onClickListener: (Game) -> Unit) : ListAdapter<G
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.name.text = getItem(position).title
-        holder.image.loadUrl(getItem(position).image)
-        holder.itemView.setOnClickListener { onClickListener(getItem(position)) }
+        val game = getItem(position)
+        holder.name.text = game.title
+        holder.image.loadUrl(game.image)
+        holder.itemView.setOnClickListener { onClickListener(game) }
         holder.itemView.setOnLongClickListener {
-            longClickedGame = getItem(position)
+            Timber.d("Long clicked game: ${game.name}")
+            longClickedGame = game
             false
         }
     }
 
     override fun onViewRecycled(holder: ViewHolder) {
+        holder.itemView.setOnClickListener(null)
         holder.itemView.setOnLongClickListener(null)
         super.onViewRecycled(holder)
     }

app/src/main/kotlin/org/emunix/insteadlauncher/ui/installedgames/InstalledGamesFragment.kt

@@ -59,7 +59,7 @@ class InstalledGamesFragment : Fragment() {
         viewModel.init()
 
         viewModel.getInstalledGames().observe(viewLifecycleOwner) { games ->
-            listAdapter.submitList(games)
+            listAdapter.submitList(games.toList())
             binding.emptyView.visible(games.isEmpty())
         }
     }
@@ -72,19 +72,19 @@ class InstalledGamesFragment : Fragment() {
     override fun onContextItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.installed_games_activity_context_menu_play -> {
-                playGame(listAdapter.getLongClickedGame())
+                playGame(listAdapter.longClickedGame)
             }
             R.id.installed_games_activity_context_menu_play_from_beginning -> {
-                playGame(listAdapter.getLongClickedGame(), true)
+                playGame(listAdapter.longClickedGame, true)
             }
             R.id.installed_games_activity_context_menu_delete -> {
-                val deleteDialog = DeleteGameDialog.newInstance(listAdapter.getLongClickedGame().name)
+                val deleteDialog = DeleteGameDialog.newInstance(listAdapter.longClickedGame.name)
                 if (isAdded)
                     parentFragmentManager.let { deleteDialog.show(it, "delete_dialog") }
             }
             R.id.installed_games_activity_context_menu_about -> {
                 val intent = Intent(context, GameActivity::class.java)
-                val gameName = listAdapter.getLongClickedGame().name
+                val gameName = listAdapter.longClickedGame.name
                 intent.putExtra("game_name", gameName)
                 startActivity(intent)
             }