From c8893805296e71409a3c7f37a09e083edbb23eaf Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 1 Jan 2025 10:33:33 -0700 Subject: [PATCH] Fix crash if third-party apps are not installed. https://redmine.stoutner.com/issues/1254 --- COPYING | 3 ++- app/src/main/assets/de/about_changelog.html | 2 +- app/src/main/assets/de/about_licenses.html | 26 +++++++++--------- app/src/main/assets/en/about_changelog.html | 2 +- app/src/main/assets/en/about_licenses.html | 25 ++++++++--------- app/src/main/assets/es/about_changelog.html | 2 +- app/src/main/assets/es/about_licenses.html | 27 ++++++++++--------- app/src/main/assets/fr/about_changelog.html | 2 +- app/src/main/assets/fr/about_licenses.html | 25 ++++++++--------- app/src/main/assets/it/about_changelog.html | 2 +- app/src/main/assets/it/about_licenses.html | 25 ++++++++--------- .../main/assets/pt-rBR/about_changelog.html | 2 +- .../main/assets/pt-rBR/about_licenses.html | 25 ++++++++--------- app/src/main/assets/ru/about_changelog.html | 2 +- app/src/main/assets/ru/about_licenses.html | 25 ++++++++--------- app/src/main/assets/tr/about_changelog.html | 2 +- app/src/main/assets/tr/about_licenses.html | 25 ++++++++--------- .../main/assets/zh-rCN/about_changelog.html | 2 +- .../main/assets/zh-rCN/about_licenses.html | 25 ++++++++--------- .../activities/AboutActivity.kt | 26 +++++++++--------- .../activities/ImportExportActivity.kt | 13 ++++++--- .../fragments/AboutVersionFragment.kt | 22 +++++++++++---- 22 files changed, 169 insertions(+), 141 deletions(-) diff --git a/COPYING b/COPYING index b7227ff6..0ff468bf 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,5 @@ -Privacy Browser Android copyright 2015-2024 Soren Stoutner . +SPDX-License-Identifier: GPL-3.0-or-later +SPDX-FileCopyrightText: 2016-2025 Soren Stoutner This file is part of Privacy Browser Android . diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index c1a9dcc1..83ccd3db 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -34,7 +34,7 @@

3.19 (Code-Version 76)

31. Dezember 2024 - Mindest-API 26, Ziel-API 35

Option hinzugefÃ¼gt, um Lesezeichen alphabetisch zu sortieren.
Optionen fÃ¼r "Nach oben bewegen" und "Nach unten bewegen" von Lesezeichen hinzugefÃ¼gt.

. --> @@ -34,7 +34,7 @@

Copyright:

Lizenz:

Privacy Browser ist verÃ¶ffentlicht unter der GPLv3+ Lizenz. The full text of the license is below. diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html index 0f2a7767..6cc5e578 100644 --- a/app/src/main/assets/en/about_changelog.html +++ b/app/src/main/assets/en/about_changelog.html @@ -30,7 +30,7 @@

3.19 (version code 76)

31 December 2024 - minimum API 26, target API 35

Add an option to sort bookmarks alphabetically.
Add "move to top" and "move to bottom" options for bookmarks.

. --> @@ -30,7 +31,7 @@

Copyright

License

Privacy Browser is released under the GPLv3+ license. The full text of the license is below. diff --git a/app/src/main/assets/es/about_changelog.html b/app/src/main/assets/es/about_changelog.html index e8b3bf61..d5e2fa96 100644 --- a/app/src/main/assets/es/about_changelog.html +++ b/app/src/main/assets/es/about_changelog.html @@ -32,7 +32,7 @@

3.19 (cÃ³digo de versiÃ³n 76)

31 de diciembre de 2024 - API mÃnimo 26, API objetivo 35

AÃ±adir una opciÃ³n para ordenar los favoritos alfabÃ©ticamente.
AÃ±adir las opciones "mover arriba" y "mover abajo" para los favoritos.

. --> @@ -32,7 +33,7 @@

Derechos de autor

Navegador Privado tiene derechos de autor 2015-2024 por Soren Stoutner.

Navegador Privado tiene derechos de autor 2015-2025 por Soren Stoutner.

Licencia

Navegador Privado estÃ¡ liberado bajo la licencia GPLv3+. diff --git a/app/src/main/assets/fr/about_changelog.html b/app/src/main/assets/fr/about_changelog.html index db37f379..5b239d2c 100644 --- a/app/src/main/assets/fr/about_changelog.html +++ b/app/src/main/assets/fr/about_changelog.html @@ -32,7 +32,7 @@

3.19 (version du code 76)

31 DÃ©cembre 2024 - API minimale : 26, API optimale : 35

Ajout d'une option pour trier les favoris par ordre alphabÃ©tique.
Ajout des options "dÃ©placer en haut" et "dÃ©placer en bas" pour les favoris.

. --> @@ -32,7 +33,7 @@

Copyright

Licence

rivacy Browser est publiÃ© sous la licence GPLv3+. Le texte complet de la licence est ci-dessous. diff --git a/app/src/main/assets/it/about_changelog.html b/app/src/main/assets/it/about_changelog.html index d5c47c75..ea5ac49f 100644 --- a/app/src/main/assets/it/about_changelog.html +++ b/app/src/main/assets/it/about_changelog.html @@ -32,7 +32,7 @@

3.19 (versione codice 76)

31 Dicembre 2024 - minima API 26, target API 35

Add an option to sort bookmarks alphabetically.
Add "move to top" and "move to bottom" options for bookmarks.

. --> @@ -32,7 +33,7 @@

Copyright

Licenza

Privacy Browser Ã¨ rilasciato con Licenza GPLv3+ . diff --git a/app/src/main/assets/pt-rBR/about_changelog.html b/app/src/main/assets/pt-rBR/about_changelog.html index 710c277f..37287880 100644 --- a/app/src/main/assets/pt-rBR/about_changelog.html +++ b/app/src/main/assets/pt-rBR/about_changelog.html @@ -32,7 +32,7 @@

3.19 (cÃ³digo de versÃ£o 76)

31 de dezembro de 2024 - minimum API 26, target API 35

Add an option to sort bookmarks alphabetically.
Add "move to top" and "move to bottom" options for bookmarks.

. --> @@ -32,7 +33,7 @@

Copyright

License

Privacy Browser is released under the GPLv3+ license. The full text of the license is below. diff --git a/app/src/main/assets/ru/about_changelog.html b/app/src/main/assets/ru/about_changelog.html index 3ac1cf6c..b064444e 100644 --- a/app/src/main/assets/ru/about_changelog.html +++ b/app/src/main/assets/ru/about_changelog.html @@ -30,7 +30,7 @@

3.19 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 76)

ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ¸ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº Ð² Ð°Ð»ÑÐ°Ð²Ð¸ÑÐ½Ð¾Ð¼ Ð¿Ð¾ÑÑÐ´ÐºÐµ.
ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ Ð¿ÐµÑÐµÐ¼ÐµÑÐ°ÑÑ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸ Ð²Ð²ÐµÑÑ Ð¸ Ð²Ð½Ð¸Ð·".

. --> @@ -30,7 +31,7 @@

ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð°

ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð° Privacy Browser 2015-2024 Soren Stoutner.

ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð° Privacy Browser 2015-2025 Soren Stoutner.

ÐÐ¸ÑÐµÐ½Ð·Ð¸Ñ

Privacy Browser Ð²ÑÐ¿ÑÑÐµÐ½ Ð¿Ð¾Ð´ Ð»Ð¸ÑÐµÐ½Ð·Ð¸ÐµÐ¹ GPLv3+. ÐÐ¾Ð»Ð½ÑÐ¹ ÑÐµÐºÑÑ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÐ½ Ð½Ð¸Ð¶Ðµ. diff --git a/app/src/main/assets/tr/about_changelog.html b/app/src/main/assets/tr/about_changelog.html index f2f2e6d5..981960a2 100644 --- a/app/src/main/assets/tr/about_changelog.html +++ b/app/src/main/assets/tr/about_changelog.html @@ -30,7 +30,7 @@

3.19 (version code 76)

31 AralÄ±k 2024 - minimum API 26, target API 35

Add an option to sort bookmarks alphabetically.
Add "move to top" and "move to bottom" options for bookmarks.

. --> @@ -30,7 +31,7 @@

Telif HakkÄ±

Privacy Browser telif hakkÄ± 2015-2024 Soren Stoutner.

Privacy Browser telif hakkÄ± 2015-2025 Soren Stoutner.

Lisans

Privacy Browser GPLv3+ lisansÄ± altÄ±nda yayÄ±nlandÄ±. LisansÄ±n tam metni aÅaÄÄ±dadÄ±r. diff --git a/app/src/main/assets/zh-rCN/about_changelog.html b/app/src/main/assets/zh-rCN/about_changelog.html index 44b5ad59..04da575e 100644 --- a/app/src/main/assets/zh-rCN/about_changelog.html +++ b/app/src/main/assets/zh-rCN/about_changelog.html @@ -32,7 +32,7 @@

3.19 (version code 76)

31 December 2024 - æä½æ¯æAPI 26, æé«æ¯æAPI 35

Add an option to sort bookmarks alphabetically.
Add "move to top" and "move to bottom" options for bookmarks.

. --> @@ -32,7 +33,7 @@

Copyright

è¯ä¹¦

Privacy BrowseråºäºGPLv3+ licenseåå¸ã diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.kt index bd2a837d..85e05191 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/AboutActivity.kt @@ -1,20 +1,20 @@ -/* - * Copyright 2016-2023 Soren Stoutner . +/* SPDX-License-Identifier: GPL-3.0-or-later + * SPDX-FileCopyrightText: 2016-2023 Soren Stoutner * - * This file is part of Privacy Browser Android . + * This file is part of Privacy Browser Android . * - * Privacy Browser Android is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation, either version 3 of the License, or (at your option) any later + * version. * - * Privacy Browser Android is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with Privacy Browser Android. If not, see . + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ package com.stoutner.privacybrowser.activities diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt index f0b89d98..62b46a82 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2018-2024 Soren Stoutner + * SPDX-FileCopyrightText: 2018-2025 Soren Stoutner * * This file is part of Privacy Browser Android . * @@ -20,6 +20,7 @@ package com.stoutner.privacybrowser.activities import android.content.Intent +import android.content.pm.PackageManager import android.net.Uri import android.os.Bundle import android.os.Handler @@ -235,8 +236,14 @@ class ImportExportActivity : AppCompatActivity() { // Display the home arrow on the support action bar. actionBar.setDisplayHomeAsUpEnabled(true) - // Find out if OpenKeychain is installed. If the safe call (`?.`) is null, the Elvis operator (`?"`) returns the following value instead, which is `false`. - openKeychainInstalled = packageManager.getPackageInfo("org.sufficientlysecure.keychain", 0).versionName?.isNotEmpty() ?: false + // Find out if OpenKeychain is installed. + openKeychainInstalled = try { + // If the safe call (`?.`) is null, the Elvis operator (`?"`) returns the following value instead, which is `false`. + packageManager.getPackageInfo("org.sufficientlysecure.keychain", 0).versionName?.isNotEmpty() ?: false + } catch (exception: PackageManager.NameNotFoundException) { + // The package is not installed + false + } // Get handles for the views. scrollView = findViewById(R.id.scrollview) diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt index ad884b81..64a7dda4 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2016-2024 Soren Stoutner + * SPDX-FileCopyrightText: 2016-2025 Soren Stoutner * * This file is part of Privacy Browser Android . * @@ -397,8 +397,14 @@ class AboutVersionFragment : Fragment() { val webViewPackageName = webViewPackageInfo.packageName val webViewVersion = webViewPackageInfo.versionName - // Get the Orbot version name if Orbot is installed. If the safe call (`?.`) is null, the Elvis operator (`?"`) returns the following value instead, which is an empty string. - val orbot: String = requireContext().packageManager.getPackageInfo("org.torproject.android", 0)?.versionName ?: "" + // Get the Orbot version name if Orbot is installed. + val orbot: String = try { + // If the safe call (`?.`) is null, the Elvis operator (`?"`) returns the following value instead, which is an empty string. + requireContext().packageManager.getPackageInfo("org.torproject.android", 0).versionName ?: "" + } catch (exception: PackageManager.NameNotFoundException) { + // Store an empty string. + "" + } // Get the I2P version name if I2P is installed. val i2p: String = try { @@ -414,8 +420,14 @@ class AboutVersionFragment : Fragment() { } } - // Get the OpenKeychain version name if it is installed. If the safe call (`?.`) is null, the Elvis operator (`?"`) returns the following value instead, which is an empty string. - val openKeychain: String = requireContext().packageManager.getPackageInfo("org.sufficientlysecure.keychain", 0)?.versionName ?: "" + // Get the OpenKeychain version name if it is installed. + val openKeychain: String = try { + // If the safe call (`?.`) is null, the Elvis operator (`?"`) returns the following value instead, which is an empty string. + requireContext().packageManager.getPackageInfo("org.sufficientlysecure.keychain", 0).versionName ?: "" + } catch (exception: PackageManager.NameNotFoundException) { + // Store an empty string. + "" + } // Create a spannable string builder for the hardware and software text views that need multiple colors of text. val brandStringBuilder = SpannableStringBuilder(brandLabel + brand) -- 2.47.2

3.19 (Code-Version 76)

Copyright:

Lizenz:

3.19 (version code 76)

Copyright

License

3.19 (cÃ³digo de versiÃ³n 76)

Derechos de autor

Licencia

3.19 (version du code 76)

Copyright

Licence

3.19 (versione codice 76)

Copyright

Licenza

3.19 (cÃ³digo de versÃ£o 76)

Copyright

License

3.19 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 76)

ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð°

ÐÐ¸ÑÐµÐ½Ð·Ð¸Ñ

3.19 (version code 76)

Telif HakkÄ±

Lisans

3.19 (version code 76)

Copyright

è¯ä¹¦

3.19 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 76)

ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð°

ÐÐ¸ÑÐµÐ½Ð·Ð¸Ñ

è¯ä¹¦