From 2ca370f41441e9f8a5043e50f45e76fa11ea5655 Mon Sep 17 00:00:00 2001 From: Charlotte Tortorella Date: Sat, 11 Nov 2017 20:07:33 +1100 Subject: [PATCH] Add support for Xirvik rTorrent --- Sources/Connection Handler/TorrentJobChecker.m | 2 ++ Sources/Supporting Files/BarMagnet-Info.plist | 6 +++--- Sources/Torrent Interface/Front End/Xirvik_rTorrent.m | 1 - Sources/View Controllers/XirvikQRCodeViewController.m | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Sources/Connection Handler/TorrentJobChecker.m b/Sources/Connection Handler/TorrentJobChecker.m index 3359016..45f2a88 100644 --- a/Sources/Connection Handler/TorrentJobChecker.m +++ b/Sources/Connection Handler/TorrentJobChecker.m @@ -43,6 +43,8 @@ - (void)jobCheckInvocation { @autoreleasepool { double t = clock(); NSMutableURLRequest *request = [TorrentDelegate.sharedInstance.currentlySelectedClient checkTorrentJobs]; + NSLog(@"%@", request.URL.absoluteString); + NSLog(@"%@", request.allHTTPHeaderFields); [request setTimeoutInterval:0x20]; if (request) { //[NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:request.URL.host]; diff --git a/Sources/Supporting Files/BarMagnet-Info.plist b/Sources/Supporting Files/BarMagnet-Info.plist index 78b4700..6f2932d 100644 --- a/Sources/Supporting Files/BarMagnet-Info.plist +++ b/Sources/Supporting Files/BarMagnet-Info.plist @@ -38,7 +38,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.9.3 + 1.9.4 CFBundleSignature ???? CFBundleURLTypes @@ -67,6 +67,8 @@ NSAllowsArbitraryLoads + NSCameraUsageDescription + We need to use the camera in order to scan QR codes UIBackgroundModes fetch @@ -130,7 +132,5 @@ - NSCameraUsageDescription - We need to use the camera in order to scan QR codes diff --git a/Sources/Torrent Interface/Front End/Xirvik_rTorrent.m b/Sources/Torrent Interface/Front End/Xirvik_rTorrent.m index 26e8201..a8daca4 100644 --- a/Sources/Torrent Interface/Front End/Xirvik_rTorrent.m +++ b/Sources/Torrent Interface/Front End/Xirvik_rTorrent.m @@ -37,7 +37,6 @@ - (NSMutableURLRequest *)universalPOSTSetting { [request setValue:@"gzip" forHTTPHeaderField:@"Accept-Encoding"]; [request setValue:@"Basic Og==" forHTTPHeaderField:@"Authorization"]; [request setValue:[[self getWebDataForKey:@"password"] orSome:@""] forHTTPHeaderField:@"X-QR-Auth"]; - NSLog(@"%@", request.URL.absoluteString); return request; } diff --git a/Sources/View Controllers/XirvikQRCodeViewController.m b/Sources/View Controllers/XirvikQRCodeViewController.m index a96b329..4e5c29f 100644 --- a/Sources/View Controllers/XirvikQRCodeViewController.m +++ b/Sources/View Controllers/XirvikQRCodeViewController.m @@ -17,7 +17,7 @@ @implementation XirvikQRCodeViewController - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects:(NSArray *)metadataObjects fromConnection:(AVCaptureConnection *)connection { NSArray * elements = [[metadataObjects.firstObject stringValue] componentsSeparatedByString:@"\n"]; - if (elements.count == 3 && [elements[1] isEqual:@"P"] && !self.dismissing) { + if (elements.count == 3 && !self.dismissing) { self.dismissing = YES; self.delegate.hostnameField.text = elements[0]; self.delegate.passwordField.text = elements[2];