mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/test_no_arm64_config

Browse Source
This commit is contained in:
Kevin G Christiano 2020-12-17 13:34:43 -05:00
commit 90be8a34d1
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m
View File

@ -149,7 +149,6 @@
if (!requestForMissingData) { if (!requestForMissingData) {
// We have all the needed data, continue with the load. // We have all the needed data, continue with the load.
[[MVMCoreSessionTimeHandler sharedSessionHandler] sendKeepAliveToServer:NO];
[MVMCoreLoadRequestOperation handleLoadObject:loadObject error:nil]; [MVMCoreLoadRequestOperation handleLoadObject:loadObject error:nil];
} else { } else {

6
MVMCore/MVMCore/Session/MVMCoreSessionTimeHandler.h
View File

@ -16,6 +16,12 @@
// The time that we started the last session timer. // The time that we started the last session timer.
@property (assign, nonatomic, readonly) NSTimeInterval timeTimerStarted; @property (assign, nonatomic, readonly) NSTimeInterval timeTimerStarted;
// Keeps track of if the session is currently being timed. Used for entering from the background.
@property (assign, nonatomic, readonly) BOOL sessionBeingTimed;
// Keeps track of if the session has already timed out.
@property (assign, nonatomic, readonly) BOOL sessionTimedOut;
#pragma mark - functions to override #pragma mark - functions to override
// Can override to provide a time until the warning shows in seconds. Set to 0 if there should be no warning. Default is 0 // Can override to provide a time until the warning shows in seconds. Set to 0 if there should be no warning. Default is 0

4
MVMCore/MVMCore/Session/MVMCoreSessionTimeHandler.m
View File

@ -27,10 +27,10 @@
@property (assign, nonatomic, readwrite) NSTimeInterval timeTimerStarted; @property (assign, nonatomic, readwrite) NSTimeInterval timeTimerStarted;
// Keeps track of if the session is currently being timed. Used for entering from the background. // Keeps track of if the session is currently being timed. Used for entering from the background.
@property (assign, nonatomic) BOOL sessionBeingTimed; @property (assign, nonatomic, readwrite) BOOL sessionBeingTimed;
// Keeps track of if the session has already timed out. // Keeps track of if the session has already timed out.
@property (assign, nonatomic) BOOL sessionTimedOut; @property (assign, nonatomic, readwrite) BOOL sessionTimedOut;
@property (assign, nonatomic) NSTimeInterval secondsUntilWarning; @property (assign, nonatomic) NSTimeInterval secondsUntilWarning;
@property (assign, nonatomic) NSTimeInterval secondsUntilTimeout; @property (assign, nonatomic) NSTimeInterval secondsUntilTimeout;