From 605189bc6e2c35ccf93fd2d005fc45f9e241b40e Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Sun, 18 Jul 2021 13:12:23 +0800
Subject: [PATCH] Hide overlay windows

---
 app/shared/src/main/AndroidManifest.xml                       | 1 +
 .../com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt     | 4 ++++
 .../com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt    | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/app/shared/src/main/AndroidManifest.xml b/app/shared/src/main/AndroidManifest.xml
index 220750909..de79e1751 100644
--- a/app/shared/src/main/AndroidManifest.xml
+++ b/app/shared/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29"
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 0e27d791c..afa8f1f00 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
@@ -89,6 +89,10 @@ class SettingsViewModel(
                 // Re-authenticate is not feasible on 8.0+
                 list.add(Reauthenticate)
             }
+            if (Build.VERSION.SDK_INT >= 31) {
+                // Can hide overlay windows on 12.0+
+                list.remove(Tapjack)
+            }
         }
 
         return list
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
index a6844143d..db018c390 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.ui.surequest
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.res.Resources
+import android.os.Build
 import android.os.Bundle
 import android.view.Window
 import android.view.WindowManager
@@ -29,6 +30,9 @@ open class SuRequestActivity : BaseUIActivity<SuRequestViewModel, ActivityReques
         lockOrientation()
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         window.addFlags(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            window.setHideOverlayWindows(true)
+        }
         super.onCreate(savedInstanceState)
 
         fun showRequest() {