remove requirement to draw over other apps

Author: newhinton

ui/src/main/AndroidManifest.xml

@@ -7,9 +7,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission
-        android:name="android.permission.SYSTEM_ALERT_WINDOW"
-        android:minSdkVersion="34" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28"

ui/src/main/java/com/wireguard/android/QuickTileService.kt

@@ -5,6 +5,7 @@
 package com.wireguard.android
 
 import android.app.PendingIntent
+import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -52,6 +53,7 @@ class QuickTileService : TileService() {
     }
 
     override fun onClick() {
+        updateTile()
         when (val tunnel = tunnel) {
             null -> {
                 val intent = Intent(this, MainActivity::class.java)
@@ -64,21 +66,22 @@ class QuickTileService : TileService() {
                 }
             }
             else -> {
+                Log.e("TAG", "click")
                 unlockAndRun {
                     applicationScope.launch {
                         try {
                             tunnel.setStateAsync(Tunnel.State.TOGGLE)
                             updateTile()
                         } catch (_: Throwable) {
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && !Settings.canDrawOverlays(this@QuickTileService)) {
-                                val permissionIntent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:$packageName"))
-                                permissionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                startActivityAndCollapse(PendingIntent.getActivity(this@QuickTileService, 0, permissionIntent, PendingIntent.FLAG_IMMUTABLE))
-                                return@launch
+                            Log.e("TAG", "click?")
+                            val intent = Intent(this@QuickTileService, TunnelToggleActivity::class.java)
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                                startActivityAndCollapse(PendingIntent.getActivity(this@QuickTileService, 0, intent, PendingIntent.FLAG_IMMUTABLE))
+                            } else {
+                                @Suppress("DEPRECATION")
+                                startActivity(intent)
                             }
-                            val toggleIntent = Intent(this@QuickTileService, TunnelToggleActivity::class.java)
-                            toggleIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            startActivity(toggleIntent)
                         }
                     }
                 }
@@ -133,7 +136,7 @@ class QuickTileService : TileService() {
         isAdded = false
     }
 
-    private fun updateTile() {
+    private fun updateTile(isConnecting: Boolean = false) {
         // Update the tunnel.
         val newTunnel = Application.getTunnelManager().lastUsedTunnel
         if (newTunnel != tunnel) {
@@ -148,6 +151,12 @@ class QuickTileService : TileService() {
             null -> {
                 tile.label = getString(R.string.app_name)
                 tile.state = Tile.STATE_INACTIVE
+                if(isConnecting) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                        tile.subtitle = getString(R.string.quick_settings_tile_connecting)
+                        tile.state = Tile.STATE_ACTIVE
+                    }
+                }
                 tile.icon = iconOff
             }
             else -> {

ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt

@@ -48,6 +48,7 @@ class TunnelToggleActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        moveTaskToBack(true)
         lifecycleScope.launch {
             if (Application.getBackend() is GoBackend) {
                 val intent = GoBackend.VpnService.prepare(this@TunnelToggleActivity)

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

@@ -257,4 +257,5 @@
     <string name="biometric_prompt_private_key_title">Authenticate to view private key</string>
     <string name="biometric_auth_error">Authentication failure</string>
     <string name="biometric_auth_error_reason">Authentication failure: %s</string>
+    <string name="quick_settings_tile_connecting">Connecting…</string>
 </resources>

ui/src/main/res/values/styles.xml

@@ -33,9 +33,12 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="colorPrimaryDark">@android:color/transparent</item>
-        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
         <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+
     </style>
 
     <style name="TvTheme" parent="AppTheme">