Merge branch 'develop' into feature/test_no_arm64_config

MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m

@@ -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 {
                 

MVMCore/MVMCore/Session/MVMCoreSessionTimeHandler.h

@@ -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

MVMCore/MVMCore/Session/MVMCoreSessionTimeHandler.m

@@ -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;