Propagate Zygisk state to Magisk app

app/src/main/java/com/topjohnwu/magisk/core/Info.kt

@@ -28,9 +28,10 @@ object Info {
 
     // Device state
     @JvmStatic val env by lazy { loadState() }
-    @JvmField var isSAR = false
-    @JvmField var isAB = false
-    @JvmField val isVirtualAB = getProperty("ro.virtual_ab.enabled", "false") == "true"
+    @JvmStatic var isSAR = false
+    var isAB = false
+    val isVirtualAB = getProperty("ro.virtual_ab.enabled", "false") == "true"
+    @JvmField val isZygiskEnabled = System.getenv("ZYGISK_ENABLED") == "1"
     @JvmStatic val isFDE get() = crypto == "block"
     @JvmField var ramdisk = false
     @JvmField var hasGMS = true

app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt

@@ -62,7 +62,12 @@ class LogViewModel(
             val filename = "magisk_log_%s.log".format(now.toTime(timeFormatStandard))
             val logFile = MediaStoreUtils.getFile(filename, true)
             logFile.uri.outputStream().bufferedWriter().use { file ->
-                file.write("---System Properties---\n\n")
+                file.write("---Detected Device Info---\n\n")
+                file.write("isAB=${Info.isAB}\n")
+                file.write("isSAR=${Info.isSAR}\n")
+                file.write("ramdisk=${Info.ramdisk}\n")
+
+                file.write("\n\n---System Properties---\n\n")
                 ProcessBuilder("getprop").start()
                     .inputStream.reader().use { it.copyTo(file) }
 

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsItems.kt

@@ -236,20 +236,30 @@ object Magisk : BaseSettingsItem.Section() {
 
 object Zygisk : BaseSettingsItem.Toggle() {
     override val title = R.string.zygisk.asText()
-    override val description = R.string.settings_zygisk_summary.asText()
+    override val description get() =
+        if (mismatch) R.string.reboot_apply_change.asText()
+        else R.string.settings_zygisk_summary.asText()
     override var value = Config.zygisk
         set(value) = setV(value, field, { field = it }) {
             Config.zygisk = it
             DenyList.isEnabled = it
             DenyListConfig.isEnabled = it
+            DenyList.notifyPropertyChanged(BR.description)
         }
+    val mismatch get() = value != Info.isZygiskEnabled
 }
 
 object DenyList : BaseSettingsItem.Toggle() {
     override val title = R.string.settings_denylist_title.asText()
     override val description get() =
-        if (isEnabled) R.string.settings_denylist_summary.asText()
-        else R.string.settings_denylist_error.asText(R.string.zygisk.asText())
+        if (isEnabled) {
+            if (Zygisk.mismatch)
+                R.string.reboot_apply_change.asText()
+            else
+                R.string.settings_denylist_summary.asText()
+        } else {
+            R.string.settings_denylist_error.asText(R.string.zygisk.asText())
+        }
 
     override var value = Config.denyList
         set(value) = setV(value, field, { field = it }) {

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt

@@ -18,6 +18,7 @@ import com.topjohnwu.magisk.databinding.itemBindingOf
 import com.topjohnwu.magisk.di.AppContext
 import com.topjohnwu.magisk.events.AddHomeIconEvent
 import com.topjohnwu.magisk.events.RecreateEvent
+import com.topjohnwu.magisk.events.SnackbarEvent
 import com.topjohnwu.magisk.events.dialog.BiometricEvent
 import com.topjohnwu.magisk.ktx.activity
 import com.topjohnwu.magisk.utils.Utils
@@ -97,15 +98,19 @@ class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Callback {
         return list
     }
 
-    override fun onItemPressed(view: View, item: BaseSettingsItem, callback: () -> Unit) = when (item) {
-        is DownloadPath -> withExternalRW(callback)
-        is Biometrics -> authenticate(callback)
-        is Theme -> SettingsFragmentDirections.actionSettingsFragmentToThemeFragment().navigate()
-        is DenyListConfig -> SettingsFragmentDirections.actionSettingsFragmentToDenyFragment().navigate()
-        is SystemlessHosts -> createHosts()
-        is Restore -> HideAPK.restore(view.activity)
-        is AddShortcut -> AddHomeIconEvent().publish()
-        else -> callback()
+    override fun onItemPressed(view: View, item: BaseSettingsItem, callback: () -> Unit) {
+        when (item) {
+            is DownloadPath -> withExternalRW(callback)
+            is Biometrics -> authenticate(callback)
+            is Theme ->
+                SettingsFragmentDirections.actionSettingsFragmentToThemeFragment().navigate()
+            is DenyListConfig ->
+                SettingsFragmentDirections.actionSettingsFragmentToDenyFragment().navigate()
+            is SystemlessHosts -> createHosts()
+            is Restore -> HideAPK.restore(view.activity)
+            is AddShortcut -> AddHomeIconEvent().publish()
+            else -> callback()
+        }
     }
 
     override fun onItemChanged(view: View, item: BaseSettingsItem) {
@@ -113,6 +118,7 @@ class SettingsViewModel : BaseViewModel(), BaseSettingsItem.Callback {
             is Language -> RecreateEvent().publish()
             is UpdateChannel -> openUrlIfNecessary(view)
             is Hide -> viewModelScope.launch { HideAPK.hide(view.activity, item.value) }
+            is Zygisk -> if (Zygisk.mismatch) SnackbarEvent(R.string.reboot_apply_change).publish()
             else -> Unit
         }
     }

app/src/main/res/layout/include_home_magisk.xml

@@ -127,11 +127,28 @@
 
                         </LinearLayout>
 
+                        <LinearLayout
+                            android:id="@+id/home_device_details_zygisk"
+                            style="@style/W.Home.Item"
+                            app:layout_constraintStart_toStartOf="@+id/home_magisk_installed_version"
+                            app:layout_constraintTop_toBottomOf="@+id/home_magisk_installed_version">
+
+                            <TextView
+                                style="@style/W.Home.ItemContent"
+                                android:text="@string/zygisk" />
+
+                            <TextView
+                                style="@style/W.Home.ItemContent.Right"
+                                android:text="@{Info.isZygiskEnabled ? @string/yes : @string/no}"
+                                tools:text="Yes" />
+
+                        </LinearLayout>
+
                         <LinearLayout
                             android:id="@+id/home_device_details_ramdisk"
                             style="@style/W.Home.Item.Bottom"
                             app:layout_constraintStart_toStartOf="@+id/home_magisk_installed_version"
-                            app:layout_constraintTop_toBottomOf="@+id/home_magisk_installed_version">
+                            app:layout_constraintTop_toBottomOf="@+id/home_device_details_zygisk">
 
                             <TextView
                                 style="@style/W.Home.ItemContent"
@@ -144,48 +161,6 @@
 
                         </LinearLayout>
 
-                        <androidx.constraintlayout.widget.Barrier
-                            android:id="@+id/home_magisk_barrier"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            app:barrierDirection="end"
-                            app:referencedIds="@{viewModel.magiskDetailBarrierIds}"
-                            tools:constraint_referenced_ids="home_magisk_installed_version,home_device_details_ramdisk"/>
-
-                        <LinearLayout
-                            android:id="@+id/home_device_details_ab"
-                            style="@style/W.Home.Item.Top"
-                            app:layout_constraintStart_toStartOf="@id/home_magisk_barrier"
-                            app:layout_constraintTop_toTopOf="parent">
-
-                            <TextView
-                                style="@style/W.Home.ItemContent"
-                                android:text="A/B" />
-
-                            <TextView
-                                style="@style/W.Home.ItemContent.Right"
-                                android:text="@{Info.isAB ? @string/yes : @string/no}"
-                                tools:text="Yes" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/home_device_details_sar"
-                            style="@style/W.Home.Item.Bottom"
-                            app:layout_constraintStart_toStartOf="@+id/home_device_details_ab"
-                            app:layout_constraintTop_toBottomOf="@+id/home_device_details_ab">
-
-                            <TextView
-                                style="@style/W.Home.ItemContent"
-                                android:text="SAR" />
-
-                            <TextView
-                                style="@style/W.Home.ItemContent.Right"
-                                android:text="@{Info.isSAR ? @string/yes : @string/no}"
-                                tools:text="Yes" />
-
-                        </LinearLayout>
-
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -242,5 +242,6 @@
     <string name="add_shortcut_title">Add shortcut to home screen</string>
     <string name="add_shortcut_msg">After hiding this app, its name and icon might become difficult to recognize. Do you want to add a pretty shortcut to the home screen?</string>
     <string name="app_not_found">No application found to handle this action</string>
+    <string name="reboot_apply_change">Reboot to apply changes</string>
 
 </resources>