Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core into develop
This commit is contained in:
commit
1de042d255
@ -149,7 +149,6 @@
|
||||
if (!requestForMissingData) {
|
||||
|
||||
// We have all the needed data, continue with the load.
|
||||
[[MVMCoreSessionTimeHandler sharedSessionHandler] sendKeepAliveToServer:NO];
|
||||
[MVMCoreLoadRequestOperation handleLoadObject:loadObject error:nil];
|
||||
} else {
|
||||
|
||||
|
||||
@ -16,6 +16,12 @@
|
||||
// The time that we started the last session timer.
|
||||
@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
|
||||
|
||||
// Can override to provide a time until the warning shows in seconds. Set to 0 if there should be no warning. Default is 0
|
||||
|
||||
@ -27,10 +27,10 @@
|
||||
@property (assign, nonatomic, readwrite) NSTimeInterval timeTimerStarted;
|
||||
|
||||
// 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.
|
||||
@property (assign, nonatomic) BOOL sessionTimedOut;
|
||||
@property (assign, nonatomic, readwrite) BOOL sessionTimedOut;
|
||||
|
||||
@property (assign, nonatomic) NSTimeInterval secondsUntilWarning;
|
||||
@property (assign, nonatomic) NSTimeInterval secondsUntilTimeout;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user