From 8a338de696371ed547dd8a976351c7bc0ea91490 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sun, 13 Sep 2020 03:55:12 -0700 Subject: [PATCH] Hide MagiskHide pre Kitkat --- .../com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt | 4 ++++ .../topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt index 80a7e1901..a6fd0cea6 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt @@ -72,6 +72,10 @@ class SettingsViewModel( Magisk, MagiskHide, SystemlessHosts )) + if (Build.VERSION.SDK_INT < 19) { + // MagiskHide is only available on 4.4+ + list.remove(MagiskHide) + } } // Superuser diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt index 898628f15..9533f180c 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt @@ -1,6 +1,7 @@ package com.topjohnwu.magisk.ui.superuser import android.content.res.Resources +import android.os.Build import androidx.databinding.ObservableArrayList import androidx.lifecycle.viewModelScope import com.topjohnwu.magisk.BR @@ -35,9 +36,10 @@ class SuperuserViewModel( private val itemsHelpers = ObservableArrayList() val adapter = adapterOf>() - val items = MergeObservableList>() - .insertItem(TappableHeadlineItem.Hide) - .insertList(itemsHelpers) + val items = MergeObservableList>().apply { + if (Build.VERSION.SDK_INT >= 19) + insertItem(TappableHeadlineItem.Hide) + }.insertList(itemsHelpers) .insertList(itemsPolicies) val itemBinding = itemBindingOf> { it.bindExtra(BR.listener, this)