Merge pull request #356 from ivpn/bugfix/network-protection-crash

Crash when Network Protection is engaged
ivpn · Aug 20, 2024 · 3858928 · 3858928
2 parents ceb73fd + b22bb59
commit 3858928
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -98,12 +98,15 @@
             android:exported="false"
             android:permission="android.permission.BIND_VPN_SERVICE"
             android:foregroundServiceType="specialUse" />
-        <service android:name="net.ivpn.core.vpn.local.WifiWatcherService"
-            android:exported="false"/>
+        <service
+            android:name="net.ivpn.core.vpn.local.WifiWatcherService"
+            android:exported="false"
+            android:foregroundServiceType="specialUse" />
 
         <service
             android:name="net.ivpn.core.vpn.AlwaysOnVpnService"
             android:exported="false"
+            android:foregroundServiceType="specialUse"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
@@ -126,6 +129,7 @@
             android:icon="@drawable/ic_logo_sq"
             android:label="@string/app_name"
             android:exported="true"
+            android:foregroundServiceType="specialUse"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />

diff --git a/site/src/main/AndroidManifest.xml b/site/src/main/AndroidManifest.xml
@@ -5,9 +5,12 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-    <!--    To close system dialog-->
+    <!-- To close system dialog-->
     <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
 
+    <!-- VPN <service> for API Level 34+ -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+
     <application
         android:name=".SiteIVPNApplication"
         android:allowBackup="false"
@@ -24,11 +27,13 @@
 
         <service
             android:name=".updates.UpdatesService"
+            android:foregroundServiceType="specialUse"
             android:exported="false" />
 
         <service
             android:name=".updates.UpdatesJobService"
             android:exported="false"
+            android:foregroundServiceType="specialUse"
             android:permission="android.permission.BIND_JOB_SERVICE" />
     </application>