mirror of https://github.com/oxen-io/session-ios
intern Pastelog back into Signal.
Not worth the cocaopods/framework/project mgmt machinery for making changes to 1 class. // FREEBIEpull/1/head
parent
c88f275c9a
commit
8adba61b37
@ -0,0 +1,16 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
@interface Pastelog : NSObject <NSURLConnectionDelegate, NSURLConnectionDataDelegate, UIAlertViewDelegate>
|
||||
|
||||
typedef void (^successBlock)(NSError *error, NSString *urlString);
|
||||
|
||||
+(void)reportErrorAndSubmitLogsWithAlertTitle:(NSString*)alertTitle alertBody:(NSString*)alertBody;
|
||||
+(void)reportErrorAndSubmitLogsWithAlertTitle:(NSString*)alertTitle alertBody:(NSString*)alertBody completionBlock:(successBlock)block;
|
||||
|
||||
+(void)submitLogs;
|
||||
+(void)submitLogsWithCompletion:(successBlock)block;
|
||||
+(void)submitLogsWithCompletion:(successBlock)block forFileLogger:(DDFileLogger*)fileLogger;
|
||||
|
||||
@end
|
@ -0,0 +1,205 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "Pastelog.h"
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
@interface Pastelog ()
|
||||
|
||||
@property (nonatomic)UIAlertView *reportAlertView;
|
||||
@property (nonatomic)UIAlertView *loadingAlertView;
|
||||
@property (nonatomic)UIAlertView *submitAlertView;
|
||||
@property (nonatomic)UIAlertView *infoAlertView;
|
||||
@property (nonatomic)NSMutableData *responseData;
|
||||
@property (nonatomic, copy)successBlock block;
|
||||
@property (nonatomic, copy)NSString *gistURL;
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@implementation Pastelog
|
||||
|
||||
+(void)reportErrorAndSubmitLogsWithAlertTitle:(NSString*)alertTitle alertBody:(NSString*)alertBody {
|
||||
[self reportErrorAndSubmitLogsWithAlertTitle:alertTitle alertBody:alertBody completionBlock:nil];
|
||||
}
|
||||
|
||||
+(void)reportErrorAndSubmitLogsWithAlertTitle:(NSString*)alertTitle alertBody:(NSString*)alertBody completionBlock:(successBlock)block {
|
||||
Pastelog *sharedManager = [self sharedManager];
|
||||
sharedManager.block = block;
|
||||
sharedManager.reportAlertView = [[UIAlertView alloc] initWithTitle:alertTitle message:alertBody delegate:[self sharedManager] cancelButtonTitle:@"Yes" otherButtonTitles:@"No", nil];
|
||||
[sharedManager.reportAlertView show];
|
||||
}
|
||||
|
||||
+(void)submitLogs {
|
||||
Pastelog *sharedManager = [self sharedManager];
|
||||
[self submitLogsWithCompletion:^(NSError *error, NSString *urlString) {
|
||||
if (!error) {
|
||||
sharedManager.gistURL = urlString;
|
||||
sharedManager.submitAlertView = [[UIAlertView alloc] initWithTitle:@"One More Step" message:@"What would you like to do with the link to your debug log?" delegate:[self sharedManager] cancelButtonTitle:@"Create GitHub Issue" otherButtonTitles:@"Email Link", @"Copy Link", nil];
|
||||
[sharedManager.submitAlertView show];
|
||||
} else{
|
||||
UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"Failed to submit debug log" message:error.localizedDescription delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil, nil];
|
||||
[alertView show];
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
+(void)submitLogsWithCompletion:(successBlock)block {
|
||||
[self submitLogsWithCompletion:(successBlock)block forFileLogger:[[DDFileLogger alloc] init]];
|
||||
}
|
||||
|
||||
+(void)submitLogsWithCompletion:(successBlock)block forFileLogger:(DDFileLogger*)fileLogger {
|
||||
|
||||
[self sharedManager].block = block;
|
||||
|
||||
[self sharedManager].loadingAlertView = [[UIAlertView alloc] initWithTitle:@"Sending debug log..."
|
||||
message:nil delegate:self
|
||||
cancelButtonTitle:nil
|
||||
otherButtonTitles:nil];
|
||||
[[self sharedManager].loadingAlertView show];
|
||||
|
||||
NSArray *fileNames = fileLogger.logFileManager.sortedLogFileNames;
|
||||
NSArray *filePaths = fileLogger.logFileManager.sortedLogFilePaths;
|
||||
|
||||
NSMutableDictionary *gistFiles = [@{} mutableCopy];
|
||||
|
||||
NSError *error;
|
||||
|
||||
for (unsigned int i = 0; i < [filePaths count]; i++) {
|
||||
[gistFiles setObject:@{@"content":[NSString stringWithContentsOfFile:[filePaths objectAtIndex:i] encoding:NSUTF8StringEncoding error:&error]} forKey:[fileNames objectAtIndex:i]];
|
||||
}
|
||||
|
||||
if (error) {
|
||||
}
|
||||
|
||||
NSDictionary *gistDict = @{@"description":[self gistDescription], @"files":gistFiles};
|
||||
|
||||
NSData *postData = [NSJSONSerialization dataWithJSONObject:gistDict options:0 error:nil];
|
||||
|
||||
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[[NSURL alloc] initWithString:@"https://api.github.com/gists"] cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:30];
|
||||
|
||||
[[self sharedManager] setResponseData:[NSMutableData data]];
|
||||
[[self sharedManager] setBlock:block];
|
||||
|
||||
[request setHTTPMethod:@"POST"];
|
||||
[request setHTTPBody:postData];
|
||||
|
||||
NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:[self sharedManager]];
|
||||
|
||||
[connection start];
|
||||
|
||||
}
|
||||
|
||||
+(Pastelog*)sharedManager {
|
||||
static Pastelog *sharedMyManager = nil;
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^{
|
||||
sharedMyManager = [[self alloc] init];
|
||||
});
|
||||
return sharedMyManager;
|
||||
}
|
||||
|
||||
-(instancetype)init {
|
||||
if (self = [super init]) {
|
||||
self.responseData = [NSMutableData data];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
+(NSString*)gistDescription{
|
||||
size_t size;
|
||||
sysctlbyname("hw.machine", NULL, &size, NULL, 0);
|
||||
char *machine = malloc(size);
|
||||
sysctlbyname("hw.machine", machine, &size, NULL, 0);
|
||||
NSString *platform = [NSString stringWithUTF8String:machine];
|
||||
free(machine);
|
||||
|
||||
NSString *gistDesc = [NSString stringWithFormat:@"iPhone Version: %@, iOS Version: %@", platform,[UIDevice currentDevice].systemVersion];
|
||||
|
||||
return gistDesc;
|
||||
}
|
||||
|
||||
#pragma mark Network delegates
|
||||
|
||||
-(void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data{
|
||||
[self.responseData appendData:data];
|
||||
}
|
||||
|
||||
- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
|
||||
[self.loadingAlertView dismissWithClickedButtonIndex:0 animated:YES];
|
||||
|
||||
NSError *error;
|
||||
NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:self.responseData options:0 error:&error];
|
||||
if (!error) {
|
||||
self.block(nil, [dict objectForKey:@"html_url"]);
|
||||
} else{
|
||||
DDLogError(@"Error on debug response: %@", error);
|
||||
self.block(error, nil);
|
||||
}
|
||||
}
|
||||
|
||||
- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
|
||||
|
||||
NSHTTPURLResponse* httpResponse = (NSHTTPURLResponse*)response;
|
||||
|
||||
if ( [httpResponse statusCode] != 201) {
|
||||
DDLogError(@"Failed to submit debug log: %@", httpResponse.debugDescription);
|
||||
[self.loadingAlertView dismissWithClickedButtonIndex:0 animated:YES];
|
||||
[connection cancel];
|
||||
self.block([NSError errorWithDomain:@"PastelogKit" code:10001 userInfo:@{}],nil);
|
||||
}
|
||||
}
|
||||
|
||||
- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
|
||||
[self.loadingAlertView dismissWithClickedButtonIndex:0 animated:YES];
|
||||
DDLogError(@"Uploading logs failed with error: %@", error);
|
||||
self.block(error,nil);
|
||||
}
|
||||
|
||||
#pragma mark Alert View Delegates
|
||||
|
||||
-(void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
|
||||
if (alertView == self.reportAlertView) {
|
||||
if (buttonIndex == 0) {
|
||||
if (self.block) {
|
||||
[[self class] submitLogsWithCompletion:self.block];
|
||||
} else{
|
||||
[[self class] submitLogs];
|
||||
}
|
||||
|
||||
} else{
|
||||
// User declined, nevermind.
|
||||
}
|
||||
} else if (alertView == self.submitAlertView) {
|
||||
if (buttonIndex == 0) {
|
||||
[self prepareRedirection:self.gistURL];
|
||||
} else if (buttonIndex == 1) {
|
||||
[self submitEmail:self.gistURL];
|
||||
} else {
|
||||
UIPasteboard *pb = [UIPasteboard generalPasteboard];
|
||||
[pb setString:self.gistURL];
|
||||
}
|
||||
} else if (alertView == self.infoAlertView) {
|
||||
[UIApplication.sharedApplication openURL:[NSURL URLWithString:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"LOGS_URL"]]];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark Logs submission
|
||||
|
||||
- (void)submitEmail:(NSString*)url {
|
||||
NSString *emailAddress = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"LOGS_EMAIL"];
|
||||
|
||||
NSString *urlString = [NSString stringWithString: [[NSString stringWithFormat:@"mailto:%@?subject=iOS%%20Debug%%20Log&body=", emailAddress] stringByAppendingString:[[NSString stringWithFormat:@"Log URL: %@ \n Tell us about the issue: ", url]stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]]];
|
||||
|
||||
[UIApplication.sharedApplication openURL: [NSURL URLWithString: urlString]];
|
||||
}
|
||||
|
||||
- (void)prepareRedirection:(NSString*)url {
|
||||
UIPasteboard *pb = [UIPasteboard generalPasteboard];
|
||||
[pb setString:url];
|
||||
self.infoAlertView = [[UIAlertView alloc]initWithTitle:@"GitHub redirection" message:@"The gist link was copied in your clipboard. You are about to be redirected to the GitHub issue list." delegate:self cancelButtonTitle:@"OK" otherButtonTitles: nil];
|
||||
[self.infoAlertView show];
|
||||
}
|
||||
|
||||
@end
|
Loading…
Reference in New Issue