Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v2.9.8+908 #510

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## [2.9.8] - 2021-2-1
- Updated details of background permissions [#506](https://github.com/rokwire/safer-illinois-app/issues/506)
- Updated details of background permissions Explore Shibboleth login failure due to deleted UUID [#508](https://github.com/rokwire/safer-illinois-app/issues/508)

## [2.9.7] - 2021-1-26
- Updated order of panel shown during onboarding [#503](https://github.com/rokwire/safer-illinois-app/issues/503)
- Apply nextStepDate in local time when making the calculations for displayNextStepDate.
Expand Down
6 changes: 3 additions & 3 deletions assets/strings.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

"panel.onboarding.location.label.title": "Turn on Location Services",
"panel.onboarding.location.label.title.hint": "Header 1",
"panel.onboarding.location.label.description": "Required for exposure notifications to work on your phone",
"panel.onboarding.location.label.description": "Required for exposure notifications to work in the background on your phone",
"panel.onboarding.location.button.allow.title": "Enable Location Services",
"panel.onboarding.location.button.allow.hint": "",
"panel.onboarding.location.button.dont_allow.title": "Not right now",
Expand Down Expand Up @@ -415,7 +415,7 @@
"panel.health.onboarding.covid19.disclosure.label.content2": "2. Photos to allow a user to import their personal encryption key (QR code) into the app.",
"panel.health.onboarding.covid19.disclosure.label.content3": "3. Videos to allow a user to import their personal encryption key (QR code) into the app.",
"panel.health.onboarding.covid19.disclosure.label.content4": "4. Files (external storage read and write) to allow a user to import their personal encryption key (QR code) into the app.",
"panel.health.onboarding.covid19.disclosure.label.content5": "5. Location services on your device must be turned on to activate the Bluetooth low energy technology necessary for the exposure notification function of the Application. However, the Application does not access, collect, or store any location data, including GPS data. If location services on your device are turned off, the Application will perform the limited functions of storing and providing information about COVID-19 test results, any voluntarily reported symptoms, and building access status.",
"panel.health.onboarding.covid19.disclosure.label.content5": "5. Location services on your device must be turned on to activate the Bluetooth low energy technology necessary for the exposure notification function of the Application to work in the background. However, the Application does not access, collect, or store any location data, including GPS data. If location services on your device are turned off, the Application will perform the limited functions of storing and providing information about COVID-19 test results, any voluntarily reported symptoms, and building access status.",
"panel.health.onboarding.covid19.disclosure.label.description2": "YOUR INFORMATION AND HOW WE USE IT",
"panel.health.onboarding.covid19.disclosure.label.description3": "Information we need to provide you COVID-19 test results",
"panel.health.onboarding.covid19.disclosure.label.content8": "Name, email address, University ID number (UIN), phone number, and student registration information",
Expand All @@ -429,7 +429,7 @@
"panel.health.onboarding.covid19.disclosure.label.content13": " - WRITE_EXTERNAL_STORAGE",
"panel.health.onboarding.covid19.disclosure.label.content14": " - READ_EXTERNAL_STORAGE",
"panel.health.onboarding.covid19.disclosure.label.description8": "Opt-in exposure notification participation",
"panel.health.onboarding.covid19.disclosure.label.content18": "Your phone transmits and receives anonymous identifying numbers via Bluetooth. This identifier is stored on any phones that come close to you. If someone tests positive for COVID-19, their phone tells our servers the anonymous numbers they have sent for the last 14 days. Your phone will check if you were near that infected users' phone long enough to warrant an exposure notification. This is all done anonymously. Your location is never tracked or stored on our servers. The following permissions are used to enable this:",
"panel.health.onboarding.covid19.disclosure.label.content18": "Your phone transmits and receives anonymous identifying numbers via Bluetooth. This identifier is stored on any phones that come close to you. If someone tests positive for COVID-19, their phone tells our servers the anonymous numbers they have sent for the last 14 days. Your phone will check if you were near that infected users' phone long enough to warrant an exposure notification. This is all done anonymously. Your location is never tracked or stored on our servers. If you have elected to use Exposure Notification, Location Services, and Bluetooth, these capabilities will run in the background when the app is not in use. The following permissions are used to enable this:",
"panel.health.onboarding.covid19.disclosure.label.content19": " - BLUETOOTH",
"panel.health.onboarding.covid19.disclosure.label.content20": " - BLUETOOTH_ADMIN",
"panel.health.onboarding.covid19.disclosure.label.content21": " - LOCATION",
Expand Down
6 changes: 3 additions & 3 deletions assets/strings.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

"panel.onboarding.location.label.title": "Activar los servicios de ubicación",
"panel.onboarding.location.label.hint": "Encabezado 1",
"panel.onboarding.location.label.description": "Se requiere para que las notificaciones de exposición funcionen en su teléfono",
"panel.onboarding.location.label.description": "Se requiere para que las notificaciones de exposición funcionen en segundo plano en su teléfono",
"panel.onboarding.location.button.allow.title": "Servicio de localización activado",
"panel.onboarding.location.button.allow.hint": "",
"panel.onboarding.location.button.dont_allow.title": "No en este momento",
Expand Down Expand Up @@ -414,7 +414,7 @@
"panel.health.onboarding.covid19.disclosure.label.content2": "2. Photos to allow a user to import their personal encryption key (QR code) into the app.",
"panel.health.onboarding.covid19.disclosure.label.content3": "3. Videos to allow a user to import their personal encryption key (QR code) into the app.",
"panel.health.onboarding.covid19.disclosure.label.content4": "4. Files (external storage read and write) to allow a user to import their personal encryption key (QR code) into the app.",
"panel.health.onboarding.covid19.disclosure.label.content5": "5. Location services on your device must be turned on to activate the Bluetooth low energy technology necessary for the exposure notification function of the Application. However, the Application does not access, collect, or store any location data, including GPS data. If location services on your device are turned off, the Application will perform the limited functions of storing and providing information about COVID-19 test results, any voluntarily reported symptoms, and building access status.",
"panel.health.onboarding.covid19.disclosure.label.content5": "5. Location services on your device must be turned on to activate the Bluetooth low energy technology necessary for the exposure notification function of the Application to work in the background. However, the Application does not access, collect, or store any location data, including GPS data. If location services on your device are turned off, the Application will perform the limited functions of storing and providing information about COVID-19 test results, any voluntarily reported symptoms, and building access status.",
"panel.health.onboarding.covid19.disclosure.label.description2": "YOUR INFORMATION AND HOW WE USE IT",
"panel.health.onboarding.covid19.disclosure.label.description3": "Information we need to provide you COVID-19 test results",
"panel.health.onboarding.covid19.disclosure.label.content8": "Name, email address, University ID number (UIN), phone number, and student registration information",
Expand All @@ -428,7 +428,7 @@
"panel.health.onboarding.covid19.disclosure.label.content13": " - WRITE_EXTERNAL_STORAGE",
"panel.health.onboarding.covid19.disclosure.label.content14": " - READ_EXTERNAL_STORAGE",
"panel.health.onboarding.covid19.disclosure.label.description8": "Opt-in exposure notification participation",
"panel.health.onboarding.covid19.disclosure.label.content18": "Your phone transmits and receives anonymous identifying numbers via Bluetooth. This identifier is stored on any phones that come close to you. If someone tests positive for COVID-19, their phone tells our servers the anonymous numbers they have sent for the last 14 days. Your phone will check if you were near that infected users' phone long enough to warrant an exposure notification. This is all done anonymously. Your location is never tracked or stored on our servers. The following permissions are used to enable this:",
"panel.health.onboarding.covid19.disclosure.label.content18": "Your phone transmits and receives anonymous identifying numbers via Bluetooth. This identifier is stored on any phones that come close to you. If someone tests positive for COVID-19, their phone tells our servers the anonymous numbers they have sent for the last 14 days. Your phone will check if you were near that infected users' phone long enough to warrant an exposure notification. This is all done anonymously. Your location is never tracked or stored on our servers. If you have elected to use Exposure Notification, Location Services, and Bluetooth, these capabilities will run in the background when the app is not in use. The following permissions are used to enable this:",
"panel.health.onboarding.covid19.disclosure.label.content19": " - BLUETOOTH",
"panel.health.onboarding.covid19.disclosure.label.content20": " - BLUETOOTH_ADMIN",
"panel.health.onboarding.covid19.disclosure.label.content21": " - LOCATION",
Expand Down
4 changes: 2 additions & 2 deletions assets/strings.zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@
"panel.health.onboarding.covid19.disclosure.label.content2": "2. Photos to allow a user to import their personal encryption key (QR code) into the app.",
"panel.health.onboarding.covid19.disclosure.label.content3": "3. Videos to allow a user to import their personal encryption key (QR code) into the app.",
"panel.health.onboarding.covid19.disclosure.label.content4": "4. Files (external storage read and write) to allow a user to import their personal encryption key (QR code) into the app.",
"panel.health.onboarding.covid19.disclosure.label.content5": "5. Location services on your device must be turned on to activate the Bluetooth low energy technology necessary for the exposure notification function of the Application. However, the Application does not access, collect, or store any location data, including GPS data. If location services on your device are turned off, the Application will perform the limited functions of storing and providing information about COVID-19 test results, any voluntarily reported symptoms, and building access status.",
"panel.health.onboarding.covid19.disclosure.label.content5": "5. Location services on your device must be turned on to activate the Bluetooth low energy technology necessary for the exposure notification function of the Application to work in the background. However, the Application does not access, collect, or store any location data, including GPS data. If location services on your device are turned off, the Application will perform the limited functions of storing and providing information about COVID-19 test results, any voluntarily reported symptoms, and building access status.",
"panel.health.onboarding.covid19.disclosure.label.description2": "YOUR INFORMATION AND HOW WE USE IT",
"panel.health.onboarding.covid19.disclosure.label.description3": "Information we need to provide you COVID-19 test results",
"panel.health.onboarding.covid19.disclosure.label.content8": "Name, email address, University ID number (UIN), phone number, and student registration information",
Expand All @@ -428,7 +428,7 @@
"panel.health.onboarding.covid19.disclosure.label.content13": " - WRITE_EXTERNAL_STORAGE",
"panel.health.onboarding.covid19.disclosure.label.content14": " - READ_EXTERNAL_STORAGE",
"panel.health.onboarding.covid19.disclosure.label.description8": "Opt-in exposure notification participation",
"panel.health.onboarding.covid19.disclosure.label.content18": "Your phone transmits and receives anonymous identifying numbers via Bluetooth. This identifier is stored on any phones that come close to you. If someone tests positive for COVID-19, their phone tells our servers the anonymous numbers they have sent for the last 14 days. Your phone will check if you were near that infected users' phone long enough to warrant an exposure notification. This is all done anonymously. Your location is never tracked or stored on our servers. The following permissions are used to enable this:",
"panel.health.onboarding.covid19.disclosure.label.content18": "Your phone transmits and receives anonymous identifying numbers via Bluetooth. This identifier is stored on any phones that come close to you. If someone tests positive for COVID-19, their phone tells our servers the anonymous numbers they have sent for the last 14 days. Your phone will check if you were near that infected users' phone long enough to warrant an exposure notification. This is all done anonymously. Your location is never tracked or stored on our servers. If you have elected to use Exposure Notification, Location Services, and Bluetooth, these capabilities will run in the background when the app is not in use. The following permissions are used to enable this:",
"panel.health.onboarding.covid19.disclosure.label.content19": " - BLUETOOTH",
"panel.health.onboarding.covid19.disclosure.label.content20": " - BLUETOOTH_ADMIN",
"panel.health.onboarding.covid19.disclosure.label.content21": " - LOCATION",
Expand Down
18 changes: 11 additions & 7 deletions lib/service/Auth.dart
Original file line number Diff line number Diff line change
Expand Up @@ -605,17 +605,21 @@ class Auth with Service implements NotificationsListener {
return null;
}

Future<void> deleteUserPiiData() async {
Future<bool> deleteUserPiiData() async {
if (Config().userProfileUrl != null) {
String url = '${Config().userProfileUrl}/pii/${Storage().userPid}';

await Network().delete(url,
headers: {'Content-Type':'application/json'},
auth: NetworkAuth.User
).whenComplete((){
_applyUserPiiData(null, null);
});
try {
Response response = await Network().delete(url, headers: {'Content-Type': 'application/json'}, auth: NetworkAuth.User);
if(response?.statusCode == 200) {
_applyUserPiiData(null, null);
return true;
}
} catch(error){
Log.e(error);
}
}
return false;
}

void _applyUserPiiData(UserPiiData userPiiData, String userPiiDataString, [bool notify = true]) {
Expand Down
31 changes: 17 additions & 14 deletions lib/service/User.dart
Original file line number Diff line number Diff line change
Expand Up @@ -208,22 +208,25 @@ class User with Service implements NotificationsListener {
Future<void> deleteUser() async{
String userUuid = _userData?.uuid;
if((Config().userProfileUrl != null) && (userUuid != null)) {
await Network().delete("${Config().userProfileUrl}/$userUuid", headers: {"Accept": "application/json", "content-type": "application/json"}, auth: NetworkAuth.App);

_clearStoredUserData();
_notifyUserDeleted();

try {
_userData = await requestUser(Storage().localUserUuid);
} on UserNotFoundException catch (_) {
_userData = await _requestCreateUser();
if (_userData?.uuid != null) {
Storage().localUserUuid = _userData?.uuid;
}
await Network().delete("${Config().userProfileUrl}/$userUuid", headers: {"Accept": "application/json", "content-type": "application/json"}, auth: NetworkAuth.App);
}
if (_userData != null) {
Storage().userData = _userData;
_notifyUserUpdated();
finally {
_clearStoredUserData();
_notifyUserDeleted();

try {
_userData = await requestUser(Storage().localUserUuid);
} on UserNotFoundException catch (_) {
_userData = await _requestCreateUser();
if (_userData?.uuid != null) {
Storage().localUserUuid = _userData?.uuid;
}
}
if (_userData != null) {
Storage().userData = _userData;
_notifyUserUpdated();
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/ui/onboarding/OnboardingAuthLocationPanel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class OnboardingAuthLocationPanel extends StatelessWidget with OnboardingPanel {
child: Text(
Localization().getStringEx(
'panel.onboarding.location.label.description',
"Required for exposure notifications to work on your phone"),
"Required for exposure notifications to work in the background on your phone"),
textAlign: TextAlign.center,
style: TextStyle(
fontFamily: Styles().fontFamilies.regular,
Expand Down
Loading