diff --git a/netfox-info.plist b/netfox-info.plist index 506a898f..6d337ff6 100644 --- a/netfox-info.plist +++ b/netfox-info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.11.1 + 1.15.0 CFBundleSignature ???? CFBundleVersion diff --git a/netfox.podspec b/netfox.podspec index 49fd2174..9e786eda 100644 --- a/netfox.podspec +++ b/netfox.podspec @@ -1,8 +1,8 @@ Pod::Spec.new do |s| s.name = "netfox" - s.version = "1.14.0" + s.version = "1.15.0" s.summary = "A lightweight, one line setup, iOS/OSX network debugging library!" - + s.description = <<-DESC A lightweight, one line setup, network debugging library that provides a quick look on all executed network requests performed by your app. It grabs all requests - of course yours, requests from 3rd party libraries (such as AFNetworking or else), UIWebViews, and more. Very useful and handy for network related issues and bugs. DESC @@ -18,5 +18,5 @@ DESC s.requires_arc = true s.source_files = "netfox/Core/*.{swift,h,m}" s.ios.source_files = "netfox/iOS/*.swift" - s.osx.source_files = "netfox/OSX/*.{swift,xib}" + s.osx.source_files = "netfox/OSX/*.{swift,xib}" end diff --git a/netfox/iOS/NFXDetailsController_iOS.swift b/netfox/iOS/NFXDetailsController_iOS.swift index 9df2965b..9395257c 100755 --- a/netfox/iOS/NFXDetailsController_iOS.swift +++ b/netfox/iOS/NFXDetailsController_iOS.swift @@ -179,19 +179,19 @@ class NFXDetailsController_iOS: NFXDetailsController, MFMailComposeViewControlle actionSheetController.addAction(cancelAction) let simpleLog: UIAlertAction = UIAlertAction(title: "Simple log", style: .default) { [unowned self] action -> Void in - self.shareLog(full: false) + self.shareLog(full: false, sender: sender) } actionSheetController.addAction(simpleLog) let fullLogAction: UIAlertAction = UIAlertAction(title: "Full log", style: .default) { [unowned self] action -> Void in - self.shareLog(full: true) + self.shareLog(full: true, sender: sender) } actionSheetController.addAction(fullLogAction) if let reqCurl = self.selectedModel.requestCurl { let curlAction: UIAlertAction = UIAlertAction(title: "Export request as curl", style: .default) { [unowned self] action -> Void in let activityViewController = UIActivityViewController(activityItems: [reqCurl], applicationActivities: nil) - activityViewController.popoverPresentationController?.sourceView = self.view + activityViewController.popoverPresentationController?.barButtonItem = sender self.present(activityViewController, animated: true, completion: nil) } actionSheetController.addAction(curlAction) @@ -199,6 +199,7 @@ class NFXDetailsController_iOS: NFXDetailsController, MFMailComposeViewControlle actionSheetController.view.tintColor = UIColor.NFXOrangeColor() + actionSheetController.popoverPresentationController?.barButtonItem = sender self.present(actionSheetController, animated: true, completion: nil) } @@ -282,7 +283,7 @@ class NFXDetailsController_iOS: NFXDetailsController, MFMailComposeViewControlle return bodyDetailsController } - func shareLog(full: Bool) + func shareLog(full: Bool, sender: UIBarButtonItem) { var tempString = String() @@ -308,12 +309,13 @@ class NFXDetailsController_iOS: NFXDetailsController, MFMailComposeViewControlle tempString += responseFileData } } - displayShareSheet(shareContent: tempString) + displayShareSheet(shareContent: tempString, sender: sender) } - func displayShareSheet(shareContent: String) { + func displayShareSheet(shareContent: String, sender: UIBarButtonItem) { self.sharedContent = shareContent let activityViewController = UIActivityViewController(activityItems: [self], applicationActivities: nil) + activityViewController.popoverPresentationController?.barButtonItem = sender present(activityViewController, animated: true, completion: nil) } }