From 1c123e55d8b13f59a987b28d362e3b201da630b9 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Sun, 17 Jan 2021 14:54:48 +0400
Subject: [PATCH] crash fixes

---
 .../main/java/com/vanced/manager/adapter/AppListAdapter.kt | 6 +++---
 .../main/java/com/vanced/manager/model/RootDataModel.kt    | 7 ++++++-
 .../main/java/com/vanced/manager/utils/PackageHelper.kt    | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/vanced/manager/adapter/AppListAdapter.kt b/app/src/main/java/com/vanced/manager/adapter/AppListAdapter.kt
index 7237bae7..0f62afb2 100644
--- a/app/src/main/java/com/vanced/manager/adapter/AppListAdapter.kt
+++ b/app/src/main/java/com/vanced/manager/adapter/AppListAdapter.kt
@@ -76,13 +76,13 @@ class AppListAdapter(
 
     override fun onBindViewHolder(holder: ListViewHolder, position: Int) {
         holder.bind(position)
-
+        val dataModel = if (isRoot) rootDataModels[position] else dataModels[position]
         holder.appCard.setOnClickListener {
             tooltip.close()
             AppInfoDialog.newInstance(
                 appName = apps[position],
-                appIcon = dataModels[position]?.appIcon,
-                changelog = dataModels[position]?.changelog?.value
+                appIcon = dataModel?.appIcon,
+                changelog = dataModel?.changelog?.value
             ).show(context.supportFragmentManager, "info")
         }
     }
diff --git a/app/src/main/java/com/vanced/manager/model/RootDataModel.kt b/app/src/main/java/com/vanced/manager/model/RootDataModel.kt
index 2466772d..9a582a9f 100644
--- a/app/src/main/java/com/vanced/manager/model/RootDataModel.kt
+++ b/app/src/main/java/com/vanced/manager/model/RootDataModel.kt
@@ -2,12 +2,13 @@ package com.vanced.manager.model
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.util.Log
 import androidx.lifecycle.LiveData
 import com.beust.klaxon.JsonObject
 import com.vanced.manager.R
 import com.vanced.manager.utils.PackageHelper
 
-open class RootDataModel(
+class RootDataModel(
     jsonObject: LiveData<JsonObject?>,
     private val context: Context,
     override val appPkg: String,
@@ -18,6 +19,10 @@ open class RootDataModel(
     jsonObject, context, appPkg, appName, appIcon
 ) {
 
+    init {
+        Log.d("test", appPkg)
+    }
+
     override fun getPkgVersionName(pkg: String): String {
         return if (PackageHelper.scriptExists(scriptName)) {
             super.getPkgVersionName(pkg)
diff --git a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
index 7315dc5f..c8dae34a 100644
--- a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
+++ b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
@@ -68,9 +68,9 @@ object PackageHelper {
             else -> ""
         }
     }
-    fun isPackageInstalled(packageName: String, packageManager: PackageManager): Boolean {
+    fun isPackageInstalled(packageName: String?, packageManager: PackageManager): Boolean {
         return try {
-            packageManager.getPackageInfo(packageName, 0)
+            packageManager.getPackageInfo(packageName ?: "", 0)
             true
         } catch (e: PackageManager.NameNotFoundException) {
             false