Skip to content

Commit

Permalink
Merge pull request #1629 from ruuvi/beta
Browse files Browse the repository at this point in the history 
v2.3.2
  • Loading branch information
@priyonto
priyonto authored Sep 8, 2023
2 parents 69a9f2e + 8f44158 commit 9f4c784
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 30 deletions.
10 changes: 4 additions & 6 deletions ...viDaemon/Sources/RuuviDaemonRuuviTag/Advertisement/RuuviTagAdvertisementDaemonBTKit.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,17 +215,15 @@ public final class RuuviTagAdvertisementDaemonBTKit: RuuviDaemonWorker, RuuviTag
}

@objc private func persist(wrapper: RuuviTagWrapper) {
guard wrapper.device.luid != nil else { return }
let uuid = wrapper.device.uuid
// If the tag chart is on foreground store all advertisements
// Otherwise respect the settings
guard wrapper.device.luid != nil else { return }
if settings.appIsOnForeground {
let previous = advertisementSequence[uuid]
if previous != nil && previous!! != nil {
guard let next = wrapper.device.measurementSequenceNumber, next > previous!! else {
return
if let previous = advertisementSequence[uuid], let previous = previous {
if let next = wrapper.device.measurementSequenceNumber, next > previous {
persist(wrapper.device, uuid)
}
persist(wrapper.device, uuid)
} else {
// Tags with data format 3 doesn't sent duplicates packets*
if wrapper.device.version == 3 {
Expand Down
40 changes: 20 additions & 20 deletions station.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6369,7 +6369,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 4MUYJ4YYH4;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
Expand All @@ -6379,7 +6379,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D DEVELOPMENT";
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -6401,7 +6401,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 4MUYJ4YYH4;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
Expand All @@ -6411,7 +6411,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -6433,7 +6433,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEVELOPMENT_TEAM = 4MUYJ4YYH4;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -6446,7 +6446,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station.widgets;
Expand All @@ -6470,7 +6470,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEVELOPMENT_TEAM = 4MUYJ4YYH4;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -6483,7 +6483,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station.widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -6505,7 +6505,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEVELOPMENT_TEAM = 4MUYJ4YYH4;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -6518,7 +6518,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station.intents;
Expand All @@ -6541,7 +6541,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEVELOPMENT_TEAM = 4MUYJ4YYH4;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -6554,7 +6554,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station.intents;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -6693,7 +6693,7 @@
CODE_SIGN_ENTITLEMENTS = station/station.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 4MUYJ4YYH4;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
Expand Down Expand Up @@ -6735,7 +6735,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -6755,7 +6755,7 @@
CODE_SIGN_ENTITLEMENTS = station/station.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEVELOPMENT_TEAM = 4MUYJ4YYH4;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
INFOPLIST_FILE = "$(SRCROOT)/station/Resources/Plists/Info.plist";
Expand All @@ -6764,7 +6764,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -6869,7 +6869,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -6882,7 +6882,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station.pnservice;
Expand All @@ -6904,7 +6904,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 402;
CURRENT_PROJECT_VERSION = 403;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4MUYJ4YYH4;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -6917,7 +6917,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 2.3.1;
MARKETING_VERSION = 2.3.2;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.ruuvi.station.pnservice;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
6 changes: 3 additions & 3 deletions station/Classes/Presentation/Modules/TagSettings/Router/TagSettingsRouter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class TagSettingsRouter: NSObject, TagSettingsRouterInput {
func openShare(for sensor: RuuviTagSensor) {
let restorationId = "ShareViewController"
let factory = StoryboardFactory(storyboardName: "Share", bundle: .main, restorationId: restorationId)
try! transitionHandler
try? transitionHandler
.forStoryboard(factory: factory,
to: ShareModuleInput.self)
.to(preferred: .navigation(style: .push))
Expand All @@ -43,7 +43,7 @@ class TagSettingsRouter: NSObject, TagSettingsRouterInput {
ruuviTag: RuuviTagSensor,
sensorSettings: SensorSettings?) {
let factory = StoryboardFactory(storyboardName: "OffsetCorrection")
try! transitionHandler
try? transitionHandler
.forStoryboard(factory: factory, to: OffsetCorrectionModuleInput.self)
.to(preferred: .navigation(style: .push))
.then({ (module) -> Any? in
Expand All @@ -69,7 +69,7 @@ class TagSettingsRouter: NSObject, TagSettingsRouterInput {

func openOwner(ruuviTag: RuuviTagSensor, mode: OwnershipMode) {
let factory = StoryboardFactory(storyboardName: "Owner")
try! transitionHandler
try? transitionHandler
.forStoryboard(factory: factory, to: OwnerModuleInput.self)
.to(preferred: .navigation(style: .push))
.then({ module in
Expand Down
2 changes: 1 addition & 1 deletion station/Resources/Plists/DevInfo.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>402</string>
<string>403</string>
<key>FirebaseMessagingAutoInitEnabled</key>
<false/>
<key>LSRequiresIPhoneOS</key>
Expand Down

0 comments on commit 9f4c784

Please sign in to comment.