diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2025-05-05 15:45:38 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2025-05-05 16:09:58 +0200 |
| commit | d7242288bb11258d4d2088e526c3d87d68d8d92d (patch) | |
| tree | 290350a3bee5b5416b68e514f75a1980961fed90 /ui/src/main/java/com/wireguard | |
| parent | tools: bump wg-go (diff) | |
| download | wireguard-android-d7242288bb11258d4d2088e526c3d87d68d8d92d.tar.xz wireguard-android-d7242288bb11258d4d2088e526c3d87d68d8d92d.zip | |
gradle: target API 36
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/src/main/java/com/wireguard')
| -rw-r--r-- | ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt | 2 | ||||
| -rw-r--r-- | ui/src/main/java/com/wireguard/android/updater/Updater.kt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt index 1cd19934..4259e8e3 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt @@ -48,7 +48,7 @@ class AppListDialogFragment : DialogFragment() { val packageInfos = getPackagesHoldingPermissions(pm, arrayOf(Manifest.permission.INTERNET)) packageInfos.forEach { val packageName = it.packageName - val appInfo = it.applicationInfo + val appInfo = it.applicationInfo ?: return@forEach val appData = ApplicationData(appInfo.loadIcon(pm), appInfo.loadLabel(pm).toString(), packageName, currentlySelectedApps.contains(packageName)) applicationData.add(appData) diff --git a/ui/src/main/java/com/wireguard/android/updater/Updater.kt b/ui/src/main/java/com/wireguard/android/updater/Updater.kt index 651e3cd7..79e9bc0e 100644 --- a/ui/src/main/java/com/wireguard/android/updater/Updater.kt +++ b/ui/src/main/java/com/wireguard/android/updater/Updater.kt @@ -376,12 +376,12 @@ object Updater { if (installerIsGooglePlay(context)) return - if (!if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { + if (if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { @Suppress("DEPRECATION") context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS) } else { context.packageManager.getPackageInfo(context.packageName, PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS.toLong())) - }.requestedPermissions.contains(Manifest.permission.REQUEST_INSTALL_PACKAGES) + }.requestedPermissions?.contains(Manifest.permission.REQUEST_INSTALL_PACKAGES) != true ) { if (installer(context).isNotEmpty()) { updaterScope.launch { |