Skip to content

Commit

Permalink
Reverts "Timing: Fixes timer when app get into background (#24649)" (#…
Browse files Browse the repository at this point in the history
…27065)

This reverts commit 3382984
  • Loading branch information
radko93 authored and grabbou committed Nov 4, 2019
1 parent b85dffa commit d7c9173
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions React/Modules/RCTTiming.m
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ @implementation RCTTiming
NSTimer *_sleepTimer;
BOOL _sendIdleEvents;
BOOL _inBackground;
UIBackgroundTaskIdentifier _backgroundTaskIdentifier;
}

@synthesize bridge = _bridge;
Expand All @@ -113,7 +112,6 @@ - (void)setBridge:(RCTBridge *)bridge
_paused = YES;
_timers = [NSMutableDictionary new];
_inBackground = NO;
_backgroundTaskIdentifier = UIBackgroundTaskInvalid;

for (NSString *name in @[UIApplicationWillResignActiveNotification,
UIApplicationDidEnterBackgroundNotification,
Expand All @@ -137,35 +135,10 @@ - (void)setBridge:(RCTBridge *)bridge

- (void)dealloc
{
[self markEndOfBackgroundTaskIfNeeded];
[_sleepTimer invalidate];
[[NSNotificationCenter defaultCenter] removeObserver:self];
}

- (void)markStartOfBackgroundTaskIfNeeded
{
if (_backgroundTaskIdentifier == UIBackgroundTaskInvalid) {
__weak typeof(self) weakSelf = self;
// Marks the beginning of a new long-running background task. We can run the timer in the background.
_backgroundTaskIdentifier = [[UIApplication sharedApplication] beginBackgroundTaskWithName:@"rct.timing.gb.task" expirationHandler:^{
typeof(self) strongSelf = weakSelf;
if (!strongSelf) {
return;
}
// Mark the end of background task
[strongSelf markEndOfBackgroundTaskIfNeeded];
}];
}
}

- (void)markEndOfBackgroundTaskIfNeeded
{
if (_backgroundTaskIdentifier != UIBackgroundTaskInvalid) {
[[UIApplication sharedApplication] endBackgroundTask:_backgroundTaskIdentifier];
_backgroundTaskIdentifier = UIBackgroundTaskInvalid;
}
}

- (dispatch_queue_t)methodQueue
{
return RCTJSThread;
Expand All @@ -190,7 +163,6 @@ - (void)appDidMoveToBackground

- (void)appDidMoveToForeground
{
[self markEndOfBackgroundTaskIfNeeded];
_inBackground = NO;
[self startTimers];
}
Expand Down Expand Up @@ -288,7 +260,6 @@ - (void)didUpdateFrame:(RCTFrameUpdate *)update
}
if (_inBackground) {
if (timerCount) {
[self markStartOfBackgroundTaskIfNeeded];
[self scheduleSleepTimer:nextScheduledTarget];
}
} else if (!_sendIdleEvents && timersToCall.count == 0) {
Expand Down Expand Up @@ -367,7 +338,6 @@ - (void)timerDidFire
}

if (_inBackground) {
[self markStartOfBackgroundTaskIfNeeded];
[self scheduleSleepTimer:timer.target];
} else if (_paused) {
if ([timer.target timeIntervalSinceNow] > kMinimumSleepInterval) {
Expand Down

0 comments on commit d7c9173

Please sign in to comment.