Skip to content

Commit

Permalink
Merge pull request JohanDegraeve#461 from paulplant/ios17-calendar-up…
Browse files Browse the repository at this point in the history 
…dates

update project to work with new iOS17 EKEventStore requirements
  • Loading branch information
@JohanDegraeve
JohanDegraeve authored Sep 22, 2023
2 parents 1ab06a7 + 66f8fb3 commit 4e51c40
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 30 deletions.
2 changes: 1 addition & 1 deletion xdrip.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down
3 changes: 2 additions & 1 deletion xdrip/Storyboards/en.lproj/SettingsViews.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@
"settingsviews_displayTrendInCalendarEvent" = "Display Trend?";
"displayUnitInCalendarEvent" = "Display Unit?";
"displayDeltaInCalendarEvent" = "Display Delta?";
"infoCalendarAccessDeniedByUser" = "You previously denied access to your Calendar.\n\nTo enable it go to your device settings, privacy, calendars and enable it.";
"infoCalendarAccessDeniedByUser" = "You previously denied access to your calendars.\n\nGo to iPhone Settings > %@ > Calendars and enable full access.";
"infoCalendarAccessWriteOnly" = "You cannot use Calendar Events until you update the calendar access permission from 'Add Events Only' to 'Full Access'.\n\nGo to iPhone Settings > %@ > Calendars and select 'Full Access'.";
"infoCalendarAccessRestricted" = "You cannot give authorization to %@ to access your calendar. This is possibly due to active restrictions such as parental controls being in place.";
"settingsviews_CalenderIntervalTitle" = "Event Interval";
"settingsviews_CalenderIntervalMessage" = "Minimum interval between two calender events (mins)";
Expand Down
16 changes: 3 additions & 13 deletions xdrip/Storyboards/es.lproj/BluetoothPeripheralView.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@
"confirmDisconnectTitle" = "Confirmar Desconexión";
"confirmDisconnectMessage" = "Haz click en 'Desconectar' para confirmar que deseas desconectar el transmisor.";
"warmingUpUntil" = "Calentando hasta";

/////////////////////////////////////////////////////////////////////////////////////////////
///// Translation needed - remove this header after translation /////
/////////////////////////////////////////////////////////////////////////////////////////////

/// Dexcom bluetooth screen. Is another app used in parallel or not
"useOtherDexcomApp" = "Read from Dexcom app";

/// cell text, sensor start time
"sensorStartDate" = "Sensor Started";

/// cell text, transmitter start time
"transmittterStartDate" = "Transmitter Started";
"useOtherDexcomApp" = "Usar a la vez la app de Dexcom";
"sensorStartDate" = "Sensor iniciado";
"transmittterStartDate" = "Transmisor iniciado";
3 changes: 2 additions & 1 deletion xdrip/Storyboards/es.lproj/SettingsViews.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
"settingsviews_displayTrendInCalendarEvent" = "Mostrar Tendencia?";
"displayUnitInCalendarEvent" = "Mostrar Unidad?";
"displayDeltaInCalendarEvent" = "Mostrar Delta?";
"infoCalendarAccessDeniedByUser" = "Has denegado previamente permiso para acceder al calendario.\n\nPara habilitarlo de nuevo, ir a Configuración en tu iPhone, Privacidad, Calendarios y habilitarlo.";
"infoCalendarAccessDeniedByUser" = "Has denegado previamente permiso para acceder al calendario.\n\nIr a Configuración iPhone > %@ > Calendarios y habilitarlo.";
"infoCalendarAccessWriteOnly" = "No puedes usar Eventos de Calendario hasta que actualices los permisos de 'Sólo agregar eventos' a 'Acceso completo'.\n\nIr a Configuración iPhone > %@ > Calendarios y seleccionar 'Acceso completo'.";
"infoCalendarAccessRestricted" = "No se puede autorizar a que %@ tenga acceso a tu calendario. Podría ser debido a que restricciones tipo Controles Parentales o similares lo están impidiendo.";
"sectionTitleTrace" = "Rastrear/Issue Reporting";
"sendTraceFile" = "Enviar Archivo de Rastreo";
Expand Down
3 changes: 2 additions & 1 deletion xdrip/Storyboards/nl.lproj/SettingsViews.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@
"settingsviews_displayTrendInCalendarEvent" = "Toon Trend?";
"displayUnitInCalendarEvent" = "Toon Eenheid?";
"displayDeltaInCalendarEvent" = "Toon Delta?";
"infoCalendarAccessDeniedByUser" = "In het verleden heb je toegang geweigerd tot je Agenda.\n\nOm toestemming te geven, ga naar iPhone Instellingen, Privacy, Agenda's en schakel in.";
"infoCalendarAccessDeniedByUser" = "In het verleden heb je toegang geweigerd tot je Agenda.\n\nGa naar iPhone-instellingen > %@ > Agenda's en kies 'Volledige toegang'.";
"infoCalendarAccessWriteOnly" = "Je kunt Agenda Activiteiten niet gebruiken totdat je de Agenda-toegang hebt gewijzigd van 'Voeg alleen activiteiten toe' naar 'Volledige toegang'.\n\nGa naar iPhone-instellingen > %@ > Agenda's en kies 'Volledige toegang'.";
"infoCalendarAccessRestricted" = "Geen toegang voor %@ tot je agenda. Dit komt waarschijnlijk door actieve beperkingen zoals Ouderlijk Toezicht.";
"sectionTitleTrace" = "Probleemrapportage";
"sendTraceFile" = "Verstuur Probleemrapportage";
Expand Down
4 changes: 3 additions & 1 deletion xdrip/Supporting Files/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@
<string>Connect to CGM Transmitter and M5Stack</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>Connect to CGM Transmitter and M5Stack</string>
<key>NSCalendarsFullAccessUsageDescription</key>
<string>To create events with BG reading values, so that they can be viewed on Apple Watch and CarPlay</string>
<key>NSCalendarsUsageDescription</key>
<string>To create events with reading values as title, so that it can be viewed on Apple Watch</string>
<string>To create events with BG reading values, so that they can be viewed on Apple Watch and CarPlay</string>
<key>NSHealthShareUsageDescription</key>
<string>Store bloodglucose readings</string>
<key>NSHealthUpdateUsageDescription</key>
Expand Down
6 changes: 5 additions & 1 deletion xdrip/Texts/TextsSettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,11 @@ class Texts_SettingsView {
}()

static let infoCalendarAccessDeniedByUser: String = {
return NSLocalizedString("infoCalendarAccessDeniedByUser", tableName: filename, bundle: Bundle.main, value: "You previously denied access to your Calendar.\n\nTo enable it go to your device settings, privacy, calendars and enable it", comment: "If user has earlier denied access to calendar, and then tries to activate creation of events in calendar, this message will be shown")
return String(format: NSLocalizedString("infoCalendarAccessDeniedByUser", tableName: filename, bundle: Bundle.main, value: "You previously denied access to your calendars.\n\nGo to iPhone Settings > %@ > Calendars and enable full access.", comment: "If user has earlier denied access to calendar, and then tries to activate creation of events in calendar, this message will be shown"), ConstantsHomeView.applicationName)
}()

static let infoCalendarAccessWriteOnly: String = {
return String(format: NSLocalizedString("infoCalendarAccessWriteOnly", tableName: filename, bundle: Bundle.main, value: "You cannot use Calendar Events until you update the calendar access permission from 'Add Events Only' to 'Full Access'.\n\nGo to iPhone Settings > %@ > Calendars and select 'Full Access'.", comment: "The user needs to update their calendar permissions"), ConstantsHomeView.applicationName)
}()

static let infoCalendarAccessRestricted: String = {
Expand Down
51 changes: 40 additions & 11 deletions ...r/SettingsViewController/SettingsViewModels/SettingsViewAppleWatchSettingsViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ class SettingsViewAppleWatchSettingsViewModel: SettingsViewModelProtocol {
// by clicking row, show what it means to be restricted, according to Apple doc
return UITableViewCell.AccessoryType.disclosureIndicator

case .authorized:
case .writeOnly:
// by clicking row, show that the permission is restricted to Add Events Only instead of Full Access
return UITableViewCell.AccessoryType.disclosureIndicator

case .authorized, .fullAccess:
return UITableViewCell.AccessoryType.none

@unknown default:
Expand Down Expand Up @@ -162,34 +166,55 @@ class SettingsViewAppleWatchSettingsViewModel: SettingsViewModelProtocol {
}

// check authorization status
switch EKEventStore.authorizationStatus(for:.event) {
switch EKEventStore.authorizationStatus(for: .event) {

case .notDetermined:
self.eventStore.requestAccess(to: .event, completion:
{(granted: Bool, error: Error?) -> Void in
if #available(iOS 17.0, *) {
// if iOS17 then run the new access request method
// https://developer.apple.com/documentation/eventkit/accessing_calendar_using_eventkit_and_eventkitui#4250785
self.eventStore.requestFullAccessToEvents(completion:
{(granted: Bool, error: Error?) -> Void in
if !granted {
trace("in SettingsViewAppleWatchSettingsViewModel, EKEventStore access not granted", log: self.log, category: ConstantsLog.categoryRootView, type: .error)
UserDefaults.standard.createCalendarEvent = false
} else {
trace("in SettingsViewAppleWatchSettingsViewModel, EKEventStore access granted", log: self.log, category: ConstantsLog.categoryRootView, type: .info)
UserDefaults.standard.createCalendarEvent = true
}
})
})
} else {
// Fallback on earlier versions as .requestAccess() was deprecated in iOS17 and doesn't work anymore
self.eventStore.requestAccess(to: .event, completion:
{(granted: Bool, error: Error?) -> Void in
if !granted {
trace("in SettingsViewAppleWatchSettingsViewModel, EKEventStore access not granted", log: self.log, category: ConstantsLog.categoryRootView, type: .error)
UserDefaults.standard.createCalendarEvent = false
} else {
trace("in SettingsViewAppleWatchSettingsViewModel, EKEventStore access granted", log: self.log, category: ConstantsLog.categoryRootView, type: .info)
UserDefaults.standard.createCalendarEvent = true
}
})
}

case .restricted:
// authorize not possible, according to apple doc "possibly due to active restrictions such as parental controls being in place", no need to change value of UserDefaults.standard.createCalendarEvent
// we will probably never come here because if it's restricted, the uiview is not shown
trace("in SettingsViewAppleWatchSettingsViewModel, EKEventStore access restricted, according to apple doc 'possibly due to active restrictions such as parental controls being in place'", log: self.log, category: ConstantsLog.categoryRootView, type: .error)
UserDefaults.standard.createCalendarEvent = false

case .writeOnly:
// Full Access permission has not been granted to the app so we won't be able to delete old BG events, no need to change value of UserDefaults.standard.createCalendarEvent
trace("in SettingsViewAppleWatchSettingsViewModel, EKEventStore access is 'Write Only', the user must update this to 'Full Access'", log: self.log, category: ConstantsLog.categoryRootView, type: .error)
UserDefaults.standard.createCalendarEvent = false

case .denied:
// access denied by user, need to change value of UserDefaults.standard.createCalendarEvent
// we will probably never come here because if it's denied, the uiview is not shown
trace("in SettingsViewAppleWatchSettingsViewModel, EKEventStore access denied by user", log: self.log, category: ConstantsLog.categoryRootView, type: .error)
UserDefaults.standard.createCalendarEvent = false

case .authorized:
// authorize successful, no need to change value of UserDefaults.standard.createCalendarEvent
case .authorized, .fullAccess:
// authorize successful (or fullAccess is granted), no need to change value of UserDefaults.standard.createCalendarEvent
trace("in SettingsViewAppleWatchSettingsViewModel, EKEventStore access authorized", log: self.log, category: ConstantsLog.categoryRootView, type: .error)
UserDefaults.standard.createCalendarEvent = true

Expand Down Expand Up @@ -260,16 +285,20 @@ class SettingsViewAppleWatchSettingsViewModel: SettingsViewModelProtocol {

case .denied:
// by clicking row, show info how to authorized
return SettingsSelectedRowAction.showInfoText(title: Texts_Common.warning, message: Texts_SettingsView.infoCalendarAccessDeniedByUser + " " + ConstantsHomeView.applicationName)
return SettingsSelectedRowAction.showInfoText(title: Texts_Common.warning, message: Texts_SettingsView.infoCalendarAccessDeniedByUser)

case .notDetermined, .authorized:
// if notDetermined or authorized, the uiview is shown, and app should only react on clicking the uiview, not the row
case .notDetermined, .authorized, .fullAccess:
// if notDetermined, fullAccess or authorized, the uiview is shown, and app should only react on clicking the uiview, not the row
break

case .restricted:
// by clicking row, show what it means to be restricted, according to Apple doc
return SettingsSelectedRowAction.showInfoText(title: Texts_Common.warning, message: Texts_SettingsView.infoCalendarAccessRestricted)

case .writeOnly:
// by clicking row, show how to update the permissions
return SettingsSelectedRowAction.showInfoText(title: Texts_Common.warning, message: Texts_SettingsView.infoCalendarAccessWriteOnly)

@unknown default:
trace("in SettingsViewAppleWatchSettingsViewModel, unknown case returned when authorizing EKEventStore ", log: self.log, category: ConstantsLog.categoryRootView, type: .error)

Expand Down Expand Up @@ -302,7 +331,7 @@ class SettingsViewAppleWatchSettingsViewModel: SettingsViewModelProtocol {

}

return SettingsSelectedRowAction.selectFromList(title: Texts_SettingsView.labelTransmitterId, data: data, selectedRow: selectedRow, actionTitle: nil, cancelTitle: nil, actionHandler: {(index:Int) in
return SettingsSelectedRowAction.selectFromList(title: Texts_SettingsView.calenderId, data: data, selectedRow: selectedRow, actionTitle: nil, cancelTitle: nil, actionHandler: {(index:Int) in
if index != selectedRow {
UserDefaults.standard.calenderId = data[index]
}
Expand Down

0 comments on commit 4e51c40

Please sign in to comment.