Use new `AppInfo` helper data class

3 files changed, 11 insertions, 6 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppInfo.kt
new file mode 100644
index 0000000000..4992123a4d
--- /dev/null
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppInfo.kt
@@ -0,0 +1,5 @@
+package net.mullvad.mullvadvpn.applist
+
+import android.content.pm.ApplicationInfo
+
+data class AppInfo(val info: ApplicationInfo, val label: String)
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt
index 8f065a8646..b91433f37d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListAdapter.kt
@@ -1,7 +1,6 @@
 package net.mullvad.mullvadvpn.applist
 
 import android.content.Context
-import android.content.pm.ApplicationInfo
 import android.support.v7.widget.RecyclerView.Adapter
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -9,7 +8,7 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.util.JobTracker
 
 class AppListAdapter(context: Context) : Adapter<AppListItemHolder>() {
-    private val appList = ArrayList<ApplicationInfo>()
+    private val appList = ArrayList<AppInfo>()
     private val jobTracker = JobTracker()
     private val packageManager = context.packageManager
 
@@ -33,7 +32,9 @@ class AppListAdapter(context: Context) : Adapter<AppListItemHolder>() {
     }
 
     private fun populateAppList(context: Context) {
-        val applications = context.packageManager.getInstalledApplications(0)
+        val applications = packageManager
+            .getInstalledApplications(0)
+            .map { info -> AppInfo(info, packageManager.getApplicationLabel(info).toString()) }
 
         appList.clear()
         appList.addAll(applications)
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
index 58b0778e94..84b2775ba9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.applist
 
-import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.support.v7.widget.RecyclerView.ViewHolder
 import android.view.View
@@ -15,9 +14,9 @@ class AppListItemHolder(private val packageManager: PackageManager, view: View)
     private val name: TextView = view.findViewById(R.id.name)
     private val excluded: CellSwitch = view.findViewById(R.id.excluded)
 
-    var appInfo by observable<ApplicationInfo?>(null) { _, _, info ->
+    var appInfo by observable<AppInfo?>(null) { _, _, info ->
         if (info != null) {
-            name.text = packageManager.getApplicationLabel(info)
+            name.text = info.label
         } else {
             name.text = ""
         }