From 66688031cd5ddcddead3876d4e49beae3b7e51a8 Mon Sep 17 00:00:00 2001
From: Denozordec <shatskiy.blog@gmail.com>
Date: Sat, 10 Oct 2026 09:20:28 +0700
Subject: [PATCH] android: small cleanups - DB close in finally, single profile
 reload

- HomeViewModel closes the profile database in finally blocks and relies
  on the VPN_PROFILES_CHANGED broadcast instead of reloading twice
- READ_EXTERNAL_STORAGE only up to API 32; drop a dead settings flag

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../android/app/src/main/AndroidManifest.xml  |  3 +-
 .../android/ui/compose/HomeViewModel.kt       | 33 ++++++++++++++-----
 .../android/ui/compose/SettingsScreen.kt      |  2 --
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/frontends/android/app/src/main/AndroidManifest.xml b/src/frontends/android/app/src/main/AndroidManifest.xml
index db6b85a0a..f8c10d2dd 100644
--- a/src/frontends/android/app/src/main/AndroidManifest.xml
+++ b/src/frontends/android/app/src/main/AndroidManifest.xml
@@ -39,7 +39,8 @@
     <!-- required to claim update ownership (setRequestUpdateOwnership) so our
          own updates keep being applied silently on Android 14+ -->
     <uses-permission android:name="android.permission.ENFORCE_UPDATE_OWNERSHIP" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <!-- Required to reliably schedule NAT keepalives/rekeyings via the AlarmManager.
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/compose/HomeViewModel.kt b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/compose/HomeViewModel.kt
index a05f47cd4..5658942fd 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/compose/HomeViewModel.kt
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/compose/HomeViewModel.kt
@@ -380,12 +380,18 @@ class HomeViewModel(app: Application) : AndroidViewModel(app), VpnStateService.V
 		viewModelScope.launch(Dispatchers.IO) {
 			val source = VpnProfileSource(getApplication())
 			source.open()
-			source.deleteVpnProfile(profile)
-			source.close()
+			try
+			{
+				source.deleteVpnProfile(profile)
+			}
+			finally
+			{
+				source.close()
+			}
 			val intent = Intent(Constants.VPN_PROFILES_CHANGED)
 			intent.putExtra(Constants.VPN_PROFILES_MULTIPLE, arrayOf(profile.getUUID().toString()))
+			/* the broadcast reaches profilesChanged, which reloads the list */
 			LocalBroadcastManager.getInstance(getApplication()).sendBroadcast(intent)
-			reloadProfiles()
 		}
 	}
 
@@ -395,11 +401,16 @@ class HomeViewModel(app: Application) : AndroidViewModel(app), VpnStateService.V
 		viewModelScope.launch(Dispatchers.IO) {
 			val source = VpnProfileSource(getApplication())
 			source.open()
-			source.insertProfile(profile)
-			source.close()
+			try
+			{
+				source.insertProfile(profile)
+			}
+			finally
+			{
+				source.close()
+			}
 			val intent = Intent(Constants.VPN_PROFILES_CHANGED)
 			LocalBroadcastManager.getInstance(getApplication()).sendBroadcast(intent)
-			reloadProfiles()
 		}
 	}
 
@@ -434,8 +445,14 @@ class HomeViewModel(app: Application) : AndroidViewModel(app), VpnStateService.V
 		viewModelScope.launch(Dispatchers.IO) {
 			val source = VpnProfileSource(getApplication())
 			source.open()
-			val all = source.allVpnProfiles.sortedBy { it.name?.lowercase() ?: "" }
-			source.close()
+			val all = try
+			{
+				source.allVpnProfiles.sortedBy { it.name?.lowercase() ?: "" }
+			}
+			finally
+			{
+				source.close()
+			}
 			_ui.update { state ->
 				val selected = all.firstOrNull { it.getUUID() == state.selected?.getUUID() }
 					?: all.firstOrNull { it.getUUID() == state.activeProfile?.getUUID() }
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/compose/SettingsScreen.kt b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/compose/SettingsScreen.kt
index e5179f0d2..20dc9bce3 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/compose/SettingsScreen.kt
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/compose/SettingsScreen.kt
@@ -240,7 +240,6 @@ fun SettingsScreen(profiles: List<VpnProfile>, showTitle: Boolean = true)
 			ShxSection(title = stringResource(R.string.settings_page_appearance))
 			{
 				ThemeModeRow()
-				var addedRow = false
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
 				{
 					var dynamicColors by remember { ShxThemeSettings.load(context); mutableStateOf(ShxThemeSettings.useDynamicColors.value) }
@@ -254,7 +253,6 @@ fun SettingsScreen(profiles: List<VpnProfile>, showTitle: Boolean = true)
 							ShxThemeSettings.setUseDynamicColors(context, it)
 						},
 					)
-					addedRow = true
 				}
 			}
 		}