From 1ce83bad844081a7f1d262ce3820b6ebfcb0c1db Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 20 Oct 2021 12:43:52 -0700 Subject: [PATCH] Fix a crash in realtime monitoring when the READ_PHONE_STATE permission is denied. https://redmine.stoutner.com/issues/771 --- app/src/main/assets/en/changelog.html | 4 +-- app/src/main/assets/es/changelog.html | 4 +-- app/src/main/assets/fr/changelog.html | 4 +-- app/src/main/assets/it/changelog.html | 4 +-- app/src/main/assets/ru/changelog.html | 4 +-- .../privacycell/fragments/SettingsFragment.kt | 24 ++++++++++---- .../services/RealtimeMonitoringService.kt | 31 ++++++++++++------- .../drawable/realtime_monitoring_ghosted.xml | 31 +++++++++++++++++++ app/src/main/res/values-night/colors.xml | 5 ++- app/src/main/res/values/colors.xml | 5 ++- 10 files changed, 87 insertions(+), 29 deletions(-) create mode 100644 app/src/main/res/drawable/realtime_monitoring_ghosted.xml diff --git a/app/src/main/assets/en/changelog.html b/app/src/main/assets/en/changelog.html index b87a407..206f5b5 100644 --- a/app/src/main/assets/en/changelog.html +++ b/app/src/main/assets/en/changelog.html @@ -27,8 +27,8 @@ -

1.4 (version code 5)

18 October 2021 - minimum API 30, target API 30.

1.4 (version code 5)

18 October 2021 - minimum API 30, target API 30.

Fix problems with realtime monitoring crashing or playing the wrong sound.
Add a logcat activity.

1.4 (versiÃ³n del cÃ³digo 5)

18 de octubre de 2021 - API mÃnimo 30, API objetivo 30.

1.4 (versiÃ³n del cÃ³digo 5)

18 de octubre de 2021 - API mÃnimo 30, API objetivo 30.

Solucionar los problemas de crash de la monitorizaciÃ³n en tiempo real o de reproducciÃ³n de un sonido incorrecto.

1.4 (version de code 5)

18 October 2021 - API minimum 30, API cible 30.

1.4 (version de code 5)

18 October 2021 - API minimum 30, API cible 30.

Fix problems with realtime monitoring crashing or playing the wrong sound.
Add a logcat activity.

1.4 (versione codice 5)

18 Ottobre 2021 - minima API 30, target API 30.

1.4 (versione codice 5)

18 Ottobre 2021 - minima API 30, target API 30.

Correzione di problemi relativi al monitoraggio in tempo reale che andava in crash or suonando il suono sbagliato.

1.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 5)

1.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 5)

Ð£ÑÑÑÐ°Ð½ÐµÐ½Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ, ÑÐ²ÑÐ·Ð°Ð½Ð½ÑÐµ ÑÐ¾ ÑÐ±Ð¾ÐµÐ¼ Ð¼Ð¾Ð½Ð¸ÑÐ¾ÑÐ¸Ð½Ð³Ð° Ð² ÑÐµÐ°Ð»ÑÐ½Ð¾Ð¼ Ð²ÑÐµÐ¼ÐµÐ½Ð¸ Ð¸Ð»Ð¸ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸ÐµÐ¼ Ð½ÐµÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾Ð³Ð¾ Ð·Ð²ÑÐºÐ°.

(getString(R.string.insecure_network_notification_key))!! bottomAppBarPreference = findPreference(getString(R.string.bottom_app_bar_key))!! - // Set the realtime monitoring preference icon. - if (sharedPreferences.getBoolean(getString(R.string.realtime_monitoring_key), false)) { - // Set the enabled icon. - realtimeMonitoringPreference.setIcon(R.drawable.realtime_monitoring_enabled) + // Only enable the realtime monitoring preference if the READ_PHONE_STATE permission has been granted. + realtimeMonitoringPreference.isEnabled = (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) + + // Set the realtime monitoring icon according to the status. + if (realtimeMonitoringPreference.isEnabled) { + // Set the realtime monitoring preference icon. + if (sharedPreferences.getBoolean(getString(R.string.realtime_monitoring_key), false)) { + // Set the enabled icon. + realtimeMonitoringPreference.setIcon(R.drawable.realtime_monitoring_enabled) + } else { + // Set the disabled icon. + realtimeMonitoringPreference.setIcon(R.drawable.realtime_monitoring_disabled) + } } else { - // Set the disabled icon. - realtimeMonitoringPreference.setIcon(R.drawable.realtime_monitoring_disabled) + // Set the ghosted icon. + realtimeMonitoringPreference.setIcon(R.drawable.realtime_monitoring_ghosted) } // Set the notification preferences to depend on the realtime monitoring preference. 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 681a3da..23e7278 100644 --- a/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt +++ b/app/src/main/java/com/stoutner/privacycell/services/RealtimeMonitoringService.kt @@ -19,6 +19,7 @@ package com.stoutner.privacycell.services +import android.Manifest import android.app.Notification import android.app.NotificationChannel import android.app.NotificationChannelGroup @@ -27,12 +28,14 @@ import android.app.PendingIntent import android.app.Service import android.content.Context import android.content.Intent +import android.content.pm.PackageManager import android.os.Binder import android.os.IBinder import android.telephony.PhoneStateListener import android.telephony.TelephonyDisplayInfo import android.telephony.TelephonyManager +import androidx.core.app.ActivityCompat import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager @@ -180,25 +183,31 @@ class RealtimeMonitoringService : Service() { } } - // Create a register realtime listener work request that fires every hour. For some reason, when the service launches it will initially register the listener and then unregister it. - // This periodic request will fire shortly thereafter (it fires about every hour near the beginning of the hour) and will reregister the listener, which will stick this time. - val registerRealtimeListenerWorkRequest = PeriodicWorkRequestBuilder(1, TimeUnit.HOURS).build() + // Check to see if the read phone state permission has been granted. + if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { + // Create a register realtime listener work request that fires every hour. + // This periodic request will fire shortly after being created (it fires about every hour near the beginning of the hour) and will reregister the listener if it gets garbage collected. + val registerRealtimeListenerWorkRequest = PeriodicWorkRequestBuilder(1, TimeUnit.HOURS).build() - // Register the realtime listener work request. - WorkManager.getInstance(this).enqueueUniquePeriodicWork(getString(R.string.register_listener_work_request), ExistingPeriodicWorkPolicy.REPLACE, registerRealtimeListenerWorkRequest) + // Register the realtime listener work request. + WorkManager.getInstance(this).enqueueUniquePeriodicWork(getString(R.string.register_listener_work_request), ExistingPeriodicWorkPolicy.REPLACE, registerRealtimeListenerWorkRequest) + } // Return a sticky service. return START_STICKY } fun registerTelephonyManagerListener() { - // Get a handle for the telephony manager. - val telephonyManager = getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager + // Check to see if the read phone state permission has been granted. + if (ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { + // Get a handle for the telephony manager. + val telephonyManager = getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager - // Cancel the current listener if it exists. - telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE) + // Cancel the current listener if it exists. + telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE) - // Listen for changes to the phone state. - telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED) + // Listen for changes to the phone state. + telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED) + } } } \ No newline at end of file diff --git a/app/src/main/res/drawable/realtime_monitoring_ghosted.xml b/app/src/main/res/drawable/realtime_monitoring_ghosted.xml new file mode 100644 index 0000000..9850b29 --- /dev/null +++ b/app/src/main/res/drawable/realtime_monitoring_ghosted.xml @@ -0,0 +1,31 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index fed68ea..3a15eb2 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -21,8 +21,9 @@ @color/violet_500 - @color/violet_500 @color/gray_500 + @color/violet_500 + @color/gray_700 @color/white @color/salmon @@ -33,8 +34,10 @@ #FF1976D2 #FF0D47A1 + #FFB7B7B7 #FF9E9E9E #FF757575 + #FF616161 #FF202020 #FFE53935 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 584c22d..95f9c46 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -21,8 +21,9 @@ @color/blue_700 - @color/blue_700 @color/gray_600 + @color/blue_700 + @color/gray_425 @color/gray_925 @color/red_700 @@ -33,8 +34,10 @@ #FF1976D2 #FF0D47A1 + #FFB7B7B7 #FF9E9E9E #FF757575 + #FF616161 #FF202020 #FFE53935 -- 2.45.2

1.4 (version code 5)

1.4 (version code 5)

1.4 (versiÃ³n del cÃ³digo 5)

1.4 (versiÃ³n del cÃ³digo 5)

1.4 (version de code 5)

1.4 (version de code 5)

1.4 (versione codice 5)

1.4 (versione codice 5)

1.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 5)

1.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 5)

1.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 5)

1.4 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 5)