Permalink
Browse files

Commit all recent changes - get plugin working with MAS version of 1Pwd

I've been really bad about committing changes recently :(
  • Loading branch information...
1 parent f2ba8c6 commit 407f6e3aee2fd19f4b5a882f5cd0ed71741b2191 @pjrobertson pjrobertson committed Dec 9, 2011
View
@@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
- <string>2.2.0</string>
+ <string>2.3.3</string>
<key>CFBundleVersion</key>
- <string>27E</string>
+ <string>2F7</string>
<key>QSActions</key>
<dict>
<key>goAndFill</key>
@@ -90,7 +90,10 @@
<key>description</key>
<string>Adds support for 1Password Data to Reveal in 1Password and to Go &amp; Fill web forms</string>
<key>extendedDescription</key>
- <string>&lt;h3&gt;1Password 3 Plugin&lt;/h3&gt;&lt;p&gt;This plugin enables right arrowing into the 1Password application, giving access to data saved in 1Password&lt;br /&gt;&lt;p&gt;Web logins objects, have 'Go &amp; Fill' action, as well as a 'Go &amp; Fill With...' action. &lt;/p&gt;&lt;p&gt;These actions works with the comma trick, so you can open multiple logins at once, or open them in multiple browsers&lt;/p&gt;&lt;p&gt;1Password data can be indexed directly in the Quicksilver catalog by 'ticking' any of the 1Password data types in the Preferences→Catalog→Modules pane (disabled by default)&lt;br /&gt;
This plugin also adds support for 'Reveal in 1Password' for all data types: web forms, accounts, software, identities, wallet items and notes using the action 'Reveal in 1Password'&lt;/p&gt;&lt;p&gt;This plugin has taken a lot of development, so please consider &lt;a href="http://patjack.co.uk/donating-for-my-quicksilver-1password-plugin/"&gt;donating&lt;/a&gt;.&lt;/p&gt;</string>
+ <string>&lt;h3&gt;1Password 3 Plugin&lt;/h3&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;
+
&lt;p&gt;This plugin enables right arrowing into the 1Password application, giving access to data saved in 1Password&lt;br /&gt;&lt;p&gt;Web logins objects, have 'Go &amp; Fill' action, as well as a 'Go &amp; Fill With...' action. &lt;/p&gt;&lt;p&gt;These actions works with the comma trick, so you can open multiple logins at once, or open them in multiple browsers&lt;/p&gt;&lt;p&gt;1Password data can be indexed directly in the Quicksilver catalog by 'ticking' any of the 1Password data types in the Preferences→Catalog→Modules pane (disabled by default)&lt;br /&gt;
This plugin also adds support for 'Reveal in 1Password' for all data types: web forms, accounts, software, identities, wallet items and notes using the action 'Reveal in 1Password'&lt;/p&gt;</string>
<key>icon</key>
<string>ws.agile.1Password</string>
</dict>
@@ -190,8 +193,6 @@
<string>ws.agile.1Password</string>
<key>name</key>
<string>1Password</string>
- <key>requiresBundle</key>
- <string>ws.agile.1Password</string>
<key>source</key>
<string>QSGroupObjectSource</string>
</dict>
@@ -205,6 +206,8 @@
</dict>
<key>QSBundleChildHandlers</key>
<dict>
+ <key>com.agilebits.onepassword-osx</key>
+ <string>OnePasswordSource</string>
<key>ws.agile.1Password</key>
<string>OnePasswordSource</string>
</dict>
@@ -168,6 +168,7 @@
0259C573FE90428111CA0C5A /* Project object */ = {
isa = PBXProject;
attributes = {
+ LastUpgradeCheck = 0420;
ORGANIZATIONNAME = "Patrick Robertson";
};
buildConfigurationList = 7F6B3EEF085CE8DF000735A8 /* Build configuration list for PBXProject "OnePassword" */;
@@ -233,7 +234,6 @@
);
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -247,7 +247,6 @@
INFOPLIST_FILE = Info.plist;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
- PREBINDING = YES;
PRODUCT_NAME = OnePassword;
WRAPPER_EXTENSION = qsplugin;
};
@@ -264,7 +263,6 @@
"\"$(DEVELOPER_DIR)/Frameworks\"",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = OnePassword_Prefix.pch;
@@ -285,7 +283,6 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.5;
- PREBINDING = YES;
SDKROOT = macosx;
};
name = Development;

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+ <true/>
+ <key>IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges</key>
+ <true/>
+</dict>
+</plist>
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+ type = "1"
+ version = "1.0">
+ <FileBreakpoints>
+ <FileBreakpoint
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ isPathRelative = "1"
+ filePath = "OnePasswordAction.m"
+ timestampString = "338830911.671972"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "31"
+ endingLineNumber = "31"
+ landmarkName = "-validActionsForDirectObject:indirectObject:"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ isPathRelative = "1"
+ filePath = "OnePasswordAction.m"
+ timestampString = "338830911.6720031"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "44"
+ endingLineNumber = "44"
+ landmarkName = "-validIndirectObjectsForAction:directObject:"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ isPathRelative = "1"
+ filePath = "OnePasswordAction.m"
+ timestampString = "338830911.67203"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "93"
+ endingLineNumber = "93"
+ landmarkName = "-goAndFill:with:"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ isPathRelative = "1"
+ filePath = "OnePasswordAction.m"
+ timestampString = "338830911.672057"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "125"
+ endingLineNumber = "125"
+ landmarkName = "-viewInOnePwd:"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ isPathRelative = "1"
+ filePath = "OnePasswordSource.m"
+ timestampString = "341276312.525471"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "41"
+ endingLineNumber = "41"
+ landmarkName = "-init"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ isPathRelative = "1"
+ filePath = "OnePasswordSource.m"
+ timestampString = "341277849.574576"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "108"
+ endingLineNumber = "108"
+ landmarkName = "-indexIsValidFromDate:forEntry:"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ isPathRelative = "1"
+ filePath = "OnePasswordSource.m"
+ timestampString = "341739641.913099"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "141"
+ endingLineNumber = "141"
+ landmarkName = "-objectsForEntry:"
+ landmarkType = "5">
+ </FileBreakpoint>
+ </FileBreakpoints>
+</Bucket>
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "8D1AC9600486D14A00FE50C9"
+ BuildableName = "OnePassword.qsplugin"
+ BlueprintName = "OnePassword"
+ ReferencedContainer = "container:OnePassword.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Development">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Development">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>SchemeUserState</key>
+ <dict>
+ <key>OnePassword.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>0</integer>
+ </dict>
+ </dict>
+ <key>SuppressBuildableAutocreation</key>
+ <dict>
+ <key>8D1AC9600486D14A00FE50C9</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ </dict>
+</dict>
+</plist>
View
@@ -41,6 +41,7 @@
@interface OnePasswordAction : QSActionProvider
{
+ NSString *bundleID;
}
- (void)formURLAndFillWith:(QSObject *)dObject andBrowsers:(QSObject *)iObject;
View
@@ -108,11 +108,9 @@ - (QSObject *)goAndFill:(QSObject *)dObject with:(QSObject *)iObject {
}
- (QSObject *)viewInOnePwd:(QSObject *)dObject {
-
// setup the terminal command
- NSString *command = @"defaults write ws.agile.1Password findUUID ";
- command = [command stringByAppendingString:[dObject identifier]];
-
+ NSString *command = [NSString stringWithFormat:@"defaults write ws.agile.1Password findUUID %@", [dObject identifier]];
+ NSLog(@"command: %@",command);
// load the script from a resource by fetching its URL from within our bundle
NSString *path=[[NSBundle bundleForClass:[self class]] pathForResource:@"RevealIn1Pwd" ofType:@"scpt"];
if (path != nil)
View
@@ -23,19 +23,34 @@
#import <QSCore/QSObjectSource.h>
+// Keychain location defines
+#define kOldKeychainLocation @"~/Library/Application Support/1Password/1Password.agilekeychain"
+#define kNewMASKeychainLocation @"~/Library/Containers/com.agilebits.onepassword-osx-helper/Data/Documents/1Password.agilekeychain"
+#define kDropboxLocation @"~/Dropbox/1Password.agilekeychain"
+
+// QSObject type defines
#define QS1PasswordForm @"QS1PasswordForm"
#define QS1PasswordSecureNote @"QS1PasswordSecureNote"
#define QS1PasswordIdentity @"QS1PasswordIdentity"
#define QS1PasswordSoftwareLicense @"QS1PasswordSoftwareLicense"
#define QS1PasswordOnlineService @"QS1PasswordOnlineService"
#define QS1PasswordWalletItem @"QS1PasswordWalletItem"
+// JSON defines
+#define kItemType @"type"
+
@interface OnePasswordSource : QSObjectSource
{
+ NSString *bundleID;
+ NSString *keychainPath;
+ NSImage *onePasswordImage;
}
+@property (retain) NSString *bundleID;
+@property (retain) NSString *keychainPath;
+@property (retain) NSImage *onePasswordImage;
@end
Oops, something went wrong.

0 comments on commit 407f6e3

Please sign in to comment.