Skip to content

Commit

Permalink
Merge pull request #209 from DP-3T/develop
Browse files Browse the repository at this point in the history
1.2.1 version to master
  • Loading branch information
stmitt authored Aug 31, 2020
2 parents b526c66 + 9644676 commit 2b376c9
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog for DP3T-SDK iOS

## Version 1.2.1 (31.08.2020)
- ensures that backgroundtask keeps running until outstandingPublishOperation is finished

## Version 1.2.0 (26.08.2020)
- resolves keychain issue with iOS 14
- adds iOS 14 info.plist entries for calibration app
Expand Down
2 changes: 1 addition & 1 deletion DP3TSDK.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Pod::Spec.new do |spec|

spec.name = "DP3TSDK"
spec.version = ENV['LIB_VERSION'] || '1.2.0'
spec.version = ENV['LIB_VERSION'] || '1.2.1'
spec.summary = "Open protocol for COVID-19 proximity tracing using Bluetooth Low Energy on mobile devices"

spec.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ DP3T-SDK is available through [Cocoapods](https://cocoapods.org/)

```ruby

pod 'DP3TSDK', => '1.2.0'
pod 'DP3TSDK', => '1.2.1'

```

Expand Down
17 changes: 9 additions & 8 deletions Sources/DP3TSDK/DP3TSDK.swift
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,20 @@ class DP3TSDK {
OperationQueue().addOperation(outstandingPublishOperation)

let sync = {
var storedResult: SyncResult?

// Skip sync when tracing is not active
if self.state.trackingState != .active {
self.log.error("Skip sync when tracking is not active")
callback?(.skipped)
return
storedResult = .skipped
} else {
group.enter()
self.synchronizer.sync { result in
storedResult = result
group.leave()
}
}

group.enter()
var storedResult: SyncResult?
self.synchronizer.sync { result in
storedResult = result
group.leave()
}
group.notify(queue: .main) { [weak self] in
guard let self = self else { return }
switch storedResult! {
Expand Down
2 changes: 1 addition & 1 deletion Sources/DP3TSDK/DP3TTracing.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private var instance: DP3TSDK!
/// DP3TTracing
public enum DP3TTracing {
/// The current version of the SDK
public static let frameworkVersion: String = "1.2.0"
public static let frameworkVersion: String = "1.2.1"

/// sets global parameter values which are used throughout the sdk
public static var parameters: DP3TParameters {
Expand Down

0 comments on commit 2b376c9

Please sign in to comment.