Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core into bugfix/remove_no_page_error
This commit is contained in:
commit
146e44a905
@ -321,7 +321,7 @@
|
|||||||
|
|
||||||
NSURLSessionTask *task = [session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
|
NSURLSessionTask *task = [session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
|
||||||
|
|
||||||
MVMCoreLog(@"Request Time %f",[NSDate timeIntervalSinceReferenceDate] - startTime);
|
MVMCoreLog(@"Request Time %f", [NSDate timeIntervalSinceReferenceDate] - startTime);
|
||||||
|
|
||||||
NSDate *startTimeDate = [NSDate dateWithTimeIntervalSinceReferenceDate:startTime];
|
NSDate *startTimeDate = [NSDate dateWithTimeIntervalSinceReferenceDate:startTime];
|
||||||
|
|
||||||
@ -334,6 +334,8 @@
|
|||||||
[trackInfo setObject:error.localizedDescription forKey:@"error"];
|
[trackInfo setObject:error.localizedDescription forKey:@"error"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MVMCoreLog(@"Set-Cookie %@ Value: %@", requestParameters.pageType, [(NSHTTPURLResponse *)response allHeaderFields][@"Set-Cookie"]);
|
||||||
|
|
||||||
[MVMCoreLoggingHandler logWithDelegateWithObject:nil withName:@"httpRequestStatus" withExtraInfo:trackInfo];
|
[MVMCoreLoggingHandler logWithDelegateWithObject:nil withName:@"httpRequestStatus" withExtraInfo:trackInfo];
|
||||||
|
|
||||||
id jsonObject = nil;
|
id jsonObject = nil;
|
||||||
|
|||||||
@ -773,11 +773,10 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show any alerts that we have been saving.
|
|
||||||
if (loadObject.operation.alertToShow) {
|
|
||||||
|
|
||||||
// If we have an alert to show and a loaded view controller, allow the loaded view controller to be the delegate.
|
// If we have an alert to show and a loaded view controller, allow the loaded view controller to be the delegate.
|
||||||
DelegateObject *delegateObject = [loadedViewController respondsToSelector:@selector(delegateObject)] ? [loadedViewController delegateObject] : loadObject.operation.delegateObject;
|
DelegateObject *delegateObject = [loadedViewController respondsToSelector:@selector(delegateObject)] ? [loadedViewController delegateObject] : loadObject.operation.delegateObject;
|
||||||
|
// Show any alerts that we have been saving.
|
||||||
|
if (loadObject.operation.alertToShow) {
|
||||||
[MVMCoreLoadRequestOperation createAndShowAlertForLoadObject:loadObject error:loadObject.operation.errorForAlertToShow delegateObject:delegateObject];
|
[MVMCoreLoadRequestOperation createAndShowAlertForLoadObject:loadObject error:loadObject.operation.errorForAlertToShow delegateObject:delegateObject];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -790,6 +789,7 @@
|
|||||||
|
|
||||||
//make post load calls function
|
//make post load calls function
|
||||||
[MVMCoreLoadRequestOperation loadPostCallActions:loadObject];
|
[MVMCoreLoadRequestOperation loadPostCallActions:loadObject];
|
||||||
|
[MVMCoreLoadRequestOperation loadPostAction:loadObject delegateObject:delegateObject];
|
||||||
|
|
||||||
[loadObject.operation markAsFinished];
|
[loadObject.operation markAsFinished];
|
||||||
}
|
}
|
||||||
@ -812,6 +812,13 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ (void)loadPostAction:(nonnull MVMCoreLoadObject *)loadObject delegateObject:(nullable DelegateObject *)delegateObject {
|
||||||
|
NSDictionary *actionDict = [loadObject.responseJSON dict:@"PostAction"];
|
||||||
|
if (actionDict) {
|
||||||
|
[[MVMCoreActionHandler sharedActionHandler] handleActionWithDictionary:actionDict additionalData:nil delegateObject:delegateObject];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
+ (void)removeCaches:(nullable NSDictionary *)cacheDictionary {
|
+ (void)removeCaches:(nullable NSDictionary *)cacheDictionary {
|
||||||
|
|
||||||
if (cacheDictionary) {
|
if (cacheDictionary) {
|
||||||
|
|||||||
@ -62,6 +62,7 @@ FOUNDATION_EXPORT const unsigned char MVMCoreVersionString[];
|
|||||||
#import <MVMCore/MVMCorePresentViewControllerOperation.h>
|
#import <MVMCore/MVMCorePresentViewControllerOperation.h>
|
||||||
#import <MVMCore/MVMCoreNavigationOperation.h>
|
#import <MVMCore/MVMCoreNavigationOperation.h>
|
||||||
#import <MVMCore/MVMCoreViewControllerAnimatedTransitioning.h>
|
#import <MVMCore/MVMCoreViewControllerAnimatedTransitioning.h>
|
||||||
|
#import <MVMCore/MVMCoreAlertController.h>
|
||||||
|
|
||||||
// Action Handling
|
// Action Handling
|
||||||
#import <MVMCore/MVMCoreActionHandler.h>
|
#import <MVMCore/MVMCoreActionHandler.h>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user