diff --git a/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m b/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m index b0fac90..a1223aa 100644 --- a/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m +++ b/MVMCore/MVMCore/OtherHandlers/MVMCoreCache.m @@ -106,11 +106,15 @@ static NSString * const STATIC_CACHE_COMPONENT = @"StaticCache.txt"; - (BOOL)isJSONExpired:(nonnull NSDictionary *)jsonDictionary { NSTimeInterval expiryTime = [self getExpiryForJSON:jsonDictionary]; NSTimeInterval timeSinceUnixEpoc = [[NSDate date] timeIntervalSince1970]; + if (timeSinceUnixEpoc > expiryTime) { + [MVMCoreLoggingHandler logDebugMessageWithDelegate:[NSString stringWithFormat:@"CACHEDFEED: EXPIRED %@ %@ %f %f",[jsonDictionary stringForKey:KeyPageType],[jsonDictionary stringForKey:@"moduleName"],timeSinceUnixEpoc,expiryTime]]; + } return timeSinceUnixEpoc > expiryTime; } - (NSTimeInterval)getExpiryForJSON:(nonnull NSDictionary *)jsonDictionary { - return [[jsonDictionary dict:@"expiry"] doubleValue] * 1000.0; + NSDictionary *cachePolicy = [jsonDictionary dict:@"cachePolicy"]; + return [[cachePolicy dict:@"expiry"] doubleValue] * 1000.0; } - (BOOL)shouldPersistentlyCacheJSON:(nonnull NSDictionary *)jsonDictionary {