diff --git a/src/iOS.Extension/ActionViewController.cs b/src/iOS.Extension/ActionViewController.cs index 41265508e..4be6d004f 100644 --- a/src/iOS.Extension/ActionViewController.cs +++ b/src/iOS.Extension/ActionViewController.cs @@ -28,25 +28,33 @@ namespace Bit.iOS.Extension { foreach(var itemProvider in item.Attachments) { - if(itemProvider.HasItemConformingTo(UTType.PropertyList)) + if(!itemProvider.HasItemConformingTo(UTType.PropertyList)) { - itemProvider.LoadItem(UTType.PropertyList, null, delegate (NSObject list, NSError error) - { - if(list != null) - { - var dict = list as NSDictionary; - var result = dict[NSJavaScriptExtension.PreprocessingResultsKey]; - if(result != null) - { - Content = result.ValueForKey(new NSString("content")) as NSString; - Uri = new Uri(result.ValueForKey(new NSString("uri")) as NSString); - Console.WriteLine("BITWARDEN LOG, Content: {0}", Content); - Console.WriteLine("BITWARDEN LOG, Uri: {0}", Uri); - } - } - }); - break; + continue; } + + itemProvider.LoadItem(UTType.PropertyList, null, (NSObject list, NSError error) => + { + if(list == null) + { + return; + } + + var dict = list as NSDictionary; + var result = dict[NSJavaScriptExtension.PreprocessingResultsKey]; + if(result == null) + { + return; + } + + Content = result.ValueForKey(new NSString("content")) as NSString; + Uri = new Uri(result.ValueForKey(new NSString("uri")) as NSString); + + Console.WriteLine("BITWARDEN LOG, Content: {0}", Content); + Console.WriteLine("BITWARDEN LOG, Uri: {0}", Uri); + }); + + break; } } } diff --git a/src/iOS.Extension/extension.js b/src/iOS.Extension/extension.js index 50477976b..b5984f120 100644 --- a/src/iOS.Extension/extension.js +++ b/src/iOS.Extension/extension.js @@ -2,6 +2,9 @@ BitwardenExtension.prototype = { run: function (arguments) { + console.log("Run"); + console.log(arguments); + var args = { content: document.body.innerHTML, uri: document.baseURI @@ -9,7 +12,8 @@ BitwardenExtension.prototype = { arguments.completionFunction(args); }, finalize: function (arguments) { - alert('finalize'); + console.log("Finalize"); + console.log(arguments); } };