From: Soren Stoutner Date: Sat, 14 Mar 2026 21:18:43 +0000 (-0700) Subject: Fix a crash when there is no default Voice SIM. https://redmine.stoutner.com/issues... X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=HEAD;p=PrivacyCell.git Fix a crash when there is no default Voice SIM. https://redmine.stoutner.com/issues/1298 --- diff --git a/app/build.gradle b/app/build.gradle index 20acc32..010af9f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2021-2025 Soren Stoutner + * SPDX-FileCopyrightText: 2021-2026 Soren Stoutner * * This file is part of Privacy Cell . * @@ -19,7 +19,6 @@ plugins { id 'com.android.application' - id 'kotlin-android' } android { @@ -64,15 +63,15 @@ android { dependencies { // Include the following AndroidX libraries. implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'androidx.core:core-ktx:1.17.0' + implementation 'androidx.core:core-ktx:1.18.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0' implementation 'androidx.webkit:webkit:1.15.0' - implementation 'androidx.work:work-runtime-ktx:2.11.0' + implementation 'androidx.work:work-runtime-ktx:2.11.1' // Include the Kotlin standard library. This should be the same version number listed in the project build.gradle. - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.10' // Include the Google material library. implementation 'com.google.android.material:material:1.13.0' diff --git a/app/src/main/assets/de/changelog.html b/app/src/main/assets/de/changelog.html index 0a5cfa7..0ef18c5 100644 --- a/app/src/main/assets/de/changelog.html +++ b/app/src/main/assets/de/changelog.html @@ -33,7 +33,7 @@

1.12 (Code-Version 14)

22. Dezember 2025 - Mindest-API 30, Ziel-API 36

Ziel-API auf 36 (Android 16) angehoben. Dies bringt u.A. ein groÃes Icon fÃ¼r erweiterte Benachrichtigungen mit sich.
Farbe des zusÃ¤tzlichen Netzwerk-Info-Texts entspricht jetzt immer jener des Netzwerk-Info-Texts.

1.12 (version code 14)

22 December 2025 - minimum API 30, target API 36

Bump the target API to 36 (Android 16), adding a large icon to the expanded notifications.
Make the additional network info text color always match the data network text color.

1.12 (versiÃ³n del cÃ³digo 14)

22 de diciembre de 2025 - API mÃnimo 30, API objetivo 36

Aumentar la API objetivo a 36 (Android 16), y aÃ±adir un icono grande a las notificaciones expandidas.
Hacer que el color del texto de la informaciÃ³n adicional de la red coincida siempre con el color del texto de la red de datos.

1.12 (version du code 14)

22 DÃ©cembre 2025 - API minimale : 30, API optimale : 36

Bump the target API to 36 (Android 16), adding a large icon to the expanded notifications.
Make the additional network info text color always match the data network text color.

1.12 (versione codice 14)

22 Dicembre 2025 - minima API 30, target API 36

Spostamento della target API a 36 (Android 16), aggiungendo una icona grande nelle notifiche espanse.
Modifica per far sÃ¬ che il colore del testo delle info aggiuntive sulla rete sia sempre uguale al colore del testo della rete dati.

1.12 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 14)

Ð¦ÐµÐ»ÐµÐ²Ð¾Ð¹ API Ð¿Ð¾Ð²ÑÑÐµÐ½ Ð´Ð¾ 36 (Android 16), Ð² ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð½ÑÐµ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð±Ð¾Ð»ÑÑÐ°Ñ Ð¸ÐºÐ¾Ð½ÐºÐ°.
ÐÑÐµÐ´ÑÑÐ¼Ð¾ÑÑÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ²ÐµÑÐ° ÑÐµÐºÑÑÐ° Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾Ð¹ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾ ÑÐµÑÐ¸ Ð² ÑÐ¾Ð²ÐµÑÑÐºÐ¾Ð¼ Ñ ÑÐ²ÐµÑÐ¾Ð¼ ÑÐµÐºÑÑÐ° Ð¾ ÑÐµÑÐ¸ Ð¿ÐµÑÐµÐ´Ð°ÑÐ¸ Ð´Ð°Ð½Ð½ÑÑ.

+ * SPDX-FileCopyrightText: 2021-2022, 2025-2026 Soren Stoutner * * This file is part of Privacy Cell . * @@ -186,8 +186,9 @@ class PrivacyCellActivity : AppCompatActivity(), NavigationView.OnNavigationItem // Create the voice subscription info string. var voiceSubscriptionInfoString = "" - // Populate the voice carrier info string if the appropriate permission has been granted. - if (ActivityCompat.checkSelfPermission(applicationContext, Manifest.permission.READ_PHONE_NUMBERS) == PackageManager.PERMISSION_GRANTED) { + // Populate the voice carrier info string if the subscription ID is valid and the appropriate permission has been granted. + if ((voiceSubscriptionId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) && + (ActivityCompat.checkSelfPermission(applicationContext, Manifest.permission.READ_PHONE_NUMBERS) == PackageManager.PERMISSION_GRANTED)) { // Populate the voice carrier info string. The deprecated command must be used until the API >= 33. voiceSubscriptionInfoString = if (Build.VERSION.SDK_INT <= 32) "${subscriptionManager.getActiveSubscriptionInfo(voiceSubscriptionId).carrierName} â ${subscriptionManager.getActiveSubscriptionInfo(voiceSubscriptionId).number}" @@ -269,7 +270,8 @@ class PrivacyCellActivity : AppCompatActivity(), NavigationView.OnNavigationItem var dataSubscriptionInfoString = "" // Populate the data carrier info string if the appropriate permission has been granted. - if (ActivityCompat.checkSelfPermission(applicationContext, Manifest.permission.READ_PHONE_NUMBERS) == PackageManager.PERMISSION_GRANTED) { + if ((dataSubscriptionId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) && + (ActivityCompat.checkSelfPermission(applicationContext, Manifest.permission.READ_PHONE_NUMBERS) == PackageManager.PERMISSION_GRANTED)) { // Populate the data carrier info string. The deprecated command must be used until the API >= 33. dataSubscriptionInfoString = if (Build.VERSION.SDK_INT <= 32) "${subscriptionManager.getActiveSubscriptionInfo(dataSubscriptionId).carrierName} â ${subscriptionManager.getActiveSubscriptionInfo(dataSubscriptionId).number}" diff --git a/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt b/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt index c989e3c..f945b0f 100644 --- a/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt +++ b/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt @@ -145,6 +145,9 @@ class RealtimeMonitoringService : Service() { // Set the notification icon. notificationBuilder.setSmallIcon(R.drawable.antiquated_notification_enabled) + // Set the large icon. + notificationBuilder.setLargeIcon(Icon.createWithResource(this, R.drawable.antiquated)) + // Set the color. notificationBuilder.setColor(getColor(R.color.red_notification_icon)) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a1e31f1..30c3091 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -139,8 +139,7 @@ Benachrichtigung Ã¼ber unsicheres Netzwerk Benachrichtigung Ã¼ber veraltetes Netzwerk 3G als veraltet ansehen - 3G-Protokolle als veraltet ansehen. Zu einem spÃ¤teren Zeitpunkt wird dies zur Standard-Einstellung werden. - Das Ãndern dieser Einstellung startet Privacy Cell neu. + 3G-Protokolle als veraltet ansehen. Das Ãndern dieser Einstellung startet Privacy Cell neu. Anschluss Anwendungs-Leiste unten Zeigt die Anwendungs-Leiste am unteren Bildschirmrand an. Nach Ãndern dieser Einstellung wird Privacy Cell neu gestartet. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e99105c..9aa1764 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -139,8 +139,7 @@ NotificaciÃ³n de red insegura NotificaciÃ³n de red obsoleta Considera obsoleto 3G - Considera los protocolos 3G como obsoletos. En un futuro esto se convertirÃ¡ en el valor por defecto. - Al cambiar esta configuraciÃ³n se reiniciarÃ¡ Privacy Cell. + Considera los protocolos 3G como obsoletos. Al cambiar esta configuraciÃ³n se reiniciarÃ¡ Privacy Cell. Interfaz Barra inferior de app Mueve la barra de aplicaciones a la parte inferior de la pantalla. Al cambiar esta configuraciÃ³n se reiniciarÃ¡ Privacy Cell. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0bf82cc..6751fc5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -140,7 +140,7 @@ Notification de rÃ©seau non sÃ©curisÃ© Notification de rÃ©seau obsolÃ¨te ConsidÃ©rer la 3G comme obsolÃ¨te - ConsidÃ©rez les protocoles 3G comme dÃ©suets. A l\'avenir, cela deviendra la valeur par dÃ©faut. Changer ce paramÃ¨tre redÃ©marrera Privacy Cell. + ConsidÃ©rez les protocoles 3G comme dÃ©suets. Changer ce paramÃ¨tre redÃ©marrera Privacy Cell. Interface Barre d\'apps infÃ©rieure DÃ©placer la barre d\'apps en bas de l\'Ã©cran. Changer ce paramÃ¨tre redÃ©marrera Privacy Cell. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 76f0af4..11deb9a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -139,8 +139,7 @@ Notifica di rete insicura Notifiche di Rete Antiquata Considera il 3G come antiquato - Considera il protocollo 3G come antiquato. Ad un certo punto in futuro questa impostazione sarÃ quella di default. - La modifica di questa impostazione provocherÃ il riavvio di Privacy Cell. + Considera il protocollo 3G come antiquato. La modifica di questa impostazione provocherÃ il riavvio di Privacy Cell. Interfaccia Barra dell\'app in basso Sposta la barra dell\'app nella parte inferiore dello schermo. La modifica di questa impostazione provoca il riavvio di Privacy Cell. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 373734b..ff61a41 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -137,7 +137,7 @@ Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð¾ Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð¹ ÑÐµÑÐ¸ ÐÐ¿Ð¾Ð²ÐµÑÐµÐ½Ð¸Ðµ Ð¾Ð± ÑÑÑÐ°ÑÐµÐ²ÑÐµÐ¹ ÑÐµÑÐ¸ Ð¡ÑÐ¸ÑÐ°ÑÑ 3G ÑÑÑÐ°ÑÐµÐ²ÑÐµÐ¹ - Ð¡ÑÐ¸ÑÐ°ÑÑ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ñ 3G ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ð¼Ð¸. Ð Ð±ÑÐ´ÑÑÐµÐ¼ ÑÑÐ¾ ÑÑÐ°Ð½ÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¾Ð¹ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ. ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð¹ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÐºÑ Privacy Cell. + Ð¡ÑÐ¸ÑÐ°ÑÑ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ñ 3G ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ð¼Ð¸. ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð¹ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÐºÑ Privacy Cell. ÐÐ½ÑÐµÑÑÐµÐ¹Ñ ÐÐ°Ð½ÐµÐ»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð²Ð½Ð¸Ð·Ñ ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð² Ð½Ð¸Ð¶Ð½ÑÑ ÑÐ°ÑÑÑ ÑÐºÑÐ°Ð½Ð°. ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð¹ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÐºÑ Privacy Cell. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 28bf741..bddab5f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -141,7 +141,7 @@ Insecure network notification Antiquated network notification Consider 3G antiquated - Consider the 3G protocols to be antiquated. At a future point this will become the default. Changing this setting will restart Privacy Cell. + Consider the 3G protocols to be antiquated. Changing this setting will restart Privacy Cell. Interface Bottom app bar Move the app bar to the bottom of the screen. Changing this setting will restart Privacy Cell. diff --git a/build.gradle b/build.gradle index d5a62b2..873e2ab 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2021-2025 Soren Stoutner + * SPDX-FileCopyrightText: 2021-2026 Soren Stoutner * * This file is part of Privacy Cell . * @@ -25,8 +25,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0" + classpath 'com.android.tools.build:gradle:9.1.0' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.10' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 558489c..25f0555 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2023, 2025 Soren Stoutner +# SPDX-FileCopyrightText: 2023, 2025-2026 Soren Stoutner # # This file is part of Privacy Cell . # @@ -17,7 +17,7 @@ # this program. If not, see . distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME

1.12 (Code-Version 14)

1.12 (version code 14)

1.12 (versiÃ³n del cÃ³digo 14)

1.12 (version du code 14)

1.12 (versione codice 14)

1.12 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 14)

1.12 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 14)