mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into develop

This commit is contained in:
Johan Degraeve 2020-07-30 13:01:57 +02:00 committed by GitHub
parent 8fa4040942 106c5a8e95
commit 860f8e7bbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdrip.xcodeproj/project.pbxproj
View File

@ -3308,8 +3308,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.2.5;
PRODUCT_BUNDLE_IDENTIFIER = net.paulplant.xdripswift;
MARKETING_VERSION = 4.2.7;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "xdrip/xdrip-Bridging-Header.h";
@ -3337,8 +3337,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.2.5;
PRODUCT_BUNDLE_IDENTIFIER = net.paulplant.xdripswift;
MARKETING_VERSION = 4.2.7;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "xdrip/xdrip-Bridging-Header.h";

13
xdrip/Managers/NightScout/NightScoutUploadManager.swift
View File

@ -264,6 +264,9 @@ public class NightScoutUploadManager:NSObject {
// 2 records are uploaded to nightscout for each calibration: a cal record and a mbg record
let calibrationsDictionaryRepresentation = calibrationsToUpload.map({$0.dictionaryRepresentationForCalRecordNightScoutUpload}) + calibrationsToUpload.map({$0.dictionaryRepresentationForMbgRecordNightScoutUpload})
let traceValue = calibrationsDictionaryRepresentation.description
trace("tracevalue = %{public}@", log: oslog, category: ConstantsLog.categoryNightScoutUploadManager, type: .info, traceValue)
uploadData(dataToUpload: calibrationsDictionaryRepresentation, traceString: "uploadCalibrationsToNightScout", siteURL: siteURL, path: nightScoutEntriesPath, apiKey: apiKey, completionHandler: {
// change timeStampLatestNightScoutUploadedCalibration
@ -296,6 +299,16 @@ public class NightScoutUploadManager:NSObject {
// transform dataToUpload to json
let dateToUploadAsJSON = try JSONSerialization.data(withJSONObject: dataToUpload, options: [])
if let dateToUploadAsJSONAsString = String(bytes: dateToUploadAsJSON, encoding: .utf8) {
trace("dateToUploadAsJSON = %{public}@", log: oslog, category: ConstantsLog.categoryNightScoutUploadManager, type: .info, dateToUploadAsJSONAsString)
} else {
trace("could not create dateToUploadAsJSON", log: oslog, category: ConstantsLog.categoryNightScoutUploadManager, type: .info)
}
if let url = URL(string: siteURL) {
// create upload url

2
xdrip/Supporting Files/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>3987</string>
<string>3992</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>