mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-20 00:02:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move extensioncontext parsing into ViewDidLoad due to lifecycle conflicts with Safari. Fixed typo with plain-text activation predicate.

Browse source
This commit is contained in:
Kyle Spearrin 2016-06-24 19:24:00 -04:00
parent 80f127dd7f
commit f97b62c51d
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/iOS.Extension/Info.plist
View file

@ -30,20 +30,20 @@
<string>extension</string>
<key>NSExtensionActivationRule</key>
<string>SUBQUERY (
extensionItems,
$extensionItem,
SUBQUERY (
$extensionItem.attachments,
$attachment,
ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.url&quot;
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.plan-text&quot;
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;org.appextension.find-login-action&quot;
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;org.appextension.save-login-action&quot;
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;org.appextension.change-password-action&quot;
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;org.appextension.fill-webview-action&quot;
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;org.appextension.fill-browser-action&quot;
).@count == $extensionItem.attachments.@count
).@count == 1</string>
extensionItems,
$extensionItem,
SUBQUERY (
$extensionItem.attachments,
$attachment,
ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url"
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.plain-text"
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "org.appextension.find-login-action"
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "org.appextension.save-login-action"
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "org.appextension.change-password-action"
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "org.appextension.fill-webview-action"
|| ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "org.appextension.fill-browser-action"
).@count == $extensionItem.attachments.@count
).@count == 1</string>
<key>NSExtensionPointName</key>
<string>com.apple.ui-services</string>
<key>NSExtensionPointVersion</key>

9
src/iOS.Extension/LoadingViewController.cs
View file

@ -30,11 +30,6 @@ namespace Bit.iOS.Extension
base.ViewDidLoad();
View.BackgroundColor = UIColor.FromPatternImage(new UIImage("bg.png"));
_context.ExtContext = ExtensionContext;
}
public override void ViewDidAppear(bool animated)
{
base.ViewDidAppear(animated);
if(!Resolver.IsSet)
{
@ -63,7 +58,11 @@ namespace Bit.iOS.Extension
break;
}
}
}
public override void ViewDidAppear(bool animated)
{
base.ViewDidAppear(animated);
PerformSegue("seque", this);
}