proxy-app map: set alpha based on internet permission

celzero · Sep 9, 2024 · 8b49215 · 8b49215
1 parent d715e76
commit 8b49215
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/app/src/full/java/com/celzero/bravedns/adapter/FirewallAppListAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/FirewallAppListAdapter.kt
@@ -112,15 +112,17 @@ class FirewallAppListAdapter(
                     } else {
                         b.firewallAppLabelTv.setTextColor(userAppColor)
                     } */
+                    b.firewallAppToggleOther.text = getFirewallText(appStatus, connStatus)
+                    displayIcon(
+                        getIcon(context, appInfo.packageName, appInfo.appName), b.firewallAppIconIv)
                     // set the alpha based on internet permission
                     if (appInfo.hasInternetPermission(packageManager)) {
                         b.firewallAppLabelTv.alpha = 1f
+                        b.firewallAppIconIv.alpha = 1f
                     } else {
                         b.firewallAppLabelTv.alpha = 0.4f
+                        b.firewallAppIconIv.alpha = 0.4f
                     }
-                    b.firewallAppToggleOther.text = getFirewallText(appStatus, connStatus)
-                    displayIcon(
-                        getIcon(context, appInfo.packageName, appInfo.appName), b.firewallAppIconIv)
                     if (appInfo.packageName == context.packageName) {
                         b.firewallAppToggleWifi.visibility = View.GONE
                         b.firewallAppToggleMobileData.visibility = View.GONE

diff --git a/app/src/full/java/com/celzero/bravedns/adapter/WgIncludeAppsAdapter.kt b/app/src/full/java/com/celzero/bravedns/adapter/WgIncludeAppsAdapter.kt
@@ -19,6 +19,7 @@ import Logger
 import Logger.LOG_TAG_PROXY
 import android.content.Context
 import android.content.DialogInterface
+import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.View
@@ -54,6 +55,7 @@ class WgIncludeAppsAdapter(
     PagingDataAdapter<ProxyApplicationMapping, WgIncludeAppsAdapter.IncludedAppInfoViewHolder>(
         DIFF_CALLBACK
     ) {
+    private val packageManager: PackageManager = context.packageManager
 
     companion object {
 
@@ -138,6 +140,14 @@ class WgIncludeAppsAdapter(
 
             val isIncluded = mapping.proxyId == proxyId && mapping.proxyId != ""
             ui { displayIcon(getIcon(context, mapping.packageName, mapping.appName)) }
+            // set the alpha based on internet permission
+            if (mapping.hasInternetPermission(packageManager)) {
+                b.wgIncludeAppListApkLabelTv.alpha = 1f
+                b.wgIncludeAppListApkIconIv.alpha = 1f
+            } else {
+                b.wgIncludeAppListApkLabelTv.alpha = 0.4f
+                b.wgIncludeAppListApkIconIv.alpha = 0.4f
+            }
             setupClickListeners(mapping, isIncluded)
         }
 

diff --git a/app/src/main/java/com/celzero/bravedns/database/ProxyApplicationMapping.kt b/app/src/main/java/com/celzero/bravedns/database/ProxyApplicationMapping.kt
@@ -15,6 +15,8 @@
  */
 package com.celzero.bravedns.database
 
+import android.Manifest
+import android.content.pm.PackageManager
 import androidx.room.Entity
 
 @Entity(tableName = "ProxyApplicationMapping", primaryKeys = ["uid", "packageName", "proxyId"])
@@ -55,4 +57,14 @@ class ProxyApplicationMapping {
         this.isActive = isActive
         this.proxyId = proxyId
     }
+
+    fun hasInternetPermission(packageManager: PackageManager): Boolean {
+        if (packageName.startsWith("no_package_")) return true
+
+        // INTERNET permission if defined, can not be denied so this is safe to use
+        return packageManager.checkPermission(
+            Manifest.permission.INTERNET,
+            packageName
+        ) == PackageManager.PERMISSION_GRANTED
+    }
 }