From d0a3668354e1f6f99a3d8eea879dbbb4300e303c Mon Sep 17 00:00:00 2001 From: Dirk Hermanns Date: Mon, 15 Jan 2024 21:26:57 +0100 Subject: [PATCH] Fixed Notification problem --- Gemfile.lock | 33 ++++++++++++++-------------- nightguard WatchKit App/Info.plist | 2 +- nightguard.xcodeproj/project.pbxproj | 16 +++++++------- nightguard/Info.plist | 2 +- nightguard/app/NightscoutData.swift | 6 ++--- nightguardTests/Info.plist | 2 +- nightguardUITests/Info.plist | 2 +- 7 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3d50a65..3b89e3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,21 +3,21 @@ GEM specs: CFPropertyList (3.0.6) rexml - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.862.0) - aws-sdk-core (3.190.0) + aws-partitions (1.880.0) + aws-sdk-core (3.190.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.74.0) + aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.141.0) + aws-sdk-s3 (1.142.0) aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) @@ -36,7 +36,7 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.105.0) + excon (0.109.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -65,8 +65,8 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.7) - fastlane (2.217.0) + fastimage (2.3.0) + fastlane (2.219.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -85,6 +85,7 @@ GEM gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) google-cloud-storage (~> 1.31) highline (~> 2.0) http-cookie (~> 1.0.5) @@ -93,7 +94,7 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (~> 0.1.1) + optparse (>= 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) @@ -107,7 +108,7 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.53.0) + google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) @@ -124,8 +125,8 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.29.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) @@ -149,7 +150,7 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.7.0) + json (2.7.1) jwt (2.7.1) mini_magick (4.12.0) mini_mime (1.1.5) @@ -157,9 +158,9 @@ GEM multipart-post (2.3.0) nanaimo (0.3.0) naturally (2.2.1) - optparse (0.1.1) + optparse (0.4.0) os (1.1.4) - plist (3.7.0) + plist (3.7.1) public_suffix (5.0.4) rake (13.1.0) representable (3.2.0) @@ -185,7 +186,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) trailblazer-option (0.1.2) tty-cursor (0.7.1) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) diff --git a/nightguard WatchKit App/Info.plist b/nightguard WatchKit App/Info.plist index 2639aa9..88121c9 100644 --- a/nightguard WatchKit App/Info.plist +++ b/nightguard WatchKit App/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 896 + 901 CLKComplicationPrincipalClass $(PRODUCT_MODULE_NAME).ComplicationController NSAppTransportSecurity diff --git a/nightguard.xcodeproj/project.pbxproj b/nightguard.xcodeproj/project.pbxproj index a7a0950..10b32e2 100644 --- a/nightguard.xcodeproj/project.pbxproj +++ b/nightguard.xcodeproj/project.pbxproj @@ -2511,7 +2511,7 @@ CODE_SIGN_ENTITLEMENTS = "nightguard WatchKit App/nightguard.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 896; + CURRENT_PROJECT_VERSION = 901; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = BSAVUVP8PV; INFOPLIST_FILE = "nightguard WatchKit App/Info.plist"; @@ -2543,7 +2543,7 @@ CODE_SIGN_ENTITLEMENTS = "nightguard WatchKit App/nightguard.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 896; + CURRENT_PROJECT_VERSION = 901; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = BSAVUVP8PV; INFOPLIST_FILE = "nightguard WatchKit App/Info.plist"; @@ -2573,7 +2573,7 @@ CODE_SIGN_ENTITLEMENTS = nightguard/scoutwatch.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 896; + CURRENT_PROJECT_VERSION = 901; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = BSAVUVP8PV; ENABLE_BITCODE = NO; @@ -2605,7 +2605,7 @@ CODE_SIGN_ENTITLEMENTS = nightguard/scoutwatch.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 896; + CURRENT_PROJECT_VERSION = 901; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = BSAVUVP8PV; ENABLE_BITCODE = NO; @@ -2728,7 +2728,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 896; + CURRENT_PROJECT_VERSION = 901; DEVELOPMENT_TEAM = BSAVUVP8PV; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -2770,7 +2770,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 896; + CURRENT_PROJECT_VERSION = 901; DEVELOPMENT_TEAM = BSAVUVP8PV; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -2809,7 +2809,7 @@ CODE_SIGN_ENTITLEMENTS = "nightguard ComplicationExtension.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 896; + CURRENT_PROJECT_VERSION = 901; DEVELOPMENT_TEAM = BSAVUVP8PV; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -2853,7 +2853,7 @@ CODE_SIGN_ENTITLEMENTS = "nightguard ComplicationExtension.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 896; + CURRENT_PROJECT_VERSION = 901; DEVELOPMENT_TEAM = BSAVUVP8PV; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; diff --git a/nightguard/Info.plist b/nightguard/Info.plist index 1e874a5..f61d54f 100644 --- a/nightguard/Info.plist +++ b/nightguard/Info.plist @@ -25,7 +25,7 @@ CFBundleSignature ???? CFBundleVersion - 896 + 901 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/nightguard/app/NightscoutData.swift b/nightguard/app/NightscoutData.swift index 0170d15..f61f9e5 100644 --- a/nightguard/app/NightscoutData.swift +++ b/nightguard/app/NightscoutData.swift @@ -165,9 +165,9 @@ class NightscoutData : NSObject, Codable, NSSecureCoding { func isOlderThanXMinutes(_ minutes : Int) -> Bool { let lastUpdateAsNSDate : Date = Date(timeIntervalSince1970: time.doubleValue / 1000) - let timeInterval = Date().timeIntervalSince(lastUpdateAsNSDate) - - return timeInterval > Double(minutes * 60) + let timeInterval : Int = Int(Date().timeIntervalSince(lastUpdateAsNSDate)) + + return timeInterval > minutes * 60 } } diff --git a/nightguardTests/Info.plist b/nightguardTests/Info.plist index 1782a3f..f450692 100644 --- a/nightguardTests/Info.plist +++ b/nightguardTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 896 + 901 diff --git a/nightguardUITests/Info.plist b/nightguardUITests/Info.plist index 1782a3f..f450692 100644 --- a/nightguardUITests/Info.plist +++ b/nightguardUITests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 896 + 901