|
1 | 1 | package com.sleepbutton.app |
2 | 2 |
|
3 | 3 | import android.Manifest |
4 | | -import android.accessibilityservice.AccessibilityServiceInfo |
5 | | -import android.content.Context |
6 | 4 | import android.content.Intent |
7 | 5 | import android.content.pm.PackageManager |
8 | 6 | import android.net.Uri |
9 | 7 | import android.os.Build |
10 | 8 | import android.os.Bundle |
11 | 9 | import android.provider.Settings |
12 | | -import android.view.accessibility.AccessibilityManager |
13 | 10 | import android.widget.Button |
14 | 11 | import android.widget.TextView |
15 | 12 | import androidx.activity.result.contract.ActivityResultContracts |
@@ -75,8 +72,8 @@ class MainActivity : AppCompatActivity() { |
75 | 72 | } |
76 | 73 |
|
77 | 74 | private fun refreshUi() { |
78 | | - val hasOverlay = Settings.canDrawOverlays(this) |
79 | | - val hasAccessibility = isAccessibilityEnabled() |
| 75 | + val hasOverlay = PermissionUtils.hasOverlayPermission(this) |
| 76 | + val hasAccessibility = PermissionUtils.hasAccessibilityPermission(this) |
80 | 77 | val allGranted = hasOverlay && hasAccessibility |
81 | 78 |
|
82 | 79 | btnOverlay.text = if (hasOverlay) getString(R.string.granted) else getString(R.string.grant) |
@@ -105,10 +102,4 @@ class MainActivity : AppCompatActivity() { |
105 | 102 | btnToggle.backgroundTintList = getColorStateList(R.color.colorAccent) |
106 | 103 | } |
107 | 104 | } |
108 | | - |
109 | | - private fun isAccessibilityEnabled(): Boolean { |
110 | | - val am = getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager |
111 | | - val services = am.getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_ALL_MASK) |
112 | | - return services.any { it.resolveInfo.serviceInfo.packageName == packageName } |
113 | | - } |
114 | 105 | } |
0 commit comments