Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

properly open items using the reveal in 1pwd action

  • Loading branch information...
commit 62166d9183fbe7cd26072a95fe927ef7b2bcc17f 1 parent 2e8fdc4
@pjrobertson authored
View
12 Info.plist
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.2</string>
+ <string>2.6.3</string>
<key>CFBundleVersion</key>
- <string>370</string>
+ <string>375</string>
<key>QSActions</key>
<dict>
<key>goAndFill</key>
@@ -104,17 +104,17 @@
&lt;li&gt;Wallet items&lt;/li&gt;
&lt;li&gt;Notes&lt;/li&gt;
&lt;/ul&gt;
-&lt;p&gt;You can access all these items by right arrowing (→) into the 1Password.app in Quicksilver's first pane.
-You may also add these items to your catalog by going to the &lt;a href="qs://preferences#QSCatalogPrefPane"&gt;Catalog preferences&lt;/a&gt; and enabling the '1Password' entry.&lt;/p&gt;
+&lt;p&gt;You can access all these items by right arrowing (→) into the 1Password.app in Quicksilver&apos;s first pane.
+You may also add these items to your catalog by going to the &lt;a href=&quot;qs://preferences#QSCatalogPrefPane&quot;&gt;Catalog preferences&lt;/a&gt; and enabling the &apos;1Password&apos; entry.&lt;/p&gt;
&lt;h3&gt;Actions&lt;/h3&gt;
&lt;p&gt;&lt;strong&gt;Go &amp;amp; Fill&lt;/strong&gt;&lt;/p&gt;
&lt;p&gt;The Go &amp;amp; Fill action is available for 1Password web forms. When run on a web form, the plugin takes you to your browser and logs you in using the login.&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Go &amp;amp; Fill With...&lt;/strong&gt;&lt;/p&gt;
-&lt;p&gt;This action is an extension of the 'Go &amp;amp; Fill' action, and allows you to specify a browser to use when filling the login/web form.&lt;/p&gt;
+&lt;p&gt;This action is an extension of the &apos;Go &amp;amp; Fill&apos; action, and allows you to specify a browser to use when filling the login/web form.&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Reveal in 1Password&lt;/strong&gt;&lt;/p&gt;
&lt;p&gt;The Reveal in 1Password action is available for all data types (see above). It launches 1Password and selects the entry in the application, allowing you to manipulate of view its details.&lt;/p&gt;
&lt;hr&gt;
-&lt;p&gt;This plugin has taken a lot of development time. If you enjoy using it, please consider &lt;a href="http://patjack.co.uk/donating-for-my-quicksilver-1password-plugin/"&gt;donating&lt;/a&gt;.&lt;/p&gt;</string>
+&lt;p&gt;This plugin has taken a lot of development time. If you enjoy using it, please consider &lt;a href=&quot;http://patjack.co.uk/donating-for-my-quicksilver-1password-plugin/&quot;&gt;donating&lt;/a&gt;.&lt;/p&gt;</string>
<key>icon</key>
<string>com.agilebits.onepassword-osx</string>
<key>relatedBundles</key>
View
6 OnePasswordAction.m
@@ -127,10 +127,10 @@ - (QSObject *)viewInOnePwd:(QSObject *)dObject {
// setup the terminal command
NSString *command;
if ([[[OnePasswordSource sharedInstance] bundleID] isEqualToString:kOnePasswordMASBundleID]) {
- command = [NSString stringWithFormat:@"defaults write %@ selectedObjects -array %@", kOnePasswordMASBundleID, [dObject identifier]];
+ command = [NSString stringWithFormat:@"defaults write %@ selectedObjects -array %@", kOnePasswordMASBundleID, [dObject primaryObject]];
}
else {
- command = [NSString stringWithFormat:@"defaults write %@ findUUID %@", kOnePasswordOldBundleID, [dObject identifier]];
+ command = [NSString stringWithFormat:@"defaults write %@ findUUID %@", kOnePasswordOldBundleID, [dObject primaryObject]];
}
NSLog(@"command: %@",command);
@@ -144,7 +144,7 @@ - (QSObject *)viewInOnePwd:(QSObject *)dObject {
if (appleScript != nil)
{
// create the parameters
- NSAppleEventDescriptor* firstParameter = [NSAppleEventDescriptor descriptorWithString:[dObject name]];
+ NSAppleEventDescriptor* firstParameter = [NSAppleEventDescriptor descriptorWithString:[dObject label]];
NSAppleEventDescriptor* secondParameter = [NSAppleEventDescriptor descriptorWithString:command];
NSAppleEventDescriptor* thirdParameter = [NSAppleEventDescriptor descriptorWithString:[dObject primaryType]];
View
18 OnePasswordSource.m
@@ -225,7 +225,7 @@ - (NSArray *)objectsForEntry:(NSDictionary *)theEntry{
else if ([objectType hasPrefix:@"wallet.financial"])
{
if ([type isEqualToString:@"WalletItem"] || [[theEntry objectForKey:@"LoadingChildren"] boolValue]) {
- [newObject setObject:title forType:QS1PasswordWalletItem];
+ [newObject setObject:uuidString forType:QS1PasswordWalletItem];
[newObject setIcon:[[[NSImage alloc] initByReferencingFile:[OnePasswordBundle pathForResource:@"wallet-icon-128" ofType:@"png"]] autorelease]];
[objects addObject:newObject];
}
@@ -235,7 +235,7 @@ - (NSArray *)objectsForEntry:(NSDictionary *)theEntry{
else if ([objectType hasPrefix:@"wallet.computer"])
{
if ([type isEqualToString:@"SoftwareLicense"] || [[theEntry objectForKey:@"LoadingChildren"] boolValue]) {
- [newObject setObject:title forType:QS1PasswordSoftwareLicense];
+ [newObject setObject:uuidString forType:QS1PasswordSoftwareLicense];
[newObject setIcon:[QSResourceManager imageNamed:@"ToolbarAppsFolderIcon"]];
[objects addObject:newObject];
}
@@ -245,7 +245,7 @@ - (NSArray *)objectsForEntry:(NSDictionary *)theEntry{
else if ([objectType hasPrefix:@"wallet.onlineservices"])
{
if ([type isEqualToString:@"OnlineService"] || [[theEntry objectForKey:@"LoadingChildren"] boolValue]) {
- [newObject setObject:title forType:QS1PasswordOnlineService];
+ [newObject setObject:uuidString forType:QS1PasswordOnlineService];
[newObject setIcon:[[[NSImage alloc] initByReferencingFile:[OnePasswordBundle pathForResource:@"logins-icon-128" ofType:@"png"]] autorelease]];
[objects addObject:newObject];
}
@@ -270,28 +270,28 @@ - (NSArray *)objectsForEntry:(NSDictionary *)theEntry{
// Object Handler Methods
// An icon that is either already in memory or easy to load
- (void)setQuickIconForObject:(QSObject *)object{
- if ([[object primaryType] isEqualToString:@"QS1PasswordForm"])
+ if ([[object primaryType] isEqualToString:QS1PasswordForm])
{
[object setIcon:[QSResourceManager imageNamed:bundleID]];
}
- else if([[object primaryType] isEqualToString:@"QS1PasswordSecureNote"])
+ else if([[object primaryType] isEqualToString:QS1PasswordSecureNote])
{
[object setIcon:[QSResourceManager imageNamed:@"secure-notes-icon-128.png" inBundle:[NSBundle bundleWithIdentifier:bundleID]]];
// [[[NSImage alloc] initByReferencingFile:[[NSBundle bundleWithIdentifier:bundleID] pathForResource:@"secure-notes-icon-128" ofType:@"png"]]autorelease]];
}
- else if([[object primaryType] isEqualToString:@"QS1PasswordOnlineService"])
+ else if([[object primaryType] isEqualToString:QS1PasswordOnlineService])
{
[object setIcon:[QSResourceManager imageNamed:@"logins-icon-128.png" inBundle:[NSBundle bundleWithIdentifier:bundleID]]];
}
- else if([[object primaryType] isEqualToString:@"QS1PasswordWalletItem"])
+ else if([[object primaryType] isEqualToString:QS1PasswordWalletItem])
{
[object setIcon:[QSResourceManager imageNamed:@"wallet-icon-128.png" inBundle:[NSBundle bundleWithIdentifier:bundleID]]];
}
- else if([[object primaryType] isEqualToString:@"QS1PasswordIdentity"])
+ else if([[object primaryType] isEqualToString:QS1PasswordIdentity])
{
[object setIcon:[QSResourceManager imageNamed:@"UserIcon"]];
}
- else if([[object primaryType] isEqualToString:@"QS1PasswordSoftwareLicense"])
+ else if([[object primaryType] isEqualToString:QS1PasswordSoftwareLicense])
{
[object setIcon:[QSResourceManager imageNamed:@"ToolbarAppsFolderIcon"]];
}
View
BIN  bltrversion
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.