Minor change.

[UPDATED]   Allow lookup by short name.
[FIXED]     GUI only supports generated types, only show generated types in its list.
[UPDATED]   Update site password when type changes.
[FIXED]     Exceptions on illegal input arguments for generation, eg. empty site name.

.gitignore

@@ -2,6 +2,7 @@
 .DS_Store
 
 # IntelliJ
+/MasterPassword/Java/.idea
 /.idea/*
 !/.idea/encodings.xml
 !/.idea/inspectionProfiles
@@ -12,13 +13,8 @@
 /*.iws
 
 # Xcode IDE
-/*.xcodeproj/*
-!/*.xcodeproj/*.pbxproj
-!/*.xcodeproj/xcshareddata
-!/*.xcodeproj/xcshareddata/*
-!/*.xcodeproj/project.xcworkspace
-!/*.xcodeproj/project.xcworkspace/*
-/*.xcodeproj/project.xcworkspace/xcuserdata
+xcuserdata/
+/DerivedData/
 
 # Media
 Press/Background.png
@@ -31,3 +27,9 @@ Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf
 
 # Java
 MasterPassword/Java/**/target
+
+# C
+MasterPassword/C/*.o
+MasterPassword/C/mpw
+MasterPassword/C/lib/*/*
+!MasterPassword/C/lib/*/.source

.gitmodules

@@ -3,10 +3,10 @@
 	url = git://github.com/Lyndir/Pearl.git
 [submodule "External/InAppSettingsKit"]
 	path = External/InAppSettingsKit
-	url = git://github.com/futuretap/InAppSettingsKit.git
-[submodule "External/iCloudStoreManager"]
-	path = External/iCloudStoreManager
-	url = git://github.com/lhunath/iCloudStoreManager.git
-[submodule "External/FontReplacer"]
-	path = External/FontReplacer
-	url = git://github.com/0xced/FontReplacer.git
+	url = git://github.com/lhunath/InAppSettingsKit.git
+[submodule "External/UbiquityStoreManager"]
+	path = External/UbiquityStoreManager
+	url = git://github.com/lhunath/UbiquityStoreManager.git
+[submodule "External/RHStatusItemView"]
+	path = External/RHStatusItemView
+	url = git://github.com/lhunath/RHStatusItemView.git

.idea/inspectionProfiles/Project_Default.xml

@@ -3,9 +3,15 @@
     <option name="myName" value="Project Default" />
     <option name="myLocal" value="false" />
     <inspection_tool class="FunctionImplicitDeclarationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ImplicitIntegerAndEnumConversion" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LossyEncoding" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="MethodIsLaterInTheScope" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OCNotLocalizedStringInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OCUnusedMacroInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="OCUnusedMethodInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SignednessMismatch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnavailableInDeploymentTarget" enabled="true" level="INFO" enabled_by_default="true" />
     <inspection_tool class="UnusedLocalVariable" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedParameter" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>

.travis.yml

@@ -0,0 +1,7 @@
+language: objective-c
+xcode_workspace: MasterPassword.xcworkspace
+xcode_scheme: MasterPassword iOS (Development)
+xcode_sdk: iphonesimulator
+git:
+  submodules: false
+before_install: ./Scripts/updateDependencies

Crashlytics/Crashlytics.framework/Versions/A/Resources/Runner

@@ -1 +0,0 @@
-../../../run

Crashlytics/Crashlytics.framework/Versions/A/Resources/runner.rb

@@ -1,15 +0,0 @@
-#!/usr/bin/ruby
-
-#
-#  WARNING: DO NOT MODIFY THIS FILE.
-#
-#  Crashlytics
-#  Crashlytics Version: 1.0.0.1
-#  
-#  Copyright Crashlytics, Inc. 2012. All rights reserved.
-#
-
-require 'pathname'
-
-path = Pathname.new(__FILE__).parent
-`#{path}/../../../run`

External/Mac/Crashlytics.framework/Versions/A/Headers/Crashlytics.h

@@ -2,17 +2,17 @@
 //  Crashlytics.h
 //  Crashlytics
 //
-//  Copyright 2012 Crashlytics, Inc. All rights reserved.
+//  Copyright 2013 Crashlytics, Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
 
 /**
  *
- * The CLS_LOG macro provides as easy way to gather more information in your log messages that are 
- * sent with your crash data. CLS_LOG prepends your custom log message with the function name and 
- * line number where the macro was used. If your app was built with the DEBUG preprocessor macro 
- * defined CLS_LOG uses the CLSNSLog function which forwards your log message to NSLog and CLSLog. 
+ * The CLS_LOG macro provides as easy way to gather more information in your log messages that are
+ * sent with your crash data. CLS_LOG prepends your custom log message with the function name and
+ * line number where the macro was used. If your app was built with the DEBUG preprocessor macro
+ * defined CLS_LOG uses the CLSNSLog function which forwards your log message to NSLog and CLSLog.
  * If the DEBUG preprocessor macro is not defined CLS_LOG uses CLSLog only.
  *
  * Example output:
@@ -26,41 +26,30 @@
  *
  **/
 #ifdef DEBUG
-	#define CLS_LOG(__FORMAT__, ...) CLSNSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__);
+#define CLS_LOG(__FORMAT__, ...) CLSNSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
 #else
-	#define CLS_LOG(__FORMAT__, ...) CLSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__);
+#define CLS_LOG(__FORMAT__, ...) CLSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
 #endif
 
 /**
- * 
+ *
  * Add logging that will be sent with your crash data. This logging will not show up in the system.log
  * and will only be visible in your Crashlytics dashboard.
  *
  **/
-void CLSLog(NSString *format, ...);
+OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
 
 /**
  *
  * Add logging that will be sent with your crash data. This logging will show up in the system.log
- * and your Crashlytics dashboard. It is not reccomended for Release builds.
+ * and your Crashlytics dashboard. It is not recommended for Release builds.
  *
  **/
-void CLSNSLog(NSString *format, ...);
+OBJC_EXTERN void CLSNSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
 
 @protocol CrashlyticsDelegate;
 
-@interface Crashlytics : NSObject {
-@private
-	NSString *_apiKey;
-	NSString *_dataDirectory;
-	NSString *_bundleIdentifier;
-	BOOL _installed;
-	NSMutableDictionary *_customAttributes;
-	id _user;
-	NSInteger _sendButtonIndex;
-	NSInteger _alwaysSendButtonIndex;
-	NSObject <CrashlyticsDelegate> *_delegate;
-}
+@interface Crashlytics : NSObject
 
 @property (nonatomic, readonly, copy) NSString *apiKey;
 @property (nonatomic, readonly, copy) NSString *version;
@@ -73,7 +62,7 @@ void CLSNSLog(NSString *format, ...);
  * The recommended way to install Crashlytics into your application is to place a call
  * to +startWithAPIKey: in your -application:didFinishLaunchingWithOptions: method.
  *
- * This delay defaults to 1 second in order to generally give the application time to 
+ * This delay defaults to 1 second in order to generally give the application time to
  * fully finish launching.
  *
  **/
@@ -105,21 +94,21 @@ void CLSNSLog(NSString *format, ...);
 
 /**
  *
- * Many of our customers have requested the ability to tie crashes to specific end-users of their 
- * application in order to facilitate responses to support requests or permit the ability to reach 
- * out for more information. We allow you to specify up to three separate values for display within 
+ * Many of our customers have requested the ability to tie crashes to specific end-users of their
+ * application in order to facilitate responses to support requests or permit the ability to reach
+ * out for more information. We allow you to specify up to three separate values for display within
  * the Crashlytics UI - but please be mindful of your end-user's privacy.
  *
- * We recommend specifying a user identifier - an arbitrary string that ties an end-user to a record 
- * in your system. This could be a database id, hash, or other value that is meaningless to a 
+ * We recommend specifying a user identifier - an arbitrary string that ties an end-user to a record
+ * in your system. This could be a database id, hash, or other value that is meaningless to a
  * third-party observer but can be indexed and queried by you.
  *
- * Optionally, you may also specify the end-user's name or username, as well as email address if you 
+ * Optionally, you may also specify the end-user's name or username, as well as email address if you
  * do not have a system that works well with obscured identifiers.
  *
- * Pursuant to our EULA, this data is transferred securely throughout our system and we will not 
- * disseminate end-user data unless required to by law. That said, if you choose to provide end-user 
- * contact information, we strongly recommend that you disclose this in your application's privacy 
+ * Pursuant to our EULA, this data is transferred securely throughout our system and we will not
+ * disseminate end-user data unless required to by law. That said, if you choose to provide end-user
+ * contact information, we strongly recommend that you disclose this in your application's privacy
  * policy. Data privacy is of our utmost concern.
  *
  **/
@@ -148,10 +137,55 @@ void CLSNSLog(NSString *format, ...);
 
 @end
 
+/**
+ * The CLSCrashReport protocol exposes methods that you can call on crash report objects passed
+ * to delegate methods. If you want these values or the entire object to stay in memory retain
+ * them or copy them.
+ **/
+@protocol CLSCrashReport <NSObject>
+@required
+
+/**
+ * Returns the session identifier for the crash report.
+ **/
+@property (nonatomic, readonly) NSString *identifier;
+
+/**
+ * Returns the custom key value data for the crash report.
+ **/
+@property (nonatomic, readonly) NSDictionary *customKeys;
+
+/**
+ * Returns the CFBundleVersion of the application that crashed.
+ **/
+@property (nonatomic, readonly) NSString *bundleVersion;
+
+/**
+ * Returns the CFBundleShortVersionString of the application that crashed.
+ **/
+@property (nonatomic, readonly) NSString *bundleShortVersionString;
+
+/**
+ * Returns the date that the application crashed at.
+ **/
+@property (nonatomic, readonly) NSDate *crashedOnDate;
+
+/**
+ * Returns the os version that the application crashed on.
+ **/
+@property (nonatomic, readonly) NSString *OSVersion;
+
+/**
+ * Returns the os build version that the application crashed on.
+ **/
+@property (nonatomic, readonly) NSString *OSBuildVersion;
+
+@end
+
 /**
  *
  * The CrashlyticsDelegate protocol provides a mechanism for your application to take
- * action on events that occur in the Crashlytics crash reporting system.  You can make 
+ * action on events that occur in the Crashlytics crash reporting system.  You can make
  * use of these calls by assigning an object to the Crashlytics' delegate property directly,
  * or through the convenience startWithAPIKey:delegate:... methods.
  *
@@ -161,7 +195,7 @@ void CLSNSLog(NSString *format, ...);
 
 /**
  *
- * Called once a Crashlytics instance has determined that the last execution of the 
+ * Called once a Crashlytics instance has determined that the last execution of the
  * application ended in a crash.  This is called some time after the crash reporting
  * process has begun.  If you have specified a delay in one of the
  * startWithAPIKey:... calls, this will take at least that long to be invoked.
@@ -169,4 +203,15 @@ void CLSNSLog(NSString *format, ...);
  **/
 - (void)crashlyticsDidDetectCrashDuringPreviousExecution:(Crashlytics *)crashlytics;
 
+/**
+ *
+ * Just like crashlyticsDidDetectCrashDuringPreviousExecution this delegate method is
+ * called once a Crashlytics instance has determined that the last execution of the
+ * application ended in a crash. A CLSCrashReport is passed back that contains data about
+ * the last crash report that was generated. See the CLSCrashReport protocol for method details.
+ * This method is called after crashlyticsDidDetectCrashDuringPreviousExecution.
+ *
+ **/
+- (void)crashlytics:(Crashlytics *)crashlytics didDetectCrashDuringPreviousExecution:(id <CLSCrashReport>)crash;
+
 @end

External/Mac/Crashlytics.framework/Versions/A/Resources/Info.plist

@@ -0,0 +1,30 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Crashlytics</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.crashlytics.sdk.mac</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Crashlytics</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.1.2</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>macosx</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>9</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
+	<key>MinimumOSVersion</key>
+	<string>10.6</string>
+</dict>
+</plist>

External/Reveal.framework/Headers

@@ -0,0 +1 @@
+Versions/Current/Headers

External/Reveal.framework/Reveal

@@ -0,0 +1 @@
+Versions/Current/Reveal

External/Reveal.framework/Versions/A/Headers/IBARevealLoader.h

@@ -0,0 +1,17 @@
+//
+// Copyright (c) 2013 Itty Bitty Apps. All rights reserved.
+
+#import <Foundation/Foundation.h>
+
+extern NSString * const IBARevealLoaderRequestStartNotification;
+extern NSString * const IBARevealLoaderRequestStopNotification;
+
+extern NSString * const IBARevealLoaderSetOptionsNotification;
+extern NSString * const IBARevealLoaderOptionsLogLevelMaskKey;
+
+@interface IBARevealLoader : NSObject
+
++ (void)startServer;
++ (void)stopServer;
+
+@end

External/Reveal.framework/Versions/A/Headers/IBARevealLogger.h

@@ -0,0 +1,57 @@
+//  Copyright (c) 2013 Itty Bitty Apps Pty Ltd. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+CF_EXTERN_C_BEGIN
+
+/*!
+ \brief         The Reveal Log level bit flags.
+ \discussion    These flags are additive.  i.e. you should bitwise OR them together.  
+
+ \seealso       IBARevealLoggerSetLevelMask
+ \seealso       IBARevealLoggerGetLevelMask
+ 
+    Example:
+ 
+    // Enable Error, Warning and Info logger levels.
+    IBARevealLoggerSetLevelMask(IBARevealLogLevelError|IBARevealLogLevelWarn|IBARevealLogLevelInfo);
+ 
+ */
+typedef NS_OPTIONS(int32_t, IBARevealLogLevel)
+{
+    IBARevealLogLevelNone  = 0,
+    IBARevealLogLevelDebug = (1 << 0),
+    IBARevealLogLevelInfo  = (1 << 1),
+    IBARevealLogLevelWarn  = (1 << 2),
+    IBARevealLogLevelError = (1 << 3)
+};
+
+/*!
+ \brief         Set the Reveal logger level mask.
+ \param         mask    A bit mask which is a combination of the IBARevealLogLevel enum options.
+ 
+ \discussion    If you do not wish to see log messages from Reveal you should call this function with an appropriate level mask as early in your application's lifecycle as possible. For example in your application's main() function.
+ 
+        Example:
+ 
+        // Enable Error, Warning and Info logger levels.
+        IBARevealLoggerSetLevelMask(IBARevealLogLevelError|IBARevealLogLevelWarn|IBARevealLogLevelInfo);
+ 
+ */
+CF_EXPORT void IBARevealLoggerSetLevelMask(int32_t mask);
+
+/*!
+ \brief         Get the current Reveal logger level mask.
+ \return        A bit mask representing the levels at which Reveal is currently logging.
+ \discussion    The default Reveal Logger level mask is IBARevealLogLevelError|IBARevealLogLevelWarn|IBARevealLogLevelInfo.
+ 
+        Example:
+ 
+        // Turn off the Info log level.
+        IBARevealLoggerSetLevelMask(IBARevealLoggerGetLevelMask() & ~IBARevealLogLevelInfo);
+ 
+ */
+CF_EXPORT int32_t IBARevealLoggerGetLevelMask(void);
+
+CF_EXTERN_C_END

External/Reveal.framework/Versions/A/Headers/Reveal.h

@@ -0,0 +1,5 @@
+//  Copyright (c) 2013 Itty Bitty Apps Pty Ltd. All rights reserved.
+//
+
+#import "IBARevealLogger.h"
+#import "IBARevealLoader.h"

External/Reveal.framework/Versions/Current

@@ -0,0 +1 @@
+A

External/iOS/Crashlytics.framework/Crashlytics

@@ -0,0 +1 @@
+Versions/Current/Crashlytics

External/iOS/Crashlytics.framework/Headers

@@ -0,0 +1 @@
+Versions/Current/Headers

External/iOS/Crashlytics.framework/Resources

@@ -0,0 +1 @@
+Versions/Current/Resources

External/iOS/Crashlytics.framework/Versions/A/Headers/Crashlytics.h

@@ -0,0 +1,217 @@
+//
+//  Crashlytics.h
+//  Crashlytics
+//
+//  Copyright 2013 Crashlytics, Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+/**
+ *
+ * The CLS_LOG macro provides as easy way to gather more information in your log messages that are
+ * sent with your crash data. CLS_LOG prepends your custom log message with the function name and
+ * line number where the macro was used. If your app was built with the DEBUG preprocessor macro
+ * defined CLS_LOG uses the CLSNSLog function which forwards your log message to NSLog and CLSLog.
+ * If the DEBUG preprocessor macro is not defined CLS_LOG uses CLSLog only.
+ *
+ * Example output:
+ * -[AppDelegate login:] line 134 $ login start
+ *
+ * If you would like to change this macro, create a new header file, unset our define and then define
+ * your own version. Make sure this new header file is imported after the Crashlytics header file.
+ *
+ * #undef CLS_LOG
+ * #define CLS_LOG(__FORMAT__, ...) CLSNSLog...
+ *
+ **/
+#ifdef DEBUG
+#define CLS_LOG(__FORMAT__, ...) CLSNSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+#else
+#define CLS_LOG(__FORMAT__, ...) CLSLog((@"%s line %d $ " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+#endif
+
+/**
+ *
+ * Add logging that will be sent with your crash data. This logging will not show up in the system.log
+ * and will only be visible in your Crashlytics dashboard.
+ *
+ **/
+OBJC_EXTERN void CLSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
+
+/**
+ *
+ * Add logging that will be sent with your crash data. This logging will show up in the system.log
+ * and your Crashlytics dashboard. It is not recommended for Release builds.
+ *
+ **/
+OBJC_EXTERN void CLSNSLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);
+
+@protocol CrashlyticsDelegate;
+
+@interface Crashlytics : NSObject
+
+@property (nonatomic, readonly, copy) NSString *apiKey;
+@property (nonatomic, readonly, copy) NSString *version;
+@property (nonatomic, assign)         BOOL      debugMode;
+
+@property (nonatomic, assign)         NSObject <CrashlyticsDelegate> *delegate;
+
+/**
+ *
+ * The recommended way to install Crashlytics into your application is to place a call
+ * to +startWithAPIKey: in your -application:didFinishLaunchingWithOptions: method.
+ *
+ * This delay defaults to 1 second in order to generally give the application time to
+ * fully finish launching.
+ *
+ **/
++ (Crashlytics *)startWithAPIKey:(NSString *)apiKey;
++ (Crashlytics *)startWithAPIKey:(NSString *)apiKey afterDelay:(NSTimeInterval)delay;
+
+/**
+ *
+ * If you need the functionality provided by the CrashlyticsDelegate protocol, you can use
+ * these convenience methods to activate the framework and set the delegate in one call.
+ *
+ **/
++ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(NSObject <CrashlyticsDelegate> *)delegate;
++ (Crashlytics *)startWithAPIKey:(NSString *)apiKey delegate:(NSObject <CrashlyticsDelegate> *)delegate afterDelay:(NSTimeInterval)delay;
+
+/**
+ *
+ * Access the singleton Crashlytics instance.
+ *
+ **/
++ (Crashlytics *)sharedInstance;
+
+/**
+ *
+ * The easiest way to cause a crash - great for testing!
+ *
+ **/
+- (void)crash;
+
+/**
+ *
+ * Many of our customers have requested the ability to tie crashes to specific end-users of their
+ * application in order to facilitate responses to support requests or permit the ability to reach
+ * out for more information. We allow you to specify up to three separate values for display within
+ * the Crashlytics UI - but please be mindful of your end-user's privacy.
+ *
+ * We recommend specifying a user identifier - an arbitrary string that ties an end-user to a record
+ * in your system. This could be a database id, hash, or other value that is meaningless to a
+ * third-party observer but can be indexed and queried by you.
+ *
+ * Optionally, you may also specify the end-user's name or username, as well as email address if you
+ * do not have a system that works well with obscured identifiers.
+ *
+ * Pursuant to our EULA, this data is transferred securely throughout our system and we will not
+ * disseminate end-user data unless required to by law. That said, if you choose to provide end-user
+ * contact information, we strongly recommend that you disclose this in your application's privacy
+ * policy. Data privacy is of our utmost concern.
+ *
+ **/
+- (void)setUserIdentifier:(NSString *)identifier;
+- (void)setUserName:(NSString *)name;
+- (void)setUserEmail:(NSString *)email;
+
++ (void)setUserIdentifier:(NSString *)identifier;
++ (void)setUserName:(NSString *)name;
++ (void)setUserEmail:(NSString *)email;
+
+/**
+ *
+ * Set a value for a key to be associated with your crash data.
+ *
+ **/
+- (void)setObjectValue:(id)value forKey:(NSString *)key;
+- (void)setIntValue:(int)value forKey:(NSString *)key;
+- (void)setBoolValue:(BOOL)value forKey:(NSString *)key;
+- (void)setFloatValue:(float)value forKey:(NSString *)key;
+
++ (void)setObjectValue:(id)value forKey:(NSString *)key;
++ (void)setIntValue:(int)value forKey:(NSString *)key;
++ (void)setBoolValue:(BOOL)value forKey:(NSString *)key;
++ (void)setFloatValue:(float)value forKey:(NSString *)key;
+
+@end
+
+/**
+ * The CLSCrashReport protocol exposes methods that you can call on crash report objects passed
+ * to delegate methods. If you want these values or the entire object to stay in memory retain
+ * them or copy them.
+ **/
+@protocol CLSCrashReport <NSObject>
+@required
+
+/**
+ * Returns the session identifier for the crash report.
+ **/
+@property (nonatomic, readonly) NSString *identifier;
+
+/**
+ * Returns the custom key value data for the crash report.
+ **/
+@property (nonatomic, readonly) NSDictionary *customKeys;
+
+/**
+ * Returns the CFBundleVersion of the application that crashed.
+ **/
+@property (nonatomic, readonly) NSString *bundleVersion;
+
+/**
+ * Returns the CFBundleShortVersionString of the application that crashed.
+ **/
+@property (nonatomic, readonly) NSString *bundleShortVersionString;
+
+/**
+ * Returns the date that the application crashed at.
+ **/
+@property (nonatomic, readonly) NSDate *crashedOnDate;
+
+/**
+ * Returns the os version that the application crashed on.
+ **/
+@property (nonatomic, readonly) NSString *OSVersion;
+
+/**
+ * Returns the os build version that the application crashed on.
+ **/
+@property (nonatomic, readonly) NSString *OSBuildVersion;
+
+@end
+
+/**
+ *
+ * The CrashlyticsDelegate protocol provides a mechanism for your application to take
+ * action on events that occur in the Crashlytics crash reporting system.  You can make
+ * use of these calls by assigning an object to the Crashlytics' delegate property directly,
+ * or through the convenience startWithAPIKey:delegate:... methods.
+ *
+ **/
+@protocol CrashlyticsDelegate <NSObject>
+@optional
+
+/**
+ *
+ * Called once a Crashlytics instance has determined that the last execution of the
+ * application ended in a crash.  This is called some time after the crash reporting
+ * process has begun.  If you have specified a delay in one of the
+ * startWithAPIKey:... calls, this will take at least that long to be invoked.
+ *
+ **/
+- (void)crashlyticsDidDetectCrashDuringPreviousExecution:(Crashlytics *)crashlytics;
+
+/**
+ *
+ * Just like crashlyticsDidDetectCrashDuringPreviousExecution this delegate method is
+ * called once a Crashlytics instance has determined that the last execution of the
+ * application ended in a crash. A CLSCrashReport is passed back that contains data about
+ * the last crash report that was generated. See the CLSCrashReport protocol for method details.
+ * This method is called after crashlyticsDidDetectCrashDuringPreviousExecution.
+ *
+ **/
+- (void)crashlytics:(Crashlytics *)crashlytics didDetectCrashDuringPreviousExecution:(id <CLSCrashReport>)crash;
+
+@end

External/iOS/Crashlytics.framework/Versions/A/Resources/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BuildMachineOSBuild</key>
-	<string>11E53</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -17,38 +15,16 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.5</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
+	<string>2.2.1</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0101.05.00</string>
-	<key>CrashlyticsAPIKey</key>
-	<string>0d10c90776f5ef5acd01ddbeaca9a6cba4814560</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>8H7</string>
+	<string>35</string>
 	<key>DTPlatformName</key>
 	<string>iphoneos</string>
-	<key>DTPlatformVersion</key>
-	<string>4.3</string>
-	<key>DTSDKBuild</key>
-	<string>8H7</string>
-	<key>DTSDKName</key>
-	<string>iphoneos4.3</string>
-	<key>DTXcode</key>
-	<string>0410</string>
-	<key>DTXcodeBuild</key>
-	<string>4B110</string>
 	<key>MinimumOSVersion</key>
-	<string>3.1</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-	</array>
+	<string>4.0</string>
 </dict>
 </plist>

External/iOS/Crashlytics.framework/Versions/Current

@@ -0,0 +1 @@
+A

Localytics/Localytics.plist

@@ -1,10 +0,0 @@
-<?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>Key.development</key>
-	<string>e6238ceba8ec92832e77b1b-9ccd60bc-c39b-11e0-06e4-007f58cb3154</string>
-	<key>Key.distribution</key>
-	<string></string>
-</dict>
-</plist>

Localytics/LocalyticsDatabase.h

@@ -1,57 +0,0 @@
-//
-//  LocalyticsDatabase.h
-//  LocalyticsDemo
-//
-//  Created by jkaufman on 5/26/11.
-//  Copyright 2011 Localytics. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <sqlite3.h>
-
-#define MAX_DATABASE_SIZE   500000  // The maximum allowed disk size of the primary database file at open, in bytes
-#define VACUUM_THRESHOLD    0.8     // The database is vacuumed after its size exceeds this proportion of the maximum.
-
-@interface LocalyticsDatabase : NSObject {
-    sqlite3 *_databaseConnection;
-}
-
-+ (LocalyticsDatabase *)sharedLocalyticsDatabase;
-
-- (NSUInteger)databaseSize;
-- (int)eventCount;
-- (NSTimeInterval)createdTimestamp;
-
-- (BOOL)beginTransaction:(NSString *)name;
-- (BOOL)releaseTransaction:(NSString *)name;
-- (BOOL)rollbackTransaction:(NSString *)name;
-
-- (BOOL)incrementLastUploadNumber:(int *)uploadNumber;
-- (BOOL)incrementLastSessionNumber:(int *)sessionNumber;
-
-- (BOOL)addEventWithBlobString:(NSString *)blob;
-- (BOOL)addCloseEventWithBlobString:(NSString *)blob;
-- (BOOL)addFlowEventWithBlobString:(NSString *)blob;
-- (BOOL)removeLastCloseAndFlowEvents;
-
-- (BOOL)addHeaderWithSequenceNumber:(int)number blobString:(NSString *)blob rowId:(sqlite3_int64 *)insertedRowId;
-- (int)unstagedEventCount;
-- (BOOL)stageEventsForUpload:(sqlite3_int64)headerId;
-- (BOOL)updateAppKey:(NSString *)appKey;
-- (NSString *)uploadBlobString;
-- (BOOL)deleteUploadedData;
-- (BOOL)resetAnalyticsData;
-- (BOOL)vacuumIfRequired;
-
-- (NSTimeInterval)lastSessionStartTimestamp;
-- (BOOL)setLastsessionStartTimestamp:(NSTimeInterval)timestamp;
-
-- (BOOL)isOptedOut;
-- (BOOL)setOptedOut:(BOOL)optOut;
-- (NSString *)installId;
-- (NSString *)appKey; // Most recent app key-- may not be that used to open the session.
-
-- (NSString *)customDimension:(int)dimension;
-- (BOOL)setCustomDimension:(int)dimension value:(NSString *)value;
-
-@end

Localytics/LocalyticsDatabase.m

@@ -1,743 +0,0 @@
-//
-//  LocalyticsDatabase.m
-//  LocalyticsDemo
-//
-//  Created by jkaufman on 5/26/11.
-//  Copyright 2011 Localytics. All rights reserved.
-//
-
-#import "LocalyticsDatabase.h"
-
-#define LOCALYTICS_DIR              @".localytics"	// Name for the directory in which Localytics database is stored
-#define LOCALYTICS_DB               @"localytics"	// File name for the database (without extension)
-#define BUSY_TIMEOUT                30              // Maximum time SQlite will busy-wait for the database to unlock before returning SQLITE_BUSY
-
-@interface LocalyticsDatabase ()
-    - (int)schemaVersion;
-    - (void)createSchema;
-    - (void)upgradeToSchemaV2;
-    - (void)upgradeToSchemaV3;
-    - (void)moveDbToCaches;
-    - (NSString *)randomUUID;
-@end
-
-@implementation LocalyticsDatabase
-
-// The singleton database object.
-static LocalyticsDatabase *_sharedLocalyticsDatabase = nil;
-
-+ (NSString *)localyticsDirectoryPath {
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);    
-    return  [[paths objectAtIndex:0] stringByAppendingPathComponent:LOCALYTICS_DIR];
-}
-
-+ (NSString *)localyticsDatabasePath {
-    NSString *path = [[LocalyticsDatabase localyticsDirectoryPath] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.sqlite", LOCALYTICS_DB]];
-    return path;
-}
-
-#pragma mark Singleton Class
-+ (LocalyticsDatabase *)sharedLocalyticsDatabase {
-	@synchronized(self) {
-		if (_sharedLocalyticsDatabase == nil) {
-			_sharedLocalyticsDatabase = [[self alloc] init];
-		}
-	}
-	return _sharedLocalyticsDatabase;
-}
-
-- (LocalyticsDatabase *)init {
-	if((self = [super init])) {
-        
-        // Mover any data that a previous library may have left in the documents directory
-        [self moveDbToCaches];
-        
-        // Create directory structure for Localytics.
-        NSString *directoryPath = [LocalyticsDatabase localyticsDirectoryPath];
-        if (![[NSFileManager defaultManager] fileExistsAtPath:directoryPath]) {
-            [[NSFileManager defaultManager] createDirectoryAtPath:directoryPath withIntermediateDirectories:YES attributes:nil error:nil];
-        }
-        
-        // Attempt to open database. It will be created if it does not exist, already.
-        NSString *dbPath = [LocalyticsDatabase localyticsDatabasePath];
-        int code =  sqlite3_open([dbPath UTF8String], &_databaseConnection);
-
-        // If we were unable to open the database, it is likely corrupted. Clobber it and move on.
-        if (code != SQLITE_OK) {
-            [[NSFileManager defaultManager] removeItemAtPath:dbPath error:nil];
-            code =  sqlite3_open([dbPath UTF8String], &_databaseConnection);
-        }
-
-        // Check db connection, creating schema if necessary.
-        if (code == SQLITE_OK) {
-            sqlite3_busy_timeout(_databaseConnection, BUSY_TIMEOUT); // Defaults to 0, otherwise.
-            if ([self schemaVersion] == 0) {
-                [self createSchema];
-            }
-        }
-
-        // Perform any Migrations if necessary
-        if ([self schemaVersion] < 2) {
-            [self upgradeToSchemaV2];
-        }
-        if ([self schemaVersion] < 3) {
-            [self upgradeToSchemaV3];
-        }
-    }
-    
-	return self;
-}
-
-#pragma mark - Database 
-
-- (BOOL)beginTransaction:(NSString *)name {
-    const char *sql = [[NSString stringWithFormat:@"SAVEPOINT %@", name] cStringUsingEncoding:NSUTF8StringEncoding];
-    int code = sqlite3_exec(_databaseConnection, sql, NULL, NULL, NULL);
-    return code == SQLITE_OK;
-}
-
-- (BOOL)releaseTransaction:(NSString *)name {
-    const char *sql = [[NSString stringWithFormat:@"RELEASE SAVEPOINT %@", name] cStringUsingEncoding:NSUTF8StringEncoding];
-    int code = sqlite3_exec(_databaseConnection, sql, NULL, NULL, NULL);
-    return code == SQLITE_OK;
-}
-
-- (BOOL)rollbackTransaction:(NSString *)name {
-    const char *sql = [[NSString stringWithFormat:@"ROLLBACK SAVEPOINT %@", name] cStringUsingEncoding:NSUTF8StringEncoding];
-    int code = sqlite3_exec(_databaseConnection, sql, NULL, NULL, NULL);
-    return code == SQLITE_OK;
-}
-
-- (int)schemaVersion {
-    int version = 0;
-    const char *sql = "SELECT MAX(schema_version) FROM localytics_info";
-    sqlite3_stmt *selectSchemaVersion;
-    if(sqlite3_prepare_v2(_databaseConnection, sql, -1, &selectSchemaVersion, NULL) == SQLITE_OK) {
-        if(sqlite3_step(selectSchemaVersion) == SQLITE_ROW) {
-            version = sqlite3_column_int(selectSchemaVersion, 0);
-        }
-    }
-    sqlite3_finalize(selectSchemaVersion);
-    return version;
-}
-
-- (NSString *)installId {
-    NSString *installId = nil;
-    
-    sqlite3_stmt *selectInstallId;
-    sqlite3_prepare_v2(_databaseConnection, "SELECT install_id FROM localytics_info", -1, &selectInstallId, NULL);
-    int code = sqlite3_step(selectInstallId);
-    if (code == SQLITE_ROW && sqlite3_column_text(selectInstallId, 0)) {                
-        installId = [NSString stringWithUTF8String:(char *)sqlite3_column_text(selectInstallId, 0)];
-    }
-    sqlite3_finalize(selectInstallId);
-    
-    return installId;
-}
-
-- (NSString *)appKey {
-    NSString *appKey = nil;
-    
-    sqlite3_stmt *selectAppKey;
-    sqlite3_prepare_v2(_databaseConnection, "SELECT app_key FROM localytics_info", -1, &selectAppKey, NULL);
-    int code = sqlite3_step(selectAppKey);
-    if (code == SQLITE_ROW && sqlite3_column_text(selectAppKey, 0)) {                
-        appKey = [NSString stringWithUTF8String:(char *)sqlite3_column_text(selectAppKey, 0)];
-    }
-    sqlite3_finalize(selectAppKey);
-    
-    return appKey;
-}
-
-// Due to the new iOS storage guidelines it is necessary to move the database out of the documents directory
-// and into the /library/caches directory 
-- (void)moveDbToCaches {
-    NSArray *documentPaths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);    
-    NSString *localyticsDocumentsDirectory = [[documentPaths objectAtIndex:0] stringByAppendingPathComponent:LOCALYTICS_DIR];    
-    NSArray *cachesPaths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-    NSString *localyticsCachesDirectory = [[cachesPaths objectAtIndex:0] stringByAppendingPathComponent:LOCALYTICS_DIR];
-    
-    // If the old directory doesn't exist, there is nothing else to do here
-    if([[NSFileManager defaultManager] fileExistsAtPath:localyticsDocumentsDirectory] == NO) 
-    {
-        return;
-    }
-
-    // Try to move the directory
-    if(NO == [[NSFileManager defaultManager] moveItemAtPath:localyticsDocumentsDirectory 
-                                             toPath:localyticsCachesDirectory 
-                                             error:nil])
-    {
-        // If the move failed try and, delete the old directory
-        [ [NSFileManager defaultManager] removeItemAtPath:localyticsDocumentsDirectory error:nil];
-    }
-}
-
-- (void)createSchema {
-    int code = SQLITE_OK;
-    
-    // Execute schema creation within a single transaction.
-    code = sqlite3_exec(_databaseConnection, "BEGIN", NULL, NULL, NULL);
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection,
-                            "CREATE TABLE upload_headers ("
-                            "sequence_number INTEGER PRIMARY KEY, "
-                            "blob_string TEXT)",
-                            NULL, NULL, NULL);
-    }
-
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection,
-                            "CREATE TABLE events ("
-                            "event_id INTEGER PRIMARY KEY AUTOINCREMENT, " // In case foreign key constraints are reintroduced.
-                            "upload_header INTEGER, "
-                            "blob_string TEXT NOT NULL)",
-                            NULL, NULL, NULL);
-    }
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection,
-                            "CREATE TABLE localytics_info ("
-                            "schema_version INTEGER PRIMARY KEY, "
-                            "last_upload_number INTEGER, "
-                            "last_session_number INTEGER, "
-                            "opt_out BOOLEAN, "
-                            "last_close_event INTEGER, "
-                            "last_flow_event INTEGER, "
-                            "last_session_start REAL, "
-                            "app_key CHAR(64), "
-                            "custom_d0 CHAR(64), "
-                            "custom_d1 CHAR(64), "
-                            "custom_d2 CHAR(64), "
-                            "custom_d3 CHAR(64) "
-                            ")",
-                            NULL, NULL, NULL);
-    }
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection, 
-                            "INSERT INTO localytics_info (schema_version, last_upload_number, last_session_number, opt_out) "
-                            "VALUES (3, 0, 0, 0)", NULL, NULL, NULL);
-    }
-
-    // Commit transaction.
-    if (code == SQLITE_OK || code == SQLITE_DONE) {
-        sqlite3_exec(_databaseConnection, "COMMIT", NULL, NULL, NULL);
-    } else {
-        sqlite3_exec(_databaseConnection, "ROLLBACK", NULL, NULL, NULL);
-    }
-}
-
-// V2 adds a unique identifier for each installation
-// This identifier has been moved to user preferences so the database an live in the caches directory
-// Also adds storage for custom dimensions
-- (void)upgradeToSchemaV2 {
-    int code = SQLITE_OK;
-    
-    code = sqlite3_exec(_databaseConnection, "BEGIN", NULL, NULL, NULL);
-
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection,
-                            "ALTER TABLE localytics_info ADD install_id CHAR(40)",
-                            NULL, NULL, NULL);
-    }
-
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection,
-                            "ALTER TABLE localytics_info ADD custom_d0 CHAR(64)",
-                            NULL, NULL, NULL);
-    }
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection,
-                            "ALTER TABLE localytics_info ADD custom_d1 CHAR(64)",
-                            NULL, NULL, NULL);
-    }
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection,
-                            "ALTER TABLE localytics_info ADD custom_d2 CHAR(64)",
-                            NULL, NULL, NULL);
-    }
-    
-    if (code == SQLITE_OK) {
-        sqlite3_exec(_databaseConnection,
-                     "ALTER TABLE localytics_info ADD custom_d3 CHAR(64)",
-                     NULL, NULL, NULL);
-    }
-
-    // Attempt to set schema version and install_id regardless of the result code following the ALTER statements above.
-    // This is necessary because a previous version of the library performed the migration without setting these values.
-    // The transaction will succeed even if the individual statements fail with errors (eg. "duplicate column name").
-    sqlite3_stmt *updateLocalyticsInfo;
-    sqlite3_prepare_v2(_databaseConnection, "UPDATE localytics_info set install_id = ?, schema_version = 2 ", -1, &updateLocalyticsInfo, NULL);
-    sqlite3_bind_text (updateLocalyticsInfo, 1, [[self randomUUID] UTF8String], -1, SQLITE_TRANSIENT); 
-    code = sqlite3_step(updateLocalyticsInfo);    
-    sqlite3_finalize(updateLocalyticsInfo);
-
-    // Commit transaction.
-    if (code == SQLITE_OK || code == SQLITE_DONE) {
-        sqlite3_exec(_databaseConnection, "COMMIT", NULL, NULL, NULL);
-    } else {
-        sqlite3_exec(_databaseConnection, "ROLLBACK", NULL, NULL, NULL);
-    }
-}
-
-// V3 adds a field for the last app key and patches a V2 migration issue.
-- (void)upgradeToSchemaV3 {
-    sqlite3_exec(_databaseConnection,
-                 "ALTER TABLE localytics_info ADD app_key CHAR(64)",
-                 NULL, NULL, NULL);
-}
-
-- (NSUInteger)databaseSize {
-    NSUInteger size = 0;
-    NSDictionary *fileAttributes = [[NSFileManager defaultManager] 
-                                    attributesOfItemAtPath:[LocalyticsDatabase localyticsDatabasePath]
-                                    error:nil];
-    size = [fileAttributes fileSize];
-    return size;
-}
-
-- (int) eventCount {
-    int count = 0;
-    const char *sql = "SELECT count(*) FROM events";
-    sqlite3_stmt *selectEventCount;
-    
-    if(sqlite3_prepare_v2(_databaseConnection, sql, -1, &selectEventCount, NULL) == SQLITE_OK) 
-    {
-        if(sqlite3_step(selectEventCount) == SQLITE_ROW) {
-            count = sqlite3_column_int(selectEventCount, 0);
-        }
-    }
-    sqlite3_finalize(selectEventCount);
-    
-    return count;
-}
-
-- (NSTimeInterval)createdTimestamp {
-    NSTimeInterval timestamp = 0;
-    NSDictionary *fileAttributes = [[NSFileManager defaultManager] 
-                                    attributesOfItemAtPath:[LocalyticsDatabase localyticsDatabasePath]
-                                    error:nil];
-    timestamp = [[fileAttributes fileCreationDate] timeIntervalSince1970];    
-    return timestamp;
-}
-
-- (NSTimeInterval)lastSessionStartTimestamp {
-
-    NSTimeInterval lastSessionStart = 0;
-    
-    sqlite3_stmt *selectLastSessionStart;
-    sqlite3_prepare_v2(_databaseConnection, "SELECT last_session_start FROM localytics_info", -1, &selectLastSessionStart, NULL);
-    int code = sqlite3_step(selectLastSessionStart);
-    if (code == SQLITE_ROW) {
-        lastSessionStart = sqlite3_column_double(selectLastSessionStart, 0) == 1;
-    }
-    sqlite3_finalize(selectLastSessionStart);
-        
-    return lastSessionStart;
-}
-
-- (BOOL)setLastsessionStartTimestamp:(NSTimeInterval)timestamp {    
-    sqlite3_stmt *updateLastSessionStart;
-    sqlite3_prepare_v2(_databaseConnection, "UPDATE localytics_info SET last_session_start = ?", -1, &updateLastSessionStart, NULL);
-    sqlite3_bind_double(updateLastSessionStart, 1, timestamp);
-    int code = sqlite3_step(updateLastSessionStart);
-    sqlite3_finalize(updateLastSessionStart);
-    
-    return code == SQLITE_DONE;
-}
-
-- (BOOL)isOptedOut {   
-    BOOL optedOut = NO;
-
-    sqlite3_stmt *selectOptOut;
-    sqlite3_prepare_v2(_databaseConnection, "SELECT opt_out FROM localytics_info", -1, &selectOptOut, NULL);
-    int code = sqlite3_step(selectOptOut);
-    if (code == SQLITE_ROW) {
-        optedOut = sqlite3_column_int(selectOptOut, 0) == 1;
-    }
-    sqlite3_finalize(selectOptOut);
-    
-    return optedOut;
-}
-
-- (BOOL)setOptedOut:(BOOL)optOut {
-    sqlite3_stmt *updateOptedOut;
-    sqlite3_prepare_v2(_databaseConnection, "UPDATE localytics_info SET opt_out = ?", -1, &updateOptedOut, NULL);
-    sqlite3_bind_int(updateOptedOut, 1, optOut);
-    int code = sqlite3_step(updateOptedOut);
-    sqlite3_finalize(updateOptedOut);
-    
-    return code == SQLITE_OK;
-}
-
-- (NSString *)customDimension:(int)dimension {
-    if(dimension < 0 || dimension > 3) {
-        return nil;
-    }
-    
-    NSString *value = nil;
-    NSString *query = [NSString stringWithFormat:@"select custom_d%i from localytics_info", dimension];
-    
-    sqlite3_stmt *selectCustomDim;
-    sqlite3_prepare_v2(_databaseConnection, [query UTF8String], -1, &selectCustomDim, NULL);
-    int code = sqlite3_step(selectCustomDim);
-    if (code == SQLITE_ROW && sqlite3_column_text(selectCustomDim, 0)) {
-        value = [NSString stringWithUTF8String:(char *)sqlite3_column_text(selectCustomDim, 0)];
-    }
-    sqlite3_finalize(selectCustomDim);
-
-    return value;
-}
-
-- (BOOL)setCustomDimension:(int)dimension value:(NSString *)value {
-    if(dimension < 0 || dimension > 3) {
-        return false;
-    }
-    
-    NSString *query = [NSString stringWithFormat:@"update localytics_info SET custom_d%i = %@", 
-                         dimension,
-                         (value == nil) ? @"null" : [NSString stringWithFormat:@"\"%@\"", value]];
-    
-    int code = sqlite3_exec(_databaseConnection, [query UTF8String], NULL, NULL, NULL);
-
-    return code == SQLITE_OK;
-}
-
-- (BOOL)incrementLastUploadNumber:(int *)uploadNumber {
-    NSString *t = @"increment_upload_number";
-    int code = SQLITE_OK;
-
-    code = [self beginTransaction:t] ? SQLITE_OK : SQLITE_ERROR;
-
-    if(code == SQLITE_OK) {
-        // Increment value
-        code = sqlite3_exec(_databaseConnection,
-                            "UPDATE localytics_info "
-                            "SET last_upload_number = (last_upload_number + 1)",
-                            NULL, NULL, NULL);
-    }
-
-    if(code == SQLITE_OK) {
-        // Retrieve new value
-        sqlite3_stmt *selectUploadNumber;
-        sqlite3_prepare_v2(_databaseConnection, 
-                                  "SELECT last_upload_number FROM localytics_info",
-                                  -1, &selectUploadNumber, NULL);
-        code = sqlite3_step(selectUploadNumber);
-        if (code == SQLITE_ROW) {
-            *uploadNumber = sqlite3_column_int(selectUploadNumber, 0);
-        }
-        sqlite3_finalize(selectUploadNumber);
-    }
-
-    if(code == SQLITE_ROW) {
-        [self releaseTransaction:t];
-    } else {
-        [self rollbackTransaction:t];
-    }
-    
-    return code == SQLITE_ROW;
-}
-
-- (BOOL)incrementLastSessionNumber:(int *)sessionNumber {
-    NSString *t = @"increment_session_number";
-    int code = [self beginTransaction:t] ? SQLITE_OK : SQLITE_ERROR;
-    
-    if(code == SQLITE_OK) {
-        // Increment value
-        code = sqlite3_exec(_databaseConnection,
-                            "UPDATE localytics_info "
-                            "SET last_session_number = (last_session_number + 1)",
-                            NULL, NULL, NULL);
-    }
-    
-    if(code == SQLITE_OK) {
-        // Retrieve new value
-        sqlite3_stmt *selectSessionNumber;
-        sqlite3_prepare_v2(_databaseConnection, 
-                           "SELECT last_session_number FROM localytics_info",
-                           -1, &selectSessionNumber, NULL);
-        code = sqlite3_step(selectSessionNumber);
-        if (code == SQLITE_ROW && sessionNumber != NULL) {
-            *sessionNumber = sqlite3_column_int(selectSessionNumber, 0);
-        }
-        sqlite3_finalize(selectSessionNumber);
-    }
-
-    if(code == SQLITE_ROW) {
-        [self releaseTransaction:t];
-    } else {
-        [self rollbackTransaction:t];
-    }
-
-    return code == SQLITE_ROW;
-}
-
-- (BOOL)addEventWithBlobString:(NSString *)blob {
-
-    int code = SQLITE_OK;
-    sqlite3_stmt *insertEvent;
-    sqlite3_prepare_v2(_databaseConnection, "INSERT INTO events (blob_string) VALUES (?)", -1, &insertEvent, NULL);
-    sqlite3_bind_text(insertEvent, 1, [blob UTF8String], -1, SQLITE_TRANSIENT); 
-    code = sqlite3_step(insertEvent);
-    sqlite3_finalize(insertEvent);
-
-    return code == SQLITE_DONE;
-}
-
-- (BOOL)addCloseEventWithBlobString:(NSString *)blob {
-    NSString *t = @"add_close_event";
-    BOOL success = [self beginTransaction:t];
-    
-    // Add close event.
-    if (success) {
-        success = [self addEventWithBlobString:blob];
-    }
-
-    // Record row id to localytics_info so that it can be removed if the session resumes.
-    if (success) {
-        sqlite3_stmt *updateCloseEvent;
-        sqlite3_prepare_v2(_databaseConnection, "UPDATE localytics_info SET last_close_event = (SELECT event_id FROM events WHERE rowid = ?)", -1, &updateCloseEvent, NULL);
-        sqlite3_int64 lastRow = sqlite3_last_insert_rowid(_databaseConnection);
-        sqlite3_bind_int64(updateCloseEvent, 1, lastRow);
-        int code = sqlite3_step(updateCloseEvent);        
-        sqlite3_finalize(updateCloseEvent);
-        success = code == SQLITE_DONE;
-    }
-    
-    if (success) {
-        [self releaseTransaction:t];
-    } else {
-        [self rollbackTransaction:t];
-    }
-    return success;
-}
-
-- (BOOL)addFlowEventWithBlobString:(NSString *)blob {
-    NSString *t = @"add_flow_event";
-    BOOL success = [self beginTransaction:t];
-    
-    // Add flow event.
-    if (success) {
-        success = [self addEventWithBlobString:blob];
-    }
-    
-    // Record row id to localytics_info so that it can be removed if the session resumes.
-    if (success) {
-        sqlite3_stmt *updateFlowEvent;
-        sqlite3_prepare_v2(_databaseConnection, "UPDATE localytics_info SET last_flow_event = (SELECT event_id FROM events WHERE rowid = ?)", -1, &updateFlowEvent, NULL);
-        sqlite3_int64 lastRow = sqlite3_last_insert_rowid(_databaseConnection);
-        sqlite3_bind_int64(updateFlowEvent, 1, lastRow);
-        int code = sqlite3_step(updateFlowEvent);        
-        sqlite3_finalize(updateFlowEvent);
-        success = code == SQLITE_DONE;
-    }
-    
-    if (success) {
-        [self releaseTransaction:t];
-    } else {
-        [self rollbackTransaction:t];
-    }
-    return success;
-}
-
-- (BOOL)removeLastCloseAndFlowEvents {
-    // Attempt to remove the last recorded close event.
-    // Fail quietly if none was saved or it was previously removed.
-    int code = sqlite3_exec(_databaseConnection, "DELETE FROM events WHERE event_id = (SELECT last_close_event FROM localytics_info) OR event_id = (SELECT last_flow_event FROM localytics_info)", NULL, NULL, NULL);
-    
-    return code == SQLITE_OK;
-}
-
-- (BOOL)addHeaderWithSequenceNumber:(int)number blobString:(NSString *)blob rowId:(sqlite3_int64 *)insertedRowId {
-    sqlite3_stmt *insertHeader;
-    sqlite3_prepare_v2(_databaseConnection, "INSERT INTO upload_headers (sequence_number, blob_string) VALUES (?, ?)", -1, &insertHeader, NULL);
-    sqlite3_bind_int(insertHeader, 1, number);
-    sqlite3_bind_text(insertHeader, 2, [blob UTF8String], -1, SQLITE_TRANSIENT); 
-    int code = sqlite3_step(insertHeader);
-    sqlite3_finalize(insertHeader);
-    
-    if (code == SQLITE_DONE && insertedRowId != NULL) {
-        *insertedRowId = sqlite3_last_insert_rowid(_databaseConnection);
-    }
-
-    return code == SQLITE_DONE;
-}
-
-- (int)unstagedEventCount {
-    int rowCount = 0;
-    sqlite3_stmt *selectEventCount;
-    sqlite3_prepare_v2(_databaseConnection, "SELECT COUNT(*) FROM events WHERE UPLOAD_HEADER IS NULL", -1, &selectEventCount, NULL);
-    int code = sqlite3_step(selectEventCount);
-    if (code == SQLITE_ROW) {
-        rowCount = sqlite3_column_int(selectEventCount, 0);
-    }
-    sqlite3_finalize(selectEventCount);
-    
-    return rowCount;
-}
-
-- (BOOL)stageEventsForUpload:(sqlite3_int64)headerId {
-    
-    // Associate all outstanding events with the given upload header ID.
-    NSString *stageEvents = [NSString stringWithFormat:@"UPDATE events SET upload_header = ? WHERE upload_header IS NULL"];
-    sqlite3_stmt *updateEvents;
-    sqlite3_prepare_v2(_databaseConnection, [stageEvents UTF8String], -1, &updateEvents, NULL);
-    sqlite3_bind_int(updateEvents, 1, headerId);
-    int code = sqlite3_step(updateEvents);
-    sqlite3_finalize(updateEvents);
-    BOOL success = (code == SQLITE_DONE);
-
-    return success;
-}
-
-- (BOOL)updateAppKey:(NSString *)appKey {
-    sqlite3_stmt *updateAppKey;
-    sqlite3_prepare_v2(_databaseConnection, "UPDATE localytics_info set app_key = ?", -1, &updateAppKey, NULL);
-    sqlite3_bind_text (updateAppKey, 1, [appKey UTF8String], -1, SQLITE_TRANSIENT); 
-    int code = sqlite3_step(updateAppKey);
-    sqlite3_finalize(updateAppKey);
-    BOOL success = (code == SQLITE_DONE);
-
-    return success;
-}
-
-- (NSString *)uploadBlobString {
-
-    // Retrieve the blob strings of each upload header and its child events, in order.
-    const char *sql = "SELECT * FROM ( "
-                      "   SELECT h.blob_string AS 'blob', h.sequence_number as 'seq', 0 FROM upload_headers h"
-                      "   UNION ALL "
-                      "   SELECT e.blob_string AS 'blob', e.upload_header as 'seq', 1 FROM events e"
-                      ") "
-                      "ORDER BY 2, 3";
-    sqlite3_stmt *selectBlobs;
-    sqlite3_prepare_v2(_databaseConnection, sql, -1, &selectBlobs, NULL);
-    NSMutableString *uploadBlobString = [NSMutableString string];
-    while (sqlite3_step(selectBlobs) == SQLITE_ROW) {
-        const char *blob = (const char *)sqlite3_column_text(selectBlobs, 0);
-        if (blob != NULL) {
-            NSString *blobString = [[NSString alloc] initWithCString:blob encoding:NSUTF8StringEncoding];
-            [uploadBlobString appendString:blobString];
-            [blobString release];
-        }
-    }
-    sqlite3_finalize(selectBlobs);
-    
-    return [[uploadBlobString copy] autorelease];
-}
-
-- (BOOL)deleteUploadedData {
-    // Delete all headers and staged events.
-    NSString *t = @"delete_upload_data";
-    int code = [self beginTransaction:t] ? SQLITE_OK : SQLITE_ERROR;
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection, "DELETE FROM events WHERE upload_header IS NOT NULL", NULL, NULL, NULL);
-    }
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection, "DELETE FROM upload_headers", NULL, NULL, NULL);
-    }
-
-    if (code == SQLITE_OK) {
-        [self releaseTransaction:t];
-    } else {
-        [self rollbackTransaction:t];
-    }
-    
-    return code == SQLITE_OK;
-}
-
-- (BOOL)resetAnalyticsData {
-    // Delete or zero all analytics data.
-    // Reset: headers, events, session number, upload number, last session start, last close event, and last flow event.
-    // Unaffected: schema version, opt out status, install ID (deprecated), and app key.
-
-    NSString *t = @"reset_analytics_data";
-    int code = [self beginTransaction:t] ? SQLITE_OK : SQLITE_ERROR;
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection, "DELETE FROM events", NULL, NULL, NULL);
-    }
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection, "DELETE FROM upload_headers", NULL, NULL, NULL);
-    }
-    
-    if (code == SQLITE_OK) {
-        code = sqlite3_exec(_databaseConnection,"UPDATE localytics_info SET last_session_number = 0, last_upload_number = 0,"
-                                                "last_close_event = null, last_flow_event = null, last_session_start = null, "
-                                                "custom_d0 = null, custom_d1 = null, custom_d2 = null, custom_d3 = null", 
-                                                NULL, NULL, NULL);
-    }
-    
-    if (code == SQLITE_OK) {
-        [self releaseTransaction:t];
-    } else {
-        [self rollbackTransaction:t];
-    }
-    
-    return code == SQLITE_OK;
-}
-
-- (BOOL)vacuumIfRequired {
-    int code = SQLITE_OK;
-    if ([self databaseSize] > MAX_DATABASE_SIZE * VACUUM_THRESHOLD) {
-        code =  sqlite3_exec(_databaseConnection, "VACUUM", NULL, NULL, NULL);
-    }
-        
-    return code == SQLITE_OK;
-}
-
-- (NSString *)randomUUID {
-	CFUUIDRef theUUID = CFUUIDCreate(NULL);
-	CFStringRef stringUUID = CFUUIDCreateString(NULL, theUUID);
-	CFRelease(theUUID);
-	return [(NSString *)stringUUID autorelease];
-}
-
-#pragma mark - Lifecycle
-
-+ (id)allocWithZone:(NSZone *)zone {
-	@synchronized(self) {
-		if (_sharedLocalyticsDatabase == nil) {
-			_sharedLocalyticsDatabase = [super allocWithZone:zone];
-			return _sharedLocalyticsDatabase;
-		}
-	}
-	// returns nil on subsequent allocations
-	return nil;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-	return self;
-}
-
-- (id)retain {
-	return self;
-}
-
-- (unsigned)retainCount {
-	// maximum value of an unsigned int - prevents additional retains for the class
-	return UINT_MAX;
-}
-
-- (oneway void)release {
-	// ignore release commands
-}
-
-- (id)autorelease {
-	return self;
-}
-
-- (void)dealloc {
-    sqlite3_close(_databaseConnection);
-	[super dealloc];
-}
-
-@end

Localytics/LocalyticsSession.h

@@ -1,216 +0,0 @@
-//  LocalyticsSession.h
-//  Copyright (C) 2009 Char Software Inc., DBA Localytics
-// 
-//  This code is provided under the Localytics Modified BSD License.
-//  A copy of this license has been distributed in a file called LICENSE
-//  with this source code.  
-// 
-// Please visit www.localytics.com for more information.
-
-#import <UIKit/UIKit.h>
-
-// Set this to true to enable localytics traces (useful for debugging)
-#define DO_LOCALYTICS_LOGGING false
-
-/*!
- @class LocalyticsSession 
- @discussion The class which manages creating, collecting, & uploading a Localytics session.
- Please see the following guides for information on how to best use this
- library, sample code, and other useful information:
- <ul>
- <li><a href="http://wiki.localytics.com/index.php?title=Developer's_Integration_Guide">Main Developer's Integration Guide</a></li>
- </ul>
-
- <strong>Best Practices</strong>
- <ul>
- <li>Instantiate the LocalyticsSession object in applicationDidFinishLaunching.</li>
- <li>Open your session and begin your uploads in applicationDidFinishLaunching. This way the
- upload has time to complete and it all happens before your users have a
- chance to begin any data intensive actions of their own.</li>
- <li>Close the session in applicationWillTerminate, and in applicationDidEnterBackground.</li>
- <li>Resume the session in applicationWillEnterForeground.</li>
- <li>Do not call any Localytics functions inside a loop.  Instead, calls
- such as <code>tagEvent</code> should follow user actions.  This limits the
- amount of data which is stored and uploaded.</li>
- <li>Do not use multiple LocalticsSession objects to upload data with 
- multiple application keys.  This can cause invalid state.</li>
- </ul>
- 
- @author Localytics
- */
-@interface LocalyticsSession : NSObject {
-
-	BOOL _hasInitialized;               // Whether or not the session object has been initialized.
-	BOOL _isSessionOpen;                // Whether or not this session has been opened.
-    float _backgroundSessionTimeout;    // If an App stays in the background for more
-                                        // than this many seconds, start a new session
-                                        // when it returns to foreground.
-	@private
-	#pragma mark Member Variables
-    dispatch_queue_t _queue;                // Queue of Localytics block objects.
-    dispatch_group_t _criticalGroup;        // Group of blocks the must complete before backgrounding.
-	NSString *_sessionUUID;                 // Unique identifier for this session.
-	NSString *_applicationKey;              // Unique identifier for the instrumented application
-    NSTimeInterval _lastSessionStartTimestamp;  // The start time of the most recent session.
-    NSDate *_sessionResumeTime;                 // Time session was started or resumed.
-    NSDate *_sessionCloseTime;              // Time session was closed.
-    NSMutableString *_unstagedFlowEvents;        // Comma-delimited list of app screens and events tagged during this
-                                            // session that have NOT been staged for upload.
-    NSMutableString *_stagedFlowEvents;        // App screens and events tagged during this session that HAVE been staged
-                                            // for upload.
-    NSMutableString *_screens;              // Comma-delimited list of screens tagged during this session.
-    NSTimeInterval _sessionActiveDuration;  // Duration that session open.
-	BOOL _sessionHasBeenOpen;               // Whether or not this session has ever been open.
-}
-
-@property dispatch_queue_t queue;
-@property dispatch_group_t criticalGroup;
-@property BOOL isSessionOpen;
-@property BOOL hasInitialized;		
-@property float backgroundSessionTimeout;
-
-#pragma mark Public Methods
-/*!
- @method sharedLocalyticsSession
- @abstract Accesses the Session object.  This is a Singleton class which maintains
- a single session throughout your application.  It is possible to manage your own
- session, but this is the easiest way to access the Localytics object throughout your code.
- The class is accessed within the code using the following syntax:
-	[[LocalyticsSession sharedLocalyticsSession] functionHere]
- So, to tag an event, all that is necessary, anywhere in the code is:
-    [[LocalyticsSession sharedLocalyticsSession] tagEvent:@"MY_EVENT"];
- */
-+ (LocalyticsSession *)sharedLocalyticsSession;
-
-/*!
- @method LocalyticsSession
- @abstract Initializes the Localytics Object.  Not necessary if you choose to use startSession.
- @param applicationKey The key unique for each application generated at www.localytics.com
- */
-- (void)LocalyticsSession:(NSString *)appKey;
-
-/*!
- @method startSession
- @abstract An optional convenience initialize method that also calls the LocalyticsSession, open & 
- upload methods. Best Practice is to call open & upload immediately after Localytics Session when loading an app, 
- this method fascilitates that behavior.
- It is recommended that this call be placed in <code>applicationDidFinishLaunching</code>.
- @param applicationKey The key unique for each application generated
- at www.localytics.com
- */
-- (void)startSession:(NSString *)appKey;
-
-/*!
- @method setOptIn
- @abstract (OPTIONAL) Allows the application to control whether or not it will collect user data.  
- Even if this call is used, it is necessary to continue calling upload().  No new data will be
- collected, so nothing new will be uploaded but it is necessary to upload an event telling the
- server this user has opted out.
- @param optedIn True if the user is opted in, false otherwise.
- */
-- (void)setOptIn:(BOOL)optedIn;
-
-/*!
- @method isOptedIn
- @abstract (OPTIONAL) Whether or not this user has is opted in or out.  The only way they can be
- opted out is if setOptIn(false) has been called before this.  This function should only be
- used to pre-populate a checkbox in an options menu.  It is not recommended that an application
- branch based on Localytics instrumentation because this creates an additional test case.  If
- the app is opted out, all subsequent Localytics calls will return immediately.
- @result true if the user is opted in, false otherwise.
- */
-- (BOOL)isOptedIn;
-
-/*!
- @method open
- @abstract Opens the Localytics session. Not necessary if you choose to use startSession. 
- The session time as presented on the website is the time between <code>open</code> and the 
- final <code>close</code> so it is recommended to open the session as early as possible, and close
- it at the last moment.  The session must be opened before any tags can
- be written.  It is recommended that this call be placed in <code>applicationDidFinishLaunching</code>.
- <br>
- If for any reason this is called more than once every subsequent open call
- will be ignored.
- */
-- (void)open;
-
-/*!
- @method resume
- @abstract Resumes the Localytics session.  When the App enters the background, the session is 
- closed and the time of closing is recorded.  When the app returns to the foreground, the session 
- is resumed.  If the time since closing is greater than BACKGROUND_SESSION_TIMEOUT, (15 seconds
- by default) a new session is created, and uploading is triggered.  Otherwise, the previous session 
- is reopened.
-*/
-- (void)resume;
-
-/*!
- @method close
- @abstract Closes the Localytics session.  This should be called in
- <code>applicationWillTerminate</code>.
- <br>
- If close is not called, the session will still be uploaded but no
- events will be processed and the session time will not appear. This is
- because the session is not yet closed so it should not be used in
- comparison with sessions which are closed.
- */
-- (void)close;
-
-/*!
- @method tagEvent
- @abstract Allows a session to tag a particular event as having occurred.  For
- example, if a view has three buttons, it might make sense to tag
- each button click with the name of the button which was clicked. 
- For another example, in a game with many levels it might be valuable
- to create a new tag every time the user gets to a new level in order
- to determine how far the average user is progressing in the game.
- <br>
- <strong>Tagging Best Practices</strong>
- <ul>
- <li>DO NOT use tags to record personally identifiable information.</li>
- <li>The best way to use tags is to create all the tag strings as predefined
- constants and only use those.  This is more efficient and removes the risk of
- collecting personal information.</li>
- <li>Do not set tags inside loops or any other place which gets called
- frequently.  This can cause a lot of data to be stored and uploaded.</li>
- </ul>
- <br>
- See the tagging guide at: http://wiki.localytics.com/
- @param event The name of the event which occurred.
- */
-- (void)tagEvent:(NSString *)event;
-
-- (void)tagEvent:(NSString *)event attributes:(NSDictionary *)attributes;
-
-- (void)tagEvent:(NSString *)event attributes:(NSDictionary *)attributes reportAttributes:(NSDictionary *)reportAttributes;
-
-/*!
- @method tagScreen
- @abstract Allows tagging the flow of screens encountered during the session.
- @param screen The name of the screen 
- */
-- (void)tagScreen:(NSString *)screen;
-
-/*!
- @method upload
- @abstract Creates a low priority thread which uploads any Localytics data already stored 
- on the device.  This should be done early in the process life in order to 
- guarantee as much time as possible for slow connections to complete.  It is also reasonable
- to upload again when the application is exiting because if the upload is cancelled the data
- will just get uploaded the next time the app comes up.
- */
-- (void)upload;
-
-/*!
- @method setCustomDimension
- @abstract (ENTERPRISE ONLY) Sets the value of a custom dimension. Custom dimensions are dimensions
- which contain user defined data unlike the predefined dimensions such as carrier, model, and country.
- Once a value for a custom dimension is set, the device it was set on will continue to upload that value
- until the value is changed. To clear a value pass nil as the value. 
- The proper use of custom dimensions involves defining a dimension with less than ten distinct possible
- values and assigning it to one of the four available custom dimensions. Once assigned this definition should
- never be changed without changing the App Key otherwise old installs of the application will pollute new data.
- */
-- (void)setCustomDimension:(int)dimension value:(NSString *)value;
-
-@end

Localytics/LocalyticsUploader.h

@@ -1,42 +0,0 @@
-//  LocalyticsUploader.h
-//  Copyright (C) 2009 Char Software Inc., DBA Localytics
-// 
-//  This code is provided under the Localytics Modified BSD License.
-//  A copy of this license has been distributed in a file called LICENSE
-//  with this source code.  
-// 
-// Please visit www.localytics.com for more information.
-
-#import <UIKit/UIKit.h>
-
-/*!
- @class LocalyticsUploader
- @discussion Singleton class to handle data uploads
- */
-
-@interface LocalyticsUploader : NSObject {
-}
-
-@property (readonly) BOOL isUploading;
-
-/*!
- @method sharedLocalyticsUploader
- @abstract Establishes this as a Singleton Class allowing for data persistence.
- The class is accessed within the code using the following syntax:
- [[LocalyticsUploader sharedLocalyticsUploader] functionHere]
- */
-+ (LocalyticsUploader *)sharedLocalyticsUploader;
-
-/*!
- @method LocalyticsUploader
- @abstract Creates a thread which uploads all queued header and event data.
- All files starting with sessionFilePrefix are renamed,
- uploaded and deleted on upload.  This way the sessions can continue
- writing data regardless of whether or not the upload succeeds.  Files
- which have been renamed still count towards the total number of Localytics
- files which can be stored on the disk.
- @param localyticsApplicationKey the Localytics application ID
- */
-- (void)uploaderWithApplicationKey:(NSString *)localyticsApplicationKey;
-
-@end

Localytics/LocalyticsUploader.m

@@ -1,236 +0,0 @@
-//  LocalyticsUploader.m
-//  Copyright (C) 2009 Char Software Inc., DBA Localytics
-// 
-//  This code is provided under the Localytics Modified BSD License.
-//  A copy of this license has been distributed in a file called LICENSE
-//  with this source code.  
-// 
-// Please visit www.localytics.com for more information.
-
-#import "LocalyticsUploader.h"
-#import "LocalyticsSession.h"
-#import "LocalyticsDatabase.h"
-#import <zlib.h>
-
-#define LOCALYTICS_URL    @"http://analytics.localytics.com/api/v2/applications/%@/uploads"
-
-static LocalyticsUploader *_sharedUploader = nil;
-
-@interface LocalyticsUploader ()
-- (void)finishUpload;
-- (NSData *)gzipDeflatedDataWithData:(NSData *)data;
-- (void)logMessage:(NSString *)message;
-
-@property (readwrite) BOOL isUploading;
-
-@end
-
-@implementation LocalyticsUploader
-@synthesize isUploading = _isUploading;
-
-#pragma mark - Singleton Class
-+ (LocalyticsUploader *)sharedLocalyticsUploader {
-	@synchronized(self) {
-		if (_sharedUploader == nil) {
-			_sharedUploader = [[self alloc] init];			
-		}
-	}
-	return _sharedUploader;
-}
-
-#pragma mark - Class Methods
-
-- (void)uploaderWithApplicationKey:(NSString *)localyticsApplicationKey {
-	
-	// Do nothing if already uploading.
-	if (self.isUploading == true) 
-	{
-		[self logMessage:@"Upload already in progress.  Aborting."];
-		return;
-	}
-
-	[self logMessage:@"Beginning upload process"];
-	self.isUploading = true;
-	
-	// Prepare the data for upload.  The upload could take a long time, so some effort has to be made to be sure that events
-	// which get written while the upload is taking place don't get lost or duplicated.  To achieve this, the logic is:
-    // 1) Append every header row blob string and and those of its associated events to the upload string.
-    // 2) Deflate and upload the data.
-    // 3) On success, delete all blob headers and staged events. Events added while an upload is in process are not
-    //    deleted because they are not associated a header (and cannot be until the upload completes).
-    
-    // Step 1
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    LocalyticsDatabase *db = [LocalyticsDatabase sharedLocalyticsDatabase];
-    NSString *blobString = [db uploadBlobString];
-
-    if ([blobString length] == 0) {
-        // There is nothing outstanding to upload.
-        [self logMessage:@"Abandoning upload. There are no new events."];
-        [pool drain];
-        [self finishUpload];
-        
-        return;
-    }
-
-	NSData *requestData = [blobString dataUsingEncoding:NSUTF8StringEncoding];
-    NSString *myString = [[[NSString alloc] initWithData:requestData encoding:NSUTF8StringEncoding] autorelease];
-    [self logMessage:[NSString  stringWithFormat:@"Uploading data (length: %u)", [myString length]]];
-    
-    // Step 2
-    NSData *deflatedRequestData = [[self gzipDeflatedDataWithData:requestData] retain];
-    
-    [pool drain];
-
-    NSString *apiUrlString = [NSString stringWithFormat:LOCALYTICS_URL, [localyticsApplicationKey stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-	NSMutableURLRequest *submitRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:apiUrlString]
-																			 cachePolicy:NSURLRequestReloadIgnoringCacheData 
-																			 timeoutInterval:60.0];
-	[submitRequest setHTTPMethod:@"POST"];
-	[submitRequest setValue:@"application/x-gzip" forHTTPHeaderField:@"Content-Type"];
-    [submitRequest setValue:@"gzip" forHTTPHeaderField:@"Content-Encoding"];
-	[submitRequest setValue:[NSString stringWithFormat:@"%d", [deflatedRequestData length]] forHTTPHeaderField:@"Content-Length"];
-	[submitRequest setHTTPBody:deflatedRequestData];
-    [deflatedRequestData release];
-
-    // Perform synchronous upload in an async dispatch. This is necessary because the calling block will not persist to
-    // receive the response data.
-    dispatch_group_async([[LocalyticsSession sharedLocalyticsSession] criticalGroup], [[LocalyticsSession sharedLocalyticsSession] queue], ^{
-        @try  {
-            NSURLResponse *response = nil;
-            NSError *responseError = nil;
-            [NSURLConnection sendSynchronousRequest:submitRequest returningResponse:&response error:&responseError];
-            NSInteger responseStatusCode = [(NSHTTPURLResponse *)response statusCode];
-            
-            if (responseError) {
-                // On error, simply print the error and close the uploader.  We have to assume the data was not transmited
-                // so it is not deleted.  In the event that we accidently store data which was succesfully uploaded, the
-                // duplicate data will be ignored by the server when it is next uploaded.
-                [self logMessage:[NSString stringWithFormat: 
-                                  @"Error Uploading.  Code: %d,  Description: %@", 
-                                  [responseError code], 
-                                  [responseError localizedDescription]]];
-            } else {
-                // Step 3
-                // While response status codes in the 5xx range leave upload rows intact, the default case is to delete.
-                if (responseStatusCode >= 500 && responseStatusCode < 600) {
-                    [self logMessage:[NSString stringWithFormat:@"Upload failed with response status code %d", responseStatusCode]];
-                } else {
-                    // Because only one instance of the uploader can be running at a time it should not be possible for
-                    // new upload rows to appear so there is no fear of deleting data which has not yet been uploaded.
-                    [self logMessage:[NSString stringWithFormat:@"Upload completed successfully. Response code %d", responseStatusCode]];
-                    [[LocalyticsDatabase sharedLocalyticsDatabase] deleteUploadedData];
-                }
-            }
-        }
-        @catch (NSException * e) {}
-        
-        [self finishUpload];
-    });
-}
-
-- (void)finishUpload
-{
-    self.isUploading = false;
-    
-    // Upload data has been deleted. Recover the disk space if necessary.
-    [[LocalyticsDatabase sharedLocalyticsDatabase] vacuumIfRequired];
-}
-
-/*!
- @method gzipDeflatedDataWithData
- @abstract Deflates the provided data using gzip at the default compression level (6). Complete NSData gzip category available on CocoaDev. http://www.cocoadev.com/index.pl?NSDataCategory.
- @return the deflated data
- */
-- (NSData *)gzipDeflatedDataWithData:(NSData *)data
-{
-	if ([data length] == 0) return data;
-	
-	z_stream strm;
-	
-	strm.zalloc = Z_NULL;
-	strm.zfree = Z_NULL;
-	strm.opaque = Z_NULL;
-	strm.total_out = 0;
-	strm.next_in=(Bytef *)[data bytes];
-	strm.avail_in = [data length];
-	
-	// Compresssion Levels:
-	//   Z_NO_COMPRESSION
-	//   Z_BEST_SPEED
-	//   Z_BEST_COMPRESSION
-	//   Z_DEFAULT_COMPRESSION
-	
-	if (deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, (15+16), 8, Z_DEFAULT_STRATEGY) != Z_OK) return nil;
-	
-	NSMutableData *compressed = [NSMutableData dataWithLength:16384];  // 16K chunks for expansion
-	
-	do {
-		
-		if (strm.total_out >= [compressed length])
-			[compressed increaseLengthBy: 16384];
-		
-		strm.next_out = [compressed mutableBytes] + strm.total_out;
-		strm.avail_out = [compressed length] - strm.total_out;
-		
-		deflate(&strm, Z_FINISH);  
-		
-	} while (strm.avail_out == 0);
-	
-	deflateEnd(&strm);
-	
-	[compressed setLength: strm.total_out];
-	return [NSData dataWithData:compressed];
-}
-
-/*!
- @method logMessage
- @abstract Logs a message with (localytics uploader) prepended to it
- @param message The message to log
- */
-- (void) logMessage:(NSString *)message {
-    if(DO_LOCALYTICS_LOGGING) {
-		NSLog(@"(localytics uploader) %s\n", [message UTF8String]);
-    }
-}
-
-#pragma mark - System Functions
-+ (id)allocWithZone:(NSZone *)zone {
-	@synchronized(self) {
-		if (_sharedUploader == nil) {
-			_sharedUploader = [super allocWithZone:zone];
-			return _sharedUploader;
-		}
-	}
-	// returns nil on subsequent allocations
-	return nil;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-	return self;
-}
-
-- (id)retain {
-	return self;
-}
-
-- (unsigned)retainCount {
-	// maximum value of an unsigned int - prevents additional retains for the class
-	return UINT_MAX;
-}
-
-- (oneway void)release {
-	// ignore release commands
-}
-
-- (id)autorelease {
-	return self;
-}
-
-- (void)dealloc {
-	[_sharedUploader release];
-    [super dealloc];
-}
-
-@end

Localytics/UploaderThread.h

@@ -1,48 +0,0 @@
-//  UploaderThread.h
-//  Copyright (C) 2009 Char Software Inc., DBA Localytics
-// 
-//  This code is provided under the Localytics Modified BSD License.
-//  A copy of this license has been distributed in a file called LICENSE
-//  with this source code.  
-// 
-// Please visit www.localytics.com for more information.
-
-#import <UIKit/UIKit.h>
-
-/*!
- @class UploaderThread
- @discussion Singleton class to handle data uploads
- */
-
-@interface UploaderThread : NSObject {
-	NSURLConnection *_uploadConnection;		// The connection which uploads the bits
-    NSInteger _responseStatusCode;          // The HTTP response status code for the current connection
-
-	BOOL _isUploading;						// A flag to gaurantee only one uploader instance can happen at once
-}
-
-@property (nonatomic, retain) NSURLConnection *uploadConnection;
-
-@property BOOL isUploading;
-
-/*!
- @method sharedUploaderThread
- @abstract Establishes this as a Singleton Class allowing for data persistence.
- The class is accessed within the code using the following syntax:
- [[UploaderThread sharedUploaderThread] functionHere]
- */
-+ (UploaderThread *)sharedUploaderThread;
-
-/*!
- @method UploaderThread
- @abstract Creates a thread which uploads all queued header and event data.
- All files starting with sessionFilePrefix are renamed,
- uploaded and deleted on upload.  This way the sessions can continue
- writing data regardless of whether or not the upload succeeds.  Files
- which have been renamed still count towards the total number of Localytics
- files which can be stored on the disk.
- @param localyticsApplicationKey the Localytics application ID
- */
-- (void)uploaderThreadwithApplicationKey:(NSString *)localyticsApplicationKey;
-
-@end

Localytics/UploaderThread.m

@@ -1,260 +0,0 @@
-//  UploaderThread.m
-//  Copyright (C) 2009 Char Software Inc., DBA Localytics
-// 
-//  This code is provided under the Localytics Modified BSD License.
-//  A copy of this license has been distributed in a file called LICENSE
-//  with this source code.  
-// 
-// Please visit www.localytics.com for more information.
-
-#import "UploaderThread.h"
-#import "LocalyticsSession.h"
-#import "LocalyticsDatabase.h"
-#import <zlib.h>
-
-#define LOCALYTICS_URL             @"http://analytics.localytics.com/api/v2/applications/%@/uploads"            // url to send the 
-
-static UploaderThread *_sharedUploaderThread = nil;
-
-@interface UploaderThread ()
-- (void)complete;
-- (NSData *)gzipDeflatedDataWithData:(NSData *)data;
-- (void)logMessage:(NSString *)message;
-@end
-
-@implementation UploaderThread
-
-@synthesize uploadConnection   = _uploadConnection;
-@synthesize isUploading        = _isUploading;
-
-#pragma mark Singleton Class
-+ (UploaderThread *)sharedUploaderThread {
-	@synchronized(self) {
-		if (_sharedUploaderThread == nil) 
-		{
-			_sharedUploaderThread = [[self alloc] init];			
-		}
-	}
-	return _sharedUploaderThread;
-}
-
-#pragma mark Class Methods
-- (void)uploaderThreadwithApplicationKey:(NSString *)localyticsApplicationKey {
-	
-	// Do nothing if already uploading.
-	if (self.uploadConnection != nil || self.isUploading == true) 
-	{
-		[self logMessage:@"Upload already in progress.  Aborting."];
-		return;
-	}
-
-	[self logMessage:@"Beginning upload process"];
-	self.isUploading = true;
-	
-	// Prepare the data for upload.  The upload could take a long time, so some effort has to be made to be sure that events
-	// which get written while the upload is taking place don't get lost or duplicated.  To achieve this, the logic is:
-    // 1) Append every header row blob string and and those of its associated events to the upload string.
-    // 2) Deflate and upload the data.
-    // 3) On success, delete all blob headers and staged events. Events added while an upload is in process are not
-    //    deleted because they are not associated a header (and cannot be until the upload completes).
-    
-    // Step 1
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    LocalyticsDatabase *db = [LocalyticsDatabase sharedLocalyticsDatabase];
-    NSString *blobString = [db uploadBlobString];
-
-    if ([blobString length] == 0) {
-        // There is nothing outstanding to upload.
-        [self logMessage:@"Abandoning upload. There are no new events."];
-
-        [pool drain];
-        [self complete];
-        return;
-    }
-
-	NSData *requestData = [blobString dataUsingEncoding:NSUTF8StringEncoding];
-    NSString *myString = [[[NSString alloc] initWithData:requestData encoding:NSUTF8StringEncoding] autorelease];
-    [self logMessage:@"Upload data:"];
-    [self logMessage:myString];
-    
-    // Step 2
-    NSData *deflatedRequestData = [[self gzipDeflatedDataWithData:requestData] retain];
-    
-    [pool drain];
-
-    NSString *apiUrlString = [NSString stringWithFormat:LOCALYTICS_URL, [localyticsApplicationKey stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-	NSMutableURLRequest *submitRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:apiUrlString]
-																			 cachePolicy:NSURLRequestReloadIgnoringCacheData 
-																			 timeoutInterval:60.0];
-	[submitRequest setHTTPMethod:@"POST"];
-	[submitRequest setValue:@"application/x-gzip" forHTTPHeaderField:@"Content-Type"];
-    [submitRequest setValue:@"gzip" forHTTPHeaderField:@"Content-Encoding"];
-	[submitRequest setValue:[NSString stringWithFormat:@"%d", [deflatedRequestData length]] forHTTPHeaderField:@"Content-Length"];
-	[submitRequest setHTTPBody:deflatedRequestData];
-    [deflatedRequestData release];
-	
-	// The NSURLConnection Object automatically spawns its own thread as a default behavior.
-	@try 
-	{
-		[self logMessage:@"Spawning new thread for upload"];
-		self.uploadConnection = [NSURLConnection connectionWithRequest:submitRequest delegate:self];
-		
-		// Step 3 is handled by connectionDidFinishLoading.
-	}
-	@catch (NSException * e) 
-	{ 
-		[self complete];
-	}	
-}
-
-#pragma mark **** NSURLConnection FUNCTIONS ****
-
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
-	// Used to gather response data from server - Not utilized in this version
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
-    // Could receive multiple response callbacks, likely due to redirection.
-    // Record status and act only when connection completes load.
-    _responseStatusCode = [(NSHTTPURLResponse *)response statusCode];
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
-	// If the connection finished loading, the files should be deleted. While response status codes in the 5xx range
-    // leave upload rows intact, the default case is to delete.
-    if (_responseStatusCode >= 500 && _responseStatusCode < 600)
-    {
-        [self logMessage:[NSString stringWithFormat:@"Upload failed with response status code %d", _responseStatusCode]];
-    } else
-    {
-        // The connection finished loading and uploaded data should be deleted.  Because only one instance of the
-        // uploader can be running at a time it should not be possible for new upload rows to appear so there is no
-        // fear of deleting data which has not yet been uploaded.
-        [self logMessage:[NSString stringWithFormat:@"Upload completed successfully. Response code %d", _responseStatusCode]];
-        [[LocalyticsDatabase sharedLocalyticsDatabase] deleteUploadData];
-    }
-
-	// Close upload session
-	[self complete];
-}
-
-- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
-	// On error, simply print the error and close the uploader.  We have to assume the data was not transmited
-	// so it is not deleted.  In the event that we accidently store data which was succesfully uploaded, the
-	// duplicate data will be ignored by the server when it is next uploaded.
-	[self logMessage:[NSString stringWithFormat: 
-					  @"Error Uploading.  Code: %d,  Description: %s", 
-					  [error code], 
-					  [error localizedDescription]]];
-
-	[self complete];
-}
-
-/*!
- @method complete
- @abstract closes the upload connection and reports back to the session that the upload is complete
- */
-- (void)complete {
-    _responseStatusCode = 0;
-	self.uploadConnection = nil;
-	self.isUploading = false;
-}
-
-/*!
- @method gzipDeflatedDataWithData
- @abstract Deflates the provided data using gzip at the default compression level (6). Complete NSData gzip category available on CocoaDev. http://www.cocoadev.com/index.pl?NSDataCategory.
- @return the deflated data
- */
-- (NSData *)gzipDeflatedDataWithData:(NSData *)data
-{
-	if ([data length] == 0) return data;
-	
-	z_stream strm;
-	
-	strm.zalloc = Z_NULL;
-	strm.zfree = Z_NULL;
-	strm.opaque = Z_NULL;
-	strm.total_out = 0;
-	strm.next_in=(Bytef *)[data bytes];
-	strm.avail_in = [data length];
-	
-	// Compresssion Levels:
-	//   Z_NO_COMPRESSION
-	//   Z_BEST_SPEED
-	//   Z_BEST_COMPRESSION
-	//   Z_DEFAULT_COMPRESSION
-	
-	if (deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, (15+16), 8, Z_DEFAULT_STRATEGY) != Z_OK) return nil;
-	
-	NSMutableData *compressed = [NSMutableData dataWithLength:16384];  // 16K chunks for expansion
-	
-	do {
-		
-		if (strm.total_out >= [compressed length])
-			[compressed increaseLengthBy: 16384];
-		
-		strm.next_out = [compressed mutableBytes] + strm.total_out;
-		strm.avail_out = [compressed length] - strm.total_out;
-		
-		deflate(&strm, Z_FINISH);  
-		
-	} while (strm.avail_out == 0);
-	
-	deflateEnd(&strm);
-	
-	[compressed setLength: strm.total_out];
-	return [NSData dataWithData:compressed];
-}
-
-/*!
- @method logMessage
- @abstract Logs a message with (localytics uploader) prepended to it
- @param message The message to log
-*/
-- (void) logMessage:(NSString *)message {
-    if(DO_LOCALYTICS_LOGGING) {
-		NSLog(@"(localytics uploader) %s\n", [message UTF8String]);
-    }
-}
-
-#pragma mark System Functions
-+ (id)allocWithZone:(NSZone *)zone {
-	@synchronized(self) {
-		if (_sharedUploaderThread == nil) {
-			_sharedUploaderThread = [super allocWithZone:zone];
-			return _sharedUploaderThread;
-		}
-	}
-	// returns nil on subsequent allocations
-	return nil;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-	return self;
-}
-
-- (id)retain {
-	return self;
-}
-
-- (unsigned)retainCount {
-	// maximum value of an unsigned int - prevents additional retains for the class
-	return UINT_MAX;
-}
-
-- (oneway void)release {
-	// ignore release commands
-}
-
-- (id)autorelease {
-	return self;
-}
-
-- (void)dealloc {
-	[_uploadConnection release];
-	[_sharedUploaderThread release];
-    [super dealloc];
-}
-
-@end

Localytics/WebserviceConstants.h

@@ -1,111 +0,0 @@
-//  WebserviceConstants.h
-//  Copyright (C) 2009 Char Software Inc., DBA Localytics
-// 
-//  This code is provided under the Localytics Modified BSD License.
-//  A copy of this license has been distributed in a file called LICENSE
-//  with this source code.  
-// 
-// Please visit www.localytics.com for more information.
-
-// The constants which are used to make up the JSON blob
-// To save disk space and network bandwidth all the keywords have been
-// abbreviated and are exploded by the server.  
-
-/*********************
- * Shared Attributes *
- *********************/
-#define PARAM_UUID                  @"u"        // UUID for JSON document
-#define PARAM_DATA_TYPE             @"dt"       // Data Type
-#define PARAM_CLIENT_TIME           @"ct"       // Client Time, seconds from Unix epoch (int)
-#define PARAM_LATITUDE              @"lat"      // Latitude - if available
-#define PARAM_LONGITUDE             @"lon"      // Longitude - if available
-#define PARAM_SESSION_UUID          @"su"       // UUID for an existing session
-#define PARAM_NEW_SESSION_UUID      @"u"        // UUID for a new session
-#define PARAM_ATTRIBUTES            @"attrs"    // Attributes (dictionary)
-
-/***************
- * Blob Header *
- ***************/
-
-// PARAM_UUID
-// PARAM_DATA_TYPE => "h" for Header
-// PARAM_ATTRIBUTES => dictionary containing Header Common Attributes
-#define PARAM_PERSISTED_AT          @"pa"       // Persistent Storage Created At. A timestamp created when the app was
-                                                // first launched and the persistent storage was created. Stores as 
-                                                // seconds from Unix epoch. (int)
-#define PARAM_SEQUENCE_NUMBER       @"seq"      // Sequence number - an increasing count for each blob, stored in the
-                                                // persistent store Consistent across app starts. (int)
-
-/****************************
- * Header Common Attributes *
- ****************************/
-
-// PARAM_DATA_TYPE
-#define PARAM_APP_KEY               @"au"		// Localytics Application ID
-#define PARAM_DEVICE_UUID           @"du"		// Device UUID
-#define PARAM_DEVICE_UUID_HASHED    @"udid"     // Hashed version of the UUID
-#define PARAM_DEVICE_MAC            @"wmac"     // Hashed version of the device Mac
-#define PARAM_INSTALL_ID            @"iu"       // Install ID
-#define PARAM_JAILBROKEN            @"j"        // Jailbroken (boolean)
-#define PARAM_LIBRARY_VERSION       @"lv"		// Client Version
-#define PARAM_APP_VERSION           @"av"       // Application Version
-#define PARAM_DEVICE_PLATFORM       @"dp"		// Device Platform
-#define PARAM_LOCALE_LANGUAGE       @"dll"		// Locale Language
-#define PARAM_LOCALE_COUNTRY        @"dlc"		// Locale Country
-#define PARAM_NETWORK_COUNTRY       @"nc"       // Network Country (iso code)   // ???: Never used on iPhone.
-#define PARAM_DEVICE_COUNTRY        @"dc"       // Device Country (iso code)
-#define PARAM_DEVICE_MANUFACTURER	@"dma"      // Device Manufacturer          // ???: Never used on iPhone. Used to be "Device Make".
-#define PARAM_DEVICE_MODEL          @"dmo"      // Device Model
-#define PARAM_DEVICE_OS_VERSION     @"dov"      // Device OS Version
-#define PARAM_NETWORK_CARRIER       @"nca"      // Network Carrier
-#define PARAM_DATA_CONNECTION       @"dac"      // Data Connection Type         // ???: Never used on iPhone.
-#define PARAM_OPT_VALUE             @"optin"	// Opt In (boolean)
-#define PARAM_DEVICE_MEMORY         @"dmem"     // Device Memory
-
-/*****************
- * Session Start *
- *****************/
-
-// PARAM_UUID
-// PARAM_DATA_TYPE => "s" for Start
-// PARAM_CLIENT_TIME
-#define PARAM_SESSION_NUMBER        @"nth"      // This is the nth session on the device, 1-indexed (int)
-
-/****************
- * Session Stop *
- ****************/
-
-// PARAM_UUID
-// PARAM_DATA_TYPE => "c" for Close
-// PARAM_CLIENT_TIME
-// PARAM_LATITUDE
-// PARAM_LONGITUDE
-// PARAM_SESSION_UUID => UUID of session being closed
-#define PARAM_SESSION_ACTIVE        @"cta"      // Active time in seconds (time app was active)
-#define PARAM_SESSION_TOTAL         @"ctl"      // Total session length
-#define PARAM_SESSION_SCREENFLOW    @"fl"       // Screens encountered during this session, in order
-
-/*********************
- * Application Event *
- *********************/
-
-// PARAM_UUID
-// PARAM_DATA_TYPE => "e" for Event
-// PARAM_CLIENT_TIME
-// PARAM_LATITUDE
-// PARAM_LONGITUDE
-// PARAM_SESSION_UUID => UUID of session event occured in
-// PARAM_ATTRIBUTES => dictionary containing attributes for this event as key-value string pairs
-#define PARAM_EVENT_NAME            @"n"        // Event Name, (eg. 'Button Click')
-#define PARAM_REPORT_ATTRIBUTES     @"rattrs"   // Attributes used in custom reports
-
-/********************
- * Application flow *
- ********************/
-
-// PARAM_UUID
-// PARAM_DATA_TYPE => "f" for Flow
-// PARAM_CLIENT_TIME
-#define PARAM_SESSION_START         @"ss"   // Start time for the current session.
-#define PARAM_NEW_FLOW_EVENTS       @"nw"   // Events and screens encountered during this session that have NOT been staged for upload.
-#define PARAM_OLD_FLOW_EVENTS       @"od"   // Events and screens encountered during this session that HAVE been staged for upload.

MasterPassword.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj">
+   </FileRef>
+</Workspace>

MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout

@@ -0,0 +1,125 @@
+<?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>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>1DC75A27-0030-4493-ACE8-E1D49AB9A549</string>
+	<key>IDESourceControlProjectName</key>
+	<string>MasterPassword</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>1AA8C0BE-EEC3-4FBC-A801-8939A1AC093A</key>
+		<string>git://github.com/Lyndir/love-lyndir.client.git</string>
+		<key>42C94803-87A2-403E-896C-D9AC3A807E1B</key>
+		<string>git://github.com/lhunath/UbiquityStoreManager.git</string>
+		<key>6A449EC2-A2A3-4635-9C5F-A811E011EAC3</key>
+		<string>ssh://github.com/Lyndir/MasterPassword.git</string>
+		<key>ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC</key>
+		<string>ssh://github.com/Lyndir/Pearl.git</string>
+		<key>AE3786C7-912B-4651-A73F-2E1DACBFB604</key>
+		<string>git://github.com/lhunath/uicolor-utilities.git</string>
+		<key>B0F634DD-AEE1-4F0D-AE35-4FAF51AD1B5A</key>
+		<string>git://github.com/lhunath/RHStatusItemView.git</string>
+		<key>CDDE92CF-0136-4DE0-8318-80EDB5C8CAF9</key>
+		<string>git://github.com/lhunath/InAppSettingsKit.git</string>
+		<key>E4C8E206-229C-4DA8-A130-0C544DEC7E07</key>
+		<string>git://github.com/jonmarimba/jrswizzle.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>MasterPassword.xcworkspace</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>1AA8C0BE-EEC3-4FBC-A801-8939A1AC093A</key>
+		<string>../External/LoveLyndir</string>
+		<key>42C94803-87A2-403E-896C-D9AC3A807E1B</key>
+		<string>../External/UbiquityStoreManager</string>
+		<key>6A449EC2-A2A3-4635-9C5F-A811E011EAC3</key>
+		<string>..</string>
+		<key>ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC</key>
+		<string>../External/Pearl</string>
+		<key>AE3786C7-912B-4651-A73F-2E1DACBFB604</key>
+		<string>../External/Pearl/External/uicolor-utilities</string>
+		<key>B0F634DD-AEE1-4F0D-AE35-4FAF51AD1B5A</key>
+		<string>../External/RHStatusItemView</string>
+		<key>CDDE92CF-0136-4DE0-8318-80EDB5C8CAF9</key>
+		<string>../External/InAppSettingsKit</string>
+		<key>E4C8E206-229C-4DA8-A130-0C544DEC7E07</key>
+		<string>../External/Pearl/External/jrswizzle</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>ssh://github.com/Lyndir/MasterPassword.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>110</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>6A449EC2-A2A3-4635-9C5F-A811E011EAC3</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>CDDE92CF-0136-4DE0-8318-80EDB5C8CAF9</string>
+			<key>IDESourceControlWCCName</key>
+			<string>InAppSettingsKit</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>E4C8E206-229C-4DA8-A130-0C544DEC7E07</string>
+			<key>IDESourceControlWCCName</key>
+			<string>jrswizzle</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>1AA8C0BE-EEC3-4FBC-A801-8939A1AC093A</string>
+			<key>IDESourceControlWCCName</key>
+			<string>LoveLyndir</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>6A449EC2-A2A3-4635-9C5F-A811E011EAC3</string>
+			<key>IDESourceControlWCCName</key>
+			<string>MasterPassword</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC</string>
+			<key>IDESourceControlWCCName</key>
+			<string>Pearl</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>B0F634DD-AEE1-4F0D-AE35-4FAF51AD1B5A</string>
+			<key>IDESourceControlWCCName</key>
+			<string>RHStatusItemView</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>42C94803-87A2-403E-896C-D9AC3A807E1B</string>
+			<key>IDESourceControlWCCName</key>
+			<string>UbiquityStoreManager</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>AE3786C7-912B-4651-A73F-2E1DACBFB604</string>
+			<key>IDESourceControlWCCName</key>
+			<string>uicolor-utilities</string>
+		</dict>
+	</array>
+</dict>
+</plist>

MasterPassword/C/build

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Run with -DDEBUG to enable trace-level output.
+
+[[ -e lib/scrypt/scryptenc.o ]] || { echo >&2 "Missing scrypt.  First get and build the scrypt source in lib/scrypt from <$(<lib/scrypt/.source)>.\n"; exit 1; }
+
+deps=( -I"lib/scrypt/lib" -I"lib/scrypt/libcperciva" -l "crypto_aesctr.o" -l "sha256.o" -l "crypto_scrypt-nosse.o" -l "memlimit.o" -l "scryptenc_cpuperf.o" -l"scryptenc.o" -l"crypto" -L"." -L"lib/scrypt" )
+
+gcc "${deps[@]}" -Qunused-arguments -c types.c -o types.o "$@"
+gcc "${deps[@]}" -Qunused-arguments -l"types.o" mpw.c -o mpw "$@"

MasterPassword/C/install

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+#
+# Install the Master Password CLI tool.
+set -e
+cd "${BASH_SOURCE%/*}"
+source bashlib
+
+inf "This will install the mpw tool."
+
+# Try to guess then ask for the bin dir to install to.
+IFS=: read -a paths <<< "$PATH"
+if inArray ~/bin "${paths[@]}"; then
+    bindir=~/bin
+elif inArray ~/.bin "${paths[@]}"; then
+    bindir=~/.bin
+elif inArray /usr/local/bin "${paths[@]}"; then
+    bindir=/usr/local/bin
+else
+    bindir=~/bin
+fi
+bindir=$(ask -d "$bindir" "What bin directory should I install to?")
+[[ -d "$bindir" ]] || mkdir "$bindir" || ftl 'Cannot create missing bin directory: %s' "$bindir" || exit
+[[ -w "$bindir" ]] || ftl 'Cannot write to bin directory: %s' "$bindir" || exit
+
+# Install Master Password.
+install mpw "$bindir"
+[[ ! -e "$bindir/bashlib" ]] && install bashlib "$bindir" ||:
+
+# Convenience bash function.
+inf "Installation successful!"
+echo
+
+inf "To improve usability, you can install an mpw function in your bash shell."
+inf "This function adds the following features:"
+inf "  - Automatically remember your user name in the shell if not set."
+inf "  - Automatically put the password in the clipboard (some platforms)."
+echo
+inf "To do this you need the following function in ~/.bashrc:\n%s" "$(<mpw.bashrc)"
+echo
+inf "We can do this for you automatically now."
+if ask -c Y!n "Append the mpw function to your .bashrc?"; then
+    cat mpw.bashrc >> ~/.bashrc
+    inf "Done!  Don't forget to run '%s' to apply the changes!" "source ~/.bashrc"
+fi
+echo
+
+inf "You can also save your user name in ~/.bashrc.  Leave blank to skip this step."
+if MP_USERNAME=$(ask "Your full name:") && [[ $MP_USERNAME ]] ; then
+    printf 'export MP_USERNAME=%q\n' "$MP_USERNAME" >> ~/.bashrc
+fi
+echo
+
+inf "To begin using Master Password, type: mpw [site name]"

MasterPassword/C/lib/scrypt-osx.patch

@@ -0,0 +1,38 @@
+diff -ruN /Users/lhunath/.src/scrypt/Makefile ./Makefile
+--- /Users/lhunath/.src/scrypt/Makefile	2014-05-02 11:28:58.000000000 -0400
++++ ./Makefile	2014-05-02 12:07:27.000000000 -0400
+@@ -2,11 +2,11 @@
+ VER?=	nosse
+ SRCS=	main.c
+ LDADD+=	-lcrypto
+-WARNS?=	6
++WARNS?=	0
+ 
+ # We have a config file for FreeBSD
+ CFLAGS	+=	-I .
+-CFLAGS	+=	-DCONFIG_H_FILE=\"config_freebsd.h\"
++CFLAGS	+=	-DCONFIG_H_FILE=\"config_osx.h\"
+ 
+ # Include all possible object files containing built scrypt code.
+ CLEANFILES	+=	crypto_scrypt-ref.o
+diff -ruN /Users/lhunath/.src/scrypt/lib/util/memlimit.c ./lib/util/memlimit.c
+--- /Users/lhunath/.src/scrypt/lib/util/memlimit.c	2014-05-02 11:28:58.000000000 -0400
++++ ./lib/util/memlimit.c	2014-05-02 11:52:42.000000000 -0400
+@@ -75,7 +75,7 @@
+ 	 * have returned to us.
+ 	 */
+ 	if (usermemlen == sizeof(uint64_t))
+-		usermem = *(uint64_t *)usermembuf;
++		usermem = *(uint64_t *)(void *)usermembuf;
+ 	else if (usermemlen == sizeof(uint32_t))
+ 		usermem = SIZE_MAX;
+ 	else
+diff -ruN /Users/lhunath/.src/scrypt/lib/util/memlimit.c ./lib/util/memlimit.c
+--- /Users/lhunath/.src/scrypt/config_osx.h	1969-12-31 19:00:00.000000000 -0500
++++ config_osx.h	2014-05-02 12:06:55.000000000 -0400
+@@ -0,0 +1,5 @@
++/* A default configuration for FreeBSD, used if there is no config.h. */
++
++#define HAVE_POSIX_MEMALIGN 1
++#define HAVE_SYSCTL_HW_USERMEM 1
++#define HAVE_SYS_PARAM_H 1

MasterPassword/C/lib/scrypt/.source

@@ -0,0 +1 @@
+https://code.google.com/p/scrypt/

MasterPassword/C/mpw.bashrc

@@ -0,0 +1,24 @@
+## Added by Master Password
+source bashlib
+mpw() {
+    _copy() {
+        if hash pbcopy 2>/dev/null; then
+            pbcopy
+        elif hash xclip 2>/dev/null; then
+            xclip
+        else
+            cat; echo 2>/dev/null
+            return
+        fi
+        echo >&2 "Copied!"
+    }
+
+    # Empty the clipboard
+    :| _copy 2>/dev/null
+
+    # Ask for the user's name and password if not yet known.
+    MP_USERNAME=${MP_USERNAME:-$(ask 'Your Full Name:')}
+
+    # Start Master Password and copy the output.
+    printf %s "$(MP_USERNAME=$MP_USERNAME command mpw "$@")" | _copy
+}

MasterPassword/C/mpw.c

@@ -0,0 +1,257 @@
+#define _WITH_GETLINE
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#if defined(__linux__)
+#include <linux/fs.h>
+#elif defined(__CYGWIN__)
+#include <cygwin/fs.h>
+#else
+#include <sys/disk.h>
+#endif
+#include <fcntl.h>
+#include <unistd.h>
+#include <math.h>
+#include <pwd.h>
+#include <netinet/in.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <alg/sha256.h>
+#include <crypto/crypto_scrypt.h>
+#include "types.h"
+
+#define MP_N                32768
+#define MP_r                8
+#define MP_p                2
+#define MP_dkLen            64
+#define MP_hash             PearlHashSHA256
+
+#define MP_env_username     "MP_USERNAME"
+#define MP_env_sitetype     "MP_SITETYPE"
+#define MP_env_sitecounter  "MP_SITECOUNTER"
+
+void usage() {
+      fprintf(stderr, "Usage: mpw [-u name] [-t type] [-c counter] site\n\n");
+      fprintf(stderr, "    -u name      Specify the full name of the user.\n"
+                      "                 Defaults to %s in env.\n\n", MP_env_username);
+      fprintf(stderr, "    -t type      Specify the password's template.\n"
+                      "                 Defaults to %s in env or 'long'.\n"
+                      "                     x, max, maximum | 20 characters, contains symbols.\n"
+                      "                     l, long         | Copy-friendly, 14 characters, contains symbols.\n"
+                      "                     m, med, medium  | Copy-friendly, 8 characters, contains symbols.\n"
+                      "                     b, basic        | 8 characters, no symbols.\n"
+                      "                     s, short        | Copy-friendly, 4 characters, no symbols.\n"
+                      "                     p, pin          | 4 numbers.\n\n", MP_env_sitetype);
+      fprintf(stderr, "    -c counter   The value of the counter.\n"
+                      "                 Defaults to %s in env or '1'.\n\n", MP_env_sitecounter);
+      exit(0);
+}
+
+char *homedir(const char *filename) {
+    char *homedir = NULL;
+#if defined(__CYGWIN__)
+    homedir = getenv("USERPROFILE");
+    if (!homedir) {
+        const char *homeDrive = getenv("HOMEDRIVE");
+        const char *homePath = getenv("HOMEPATH");
+        homedir = char[strlen(homeDrive) + strlen(homePath) + 1];
+        sprintf(homedir, "%s/%s", homeDrive, homePath);
+    }
+#else
+    struct passwd* passwd = getpwuid(getuid());
+    if (passwd)
+        homedir = passwd->pw_dir;
+    if (!homedir)
+        homedir = getenv("HOME");
+#endif
+    if (!homedir)
+        homedir = getcwd(NULL, 0);
+
+    char *homefile = NULL;
+    asprintf(&homefile, "%s/%s", homedir, filename);
+    return homefile;
+}
+
+int main(int argc, char *const argv[]) {
+
+    if (argc < 2)
+        usage();
+
+    // Read the environment.
+    const char *userName = getenv( MP_env_username );
+    const char *masterPassword = NULL;
+    const char *siteName = NULL;
+    MPElementType siteType = MPElementTypeGeneratedLong;
+    const char *siteTypeString = getenv( MP_env_sitetype );
+    uint32_t siteCounter = 1;
+    const char *siteCounterString = getenv( MP_env_sitecounter );
+
+    // Read the options.
+    char opt;
+    while ((opt = getopt(argc, argv, "u:t:c:h")) != -1)
+      switch (opt) {
+          case 'h':
+              usage();
+              break;
+          case 'u':
+              userName = optarg;
+              break;
+          case 't':
+              siteTypeString = optarg;
+              break;
+          case 'c':
+              siteCounterString = optarg;
+              break;
+          case '?':
+              switch (optopt) {
+                case 'u':
+                  fprintf(stderr, "Missing user name to option: -%c\n", optopt);
+                  break;
+                case 't':
+                  fprintf(stderr, "Missing type name to option: -%c\n", optopt);
+                  break;
+                case 'c':
+                  fprintf(stderr, "Missing counter value to option: -%c\n", optopt);
+                  break;
+                default:
+                  fprintf(stderr, "Unknown option: -%c\n", optopt);
+              }
+              return 1;
+          default:
+              abort();
+      }
+    if (optind < argc)
+        siteName = argv[optind];
+
+    // Convert and validate input.
+    if (!userName) {
+        fprintf(stderr, "Missing user name.\n");
+        return 1;
+    }
+    trc("userName: %s\n", userName);
+    if (!siteName) {
+        fprintf(stderr, "Missing site name.\n");
+        return 1;
+    }
+    trc("siteName: %s\n", siteName);
+    if (siteCounterString)
+        siteCounter = atoi( siteCounterString );
+    if (siteCounter < 1) {
+        fprintf(stderr, "Invalid site counter: %d\n", siteCounter);
+        return 1;
+    }
+    trc("siteCounter: %d\n", siteCounter);
+    if (siteTypeString)
+        siteType = TypeWithName( siteTypeString );
+    trc("siteType: %d (%s)\n", siteType, siteTypeString);
+
+    // Read the master password.
+    char *mpwConfigPath = homedir(".mpw");
+    if (!mpwConfigPath) {
+        fprintf(stderr, "Couldn't resolve path for configuration file: %d\n", errno);
+        return 1;
+    }
+    trc("mpwConfigPath: %s\n", mpwConfigPath);
+    FILE *mpwConfig = fopen(mpwConfigPath, "r");
+    if (!mpwConfig) {
+        fprintf(stderr, "Couldn't open configuration file: %s: %d\n", mpwConfigPath, errno);
+        return 1;
+    }
+    free(mpwConfigPath);
+    char *line = NULL;
+    size_t linecap = 0;
+    ssize_t linelen;
+    while ((linelen = getline(&line, &linecap, mpwConfig)) > 0)
+        if (strcmp(strsep(&line, ":"), userName) == 0) {
+            masterPassword = strsep(&line, "\n");
+            break;
+        }
+    if (!masterPassword) {
+        fprintf(stderr, "Missing master password for user: %s\n", userName);
+        return 1;
+    }
+    trc("masterPassword: %s\n", masterPassword);
+
+    // Calculate the master key salt.
+    char *mpNameSpace = "com.lyndir.masterpassword";
+    const uint32_t n_userNameLength = htonl(strlen(userName));
+    size_t masterKeySaltLength = strlen(mpNameSpace) + sizeof(n_userNameLength) + strlen(userName);
+    char *masterKeySalt = malloc( masterKeySaltLength );
+    if (!masterKeySalt) {
+        fprintf(stderr, "Could not allocate master key salt: %d\n", errno);
+        return 1;
+    }
+
+    char *mKS = masterKeySalt;
+    memcpy(mKS, mpNameSpace, strlen(mpNameSpace)); mKS += strlen(mpNameSpace);
+    memcpy(mKS, &n_userNameLength, sizeof(n_userNameLength)); mKS += sizeof(n_userNameLength);
+    memcpy(mKS, userName, strlen(userName)); mKS += strlen(userName);
+    if (mKS - masterKeySalt != masterKeySaltLength)
+        abort();
+    trc("masterKeySalt ID: %s\n", IDForBuf(masterKeySalt, masterKeySaltLength));
+
+    // Calculate the master key.
+    uint8_t *masterKey = malloc( MP_dkLen );
+    if (!masterKey) {
+        fprintf(stderr, "Could not allocate master key: %d\n", errno);
+        return 1;
+    }
+    if (crypto_scrypt( (const uint8_t *)masterPassword, strlen(masterPassword), (const uint8_t *)masterKeySalt, masterKeySaltLength, MP_N, MP_r, MP_p, masterKey, MP_dkLen ) < 0) {
+        fprintf(stderr, "Could not generate master key: %d\n", errno);
+        return 1;
+    }
+    memset(masterKeySalt, 0, masterKeySaltLength);
+    free(masterKeySalt);
+    trc("masterPassword Hex: %s\n", Hex(masterPassword, strlen(masterPassword)));
+    trc("masterPassword ID: %s\n", IDForBuf(masterPassword, strlen(masterPassword)));
+    trc("masterKey ID: %s\n", IDForBuf(masterKey, MP_dkLen));
+
+    // Calculate the site seed.
+    const uint32_t n_siteNameLength = htonl(strlen(siteName));
+    const uint32_t n_siteCounter = htonl(siteCounter);
+    size_t sitePasswordInfoLength = strlen(mpNameSpace) + sizeof(n_siteNameLength) + strlen(siteName) + sizeof(n_siteCounter);
+    char *sitePasswordInfo = malloc( sitePasswordInfoLength );
+    if (!sitePasswordInfo) {
+        fprintf(stderr, "Could not allocate site seed: %d\n", errno);
+        return 1;
+    }
+
+    char *sPI = sitePasswordInfo;
+    memcpy(sPI, mpNameSpace, strlen(mpNameSpace)); sPI += strlen(mpNameSpace);
+    memcpy(sPI, &n_siteNameLength, sizeof(n_siteNameLength)); sPI += sizeof(n_siteNameLength);
+    memcpy(sPI, siteName, strlen(siteName)); sPI += strlen(siteName);
+    memcpy(sPI, &n_siteCounter, sizeof(n_siteCounter)); sPI += sizeof(n_siteCounter);
+    if (sPI - sitePasswordInfo != sitePasswordInfoLength)
+        abort();
+    trc("seed from: hmac-sha256(masterKey, 'com.lyndir.masterpassword' | %s | %s | %s)\n", Hex(&n_siteNameLength, sizeof(n_siteNameLength)), siteName, Hex(&n_siteCounter, sizeof(n_siteCounter)));
+    trc("sitePasswordInfo ID: %s\n", IDForBuf(sitePasswordInfo, sitePasswordInfoLength));
+
+    uint8_t sitePasswordSeed[32];
+    HMAC_SHA256_Buf(masterKey, MP_dkLen, sitePasswordInfo, sitePasswordInfoLength, sitePasswordSeed);
+    memset(masterKey, 0, MP_dkLen);
+    memset(sitePasswordInfo, 0, sitePasswordInfoLength);
+    free(masterKey);
+    free(sitePasswordInfo);
+    trc("sitePasswordSeed ID: %s\n", IDForBuf(sitePasswordSeed, 32));
+
+    // Determine the cipher.
+    const char *cipher = CipherForType(siteType, sitePasswordSeed[0]);
+    trc("type %s, cipher: %s\n", siteTypeString, cipher);
+    if (strlen(cipher) > 32)
+        abort();
+
+    // Encode the password from the seed using the cipher.
+    char *sitePassword = calloc(strlen(cipher) + 1, sizeof(char));
+    for (int c = 0; c < strlen(cipher); ++c) {
+        sitePassword[c] = CharacterFromClass(cipher[c], sitePasswordSeed[c + 1]);
+        trc("class %c, character: %c\n", cipher[c], sitePassword[c]);
+    }
+    memset(sitePasswordSeed, 0, sizeof(sitePasswordSeed));
+
+    // Output the password.
+    fprintf( stdout, "%s\n", sitePassword );
+    return 0;
+}

MasterPassword/C/types.c

@@ -0,0 +1,140 @@
+//
+//  MPTypes.h
+//  MasterPassword
+//
+//  Created by Maarten Billemont on 02/01/12.
+//  Copyright (c) 2012 Lyndir. All rights reserved.
+//
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <alg/sha256.h>
+
+#include "types.h"
+
+const MPElementType TypeWithName(const char *typeName) {
+    char lowerTypeName[strlen(typeName)];
+    strcpy(lowerTypeName, typeName);
+    for (char *tN = lowerTypeName; *tN; ++tN)
+        *tN = tolower(*tN);
+
+    if (0 == strcmp(lowerTypeName, "x") || 0 == strcmp(lowerTypeName, "max") || 0 == strcmp(lowerTypeName, "maximum"))
+        return MPElementTypeGeneratedMaximum;
+    if (0 == strcmp(lowerTypeName, "l") || 0 == strcmp(lowerTypeName, "long"))
+        return MPElementTypeGeneratedLong;
+    if (0 == strcmp(lowerTypeName, "m") || 0 == strcmp(lowerTypeName, "med") || 0 == strcmp(lowerTypeName, "medium"))
+        return MPElementTypeGeneratedMedium;
+    if (0 == strcmp(lowerTypeName, "b") || 0 == strcmp(lowerTypeName, "basic"))
+        return MPElementTypeGeneratedBasic;
+    if (0 == strcmp(lowerTypeName, "s") || 0 == strcmp(lowerTypeName, "short"))
+        return MPElementTypeGeneratedShort;
+    if (0 == strcmp(lowerTypeName, "p") || 0 == strcmp(lowerTypeName, "pin"))
+        return MPElementTypeGeneratedPIN;
+
+    fprintf(stderr, "Not a generated type name: %s", lowerTypeName);
+    abort();
+}
+
+const char *CipherForType(MPElementType type, uint8_t seedByte) {
+    if (!(type & MPElementTypeClassGenerated)) {
+        fprintf(stderr, "Not a generated type: %d", type);
+        abort();
+    }
+
+    switch (type) {
+        case MPElementTypeGeneratedMaximum: {
+            char *ciphers[] = { "anoxxxxxxxxxxxxxxxxx", "axxxxxxxxxxxxxxxxxno" };
+            return ciphers[seedByte % 2];
+        }
+        case MPElementTypeGeneratedLong: {
+            char *ciphers[] = { "CvcvnoCvcvCvcv", "CvcvCvcvnoCvcv", "CvcvCvcvCvcvno", "CvccnoCvcvCvcv", "CvccCvcvnoCvcv", "CvccCvcvCvcvno", "CvcvnoCvccCvcv", "CvcvCvccnoCvcv", "CvcvCvccCvcvno", "CvcvnoCvcvCvcc", "CvcvCvcvnoCvcc", "CvcvCvcvCvccno", "CvccnoCvccCvcv", "CvccCvccnoCvcv", "CvccCvccCvcvno", "CvcvnoCvccCvcc", "CvcvCvccnoCvcc", "CvcvCvccCvccno", "CvccnoCvcvCvcc", "CvccCvcvnoCvcc", "CvccCvcvCvccno" };
+            return ciphers[seedByte % 21];
+        }
+        case MPElementTypeGeneratedMedium: {
+            char *ciphers[] = { "CvcnoCvc", "CvcCvcno" };
+            return ciphers[seedByte % 2];
+        }
+        case MPElementTypeGeneratedBasic: {
+            char *ciphers[] = { "aaanaaan", "aannaaan", "aaannaaa" };
+            return ciphers[seedByte % 3];
+        }
+        case MPElementTypeGeneratedShort: {
+            return "Cvcn";
+        }
+        case MPElementTypeGeneratedPIN: {
+            return "nnnn";
+        }
+        default: {
+            fprintf(stderr, "Unknown generated type: %d", type);
+            abort();
+        }
+    }
+}
+
+const char CharacterFromClass(char characterClass, uint8_t seedByte) {
+    const char *classCharacters;
+    switch (characterClass) {
+        case 'V': {
+            classCharacters = "AEIOU";
+            break;
+        }
+        case 'C': {
+            classCharacters = "BCDFGHJKLMNPQRSTVWXYZ";
+            break;
+        }
+        case 'v': {
+            classCharacters = "aeiou";
+            break;
+        }
+        case 'c': {
+            classCharacters = "bcdfghjklmnpqrstvwxyz";
+            break;
+        }
+        case 'A': {
+            classCharacters = "AEIOUBCDFGHJKLMNPQRSTVWXYZ";
+            break;
+        }
+        case 'a': {
+            classCharacters = "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz";
+            break;
+        }
+        case 'n': {
+            classCharacters = "0123456789";
+            break;
+        }
+        case 'o': {
+            classCharacters = "@&%?,=[]_:-+*$#!'^~;()/.";
+            break;
+        }
+        case 'x': {
+            classCharacters = "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz0123456789!@#$%^&*()";
+            break;
+        }
+        default: {
+            fprintf(stderr, "Unknown character class: %c", characterClass);
+            abort();
+         }
+    }
+
+    return classCharacters[seedByte % strlen(classCharacters)];
+}
+const char *IDForBuf(const void *buf, size_t length) {
+    uint8_t hash[32];
+    SHA256_Buf(buf, length, hash);
+
+    char *id = calloc(65, sizeof(char));
+    for (int kH = 0; kH < 32; kH++)
+        sprintf(&(id[kH * 2]), "%02X", hash[kH]);
+
+    return id;
+}
+
+const char *Hex(const void *buf, size_t length) {
+    char *id = calloc(length*2+1, sizeof(char));
+    for (int kH = 0; kH < length; kH++)
+        sprintf(&(id[kH * 2]), "%02X", ((const uint8_t*)buf)[kH]);
+    return id;
+}

MasterPassword/C/types.h

@@ -0,0 +1,52 @@
+//
+//  MPTypes.h
+//  MasterPassword
+//
+//  Created by Maarten Billemont on 02/01/12.
+//  Copyright (c) 2012 Lyndir. All rights reserved.
+//
+
+typedef enum {
+    MPElementContentTypePassword,
+    MPElementContentTypeNote,
+    MPElementContentTypePicture,
+} MPElementContentType;
+
+typedef enum {
+    /** Generate the password. */
+    MPElementTypeClassGenerated = 1 << 4,
+    /** Store the password. */
+    MPElementTypeClassStored = 1 << 5,
+} MPElementTypeClass;
+
+typedef enum {
+    /** Export the key-protected content data. */
+    MPElementFeatureExportContent = 1 << 10,
+    /** Never export content. */
+    MPElementFeatureDevicePrivate = 1 << 11,
+} MPElementFeature;
+
+typedef enum {
+    MPElementTypeGeneratedMaximum = 0x0 | MPElementTypeClassGenerated | 0x0,
+    MPElementTypeGeneratedLong = 0x1 | MPElementTypeClassGenerated | 0x0,
+    MPElementTypeGeneratedMedium = 0x2 | MPElementTypeClassGenerated | 0x0,
+    MPElementTypeGeneratedBasic = 0x4 | MPElementTypeClassGenerated | 0x0,
+    MPElementTypeGeneratedShort = 0x3 | MPElementTypeClassGenerated | 0x0,
+    MPElementTypeGeneratedPIN = 0x5 | MPElementTypeClassGenerated | 0x0,
+
+    MPElementTypeStoredPersonal = 0x0 | MPElementTypeClassStored | MPElementFeatureExportContent,
+    MPElementTypeStoredDevicePrivate = 0x1 | MPElementTypeClassStored | MPElementFeatureDevicePrivate,
+} MPElementType;
+
+#ifdef DEBUG
+#define trc(...) fprintf(stderr, __VA_ARGS__)
+#else
+#define trc(...) do {} while (0)
+#endif
+
+const MPElementType TypeWithName(const char *typeName);
+const char *CipherForType(MPElementType type, uint8_t seedByte);
+const char CharacterFromClass(char characterClass, uint8_t seedByte);
+const char *IDForBuf(const void *buf, size_t length);
+const char *Hex(const void *buf, size_t length);
+

MasterPassword/Java/masterpassword-algorithm/pom.xml

@@ -36,7 +36,7 @@
         <dependency>
             <groupId>net.sf.plist</groupId>
             <artifactId>property-list</artifactId>
-            <version>svn-SNAPSHOT</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.lambdaworks</groupId>

MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPElementType.java

@@ -15,22 +15,25 @@ public enum MPElementType {
     GeneratedMaximum( "Maximum Security Password", "Maximum", "20 characters, contains symbols.", MPElementTypeClass.Generated ),
     GeneratedLong( "Long Password", "Long", "Copy-friendly, 14 characters, contains symbols.", MPElementTypeClass.Generated ),
     GeneratedMedium( "Medium Password", "Medium", "Copy-friendly, 8 characters, contains symbols.", MPElementTypeClass.Generated ),
-    GeneratedShort( "Short Password", "Short", "Copy-friendly, 4 characters, no symbols.", MPElementTypeClass.Generated ),
     GeneratedBasic( "Basic Password", "Basic", "8 characters, no symbols.", MPElementTypeClass.Generated ),
+    GeneratedShort( "Short Password", "Short", "Copy-friendly, 4 characters, no symbols.", MPElementTypeClass.Generated ),
     GeneratedPIN( "PIN", "PIN", "4 numbers.", MPElementTypeClass.Generated ),
 
-    StoredPersonal( "Personal Password", "Personal", "AES-encrypted, exportable.", MPElementTypeClass.Stored, MPElementFeature.ExportContent ),
-    StoredDevicePrivate( "Device Private Password", "Private", "AES-encrypted, not exported.", MPElementTypeClass.Stored, MPElementFeature.DevicePrivate );
+    StoredPersonal( "Personal Password", "Personal", "AES-encrypted, exportable.", MPElementTypeClass.Stored,
+                    MPElementFeature.ExportContent ),
+    StoredDevicePrivate( "Device Private Password", "Private", "AES-encrypted, not exported.", MPElementTypeClass.Stored,
+                         MPElementFeature.DevicePrivate );
 
     static final Logger logger = Logger.get( MPElementType.class );
 
-    private final   MPElementTypeClass    typeClass;
-    private final   Set<MPElementFeature> typeFeatures;
-    private final   String                name;
-    private final   String                shortName;
+    private final MPElementTypeClass    typeClass;
+    private final Set<MPElementFeature> typeFeatures;
+    private final String                name;
+    private final String                shortName;
     private final String                description;
 
-    MPElementType(final String name, final String shortName, final String description, final MPElementTypeClass typeClass, final MPElementFeature... typeFeatures) {
+    MPElementType(final String name, final String shortName, final String description, final MPElementTypeClass typeClass,
+                  final MPElementFeature... typeFeatures) {
 
         this.name = name;
         this.shortName = shortName;
@@ -38,8 +41,9 @@ public enum MPElementType {
         this.description = description;
 
         ImmutableSet.Builder<MPElementFeature> typeFeaturesBuilder = ImmutableSet.builder();
-        for (final MPElementFeature typeFeature : typeFeatures)
+        for (final MPElementFeature typeFeature : typeFeatures) {
             typeFeaturesBuilder.add( typeFeature );
+        }
         this.typeFeatures = typeFeaturesBuilder.build();
     }
 
@@ -68,12 +72,37 @@ public enum MPElementType {
         return description;
     }
 
+    /**
+     * @param name The full or short name of the type we want to look up.  It is matched case insensitively.
+     *
+     * @return The type with the given name.
+     */
     public static MPElementType forName(final String name) {
 
-        for (final MPElementType type : values())
-            if (type.getName().equals( name ))
+        for (final MPElementType type : values()) {
+            if (type.getName().equalsIgnoreCase( name ) || type.getShortName().equalsIgnoreCase( name )) {
                 return type;
+            }
+        }
 
         throw logger.bug( "Element type not known: %s", name );
     }
+
+    /**
+     * @param typeClass The class for which we look up types.
+     *
+     * @return All types that support the given class.
+     */
+    public static ImmutableSet<MPElementType> forClass(final MPElementTypeClass typeClass) {
+
+        ImmutableSet.Builder<MPElementType> types = ImmutableSet.builder();
+        for (final MPElementType type : values()) {
+            if (type.getTypeClass() == typeClass) {
+                types.add( type );
+            }
+        }
+
+        return types.build();
+    }
+
 }

MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MPTemplates.java

@@ -32,10 +32,16 @@ public class MPTemplates extends MetaObject {
         this.templates = templates;
     }
 
+    public static MPTemplates load() {
+
+        return loadFromPList( "ciphers.plist" );
+    }
+
     public static MPTemplates loadFromPList(final String templateResource) {
 
         @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
         InputStream templateStream = Thread.currentThread().getContextClassLoader().getResourceAsStream( templateResource );
+        Preconditions.checkNotNull( templateStream, "Not found: %s", templateResource );
         try {
             NSObject plistObject = PropertyListParser.parse( templateStream );
             Preconditions.checkState( NSDictionary.class.isAssignableFrom( plistObject.getClass() ) );
@@ -98,6 +104,6 @@ public class MPTemplates extends MetaObject {
 
     public static void main(final String... arguments) {
 
-        loadFromPList( "templates.plist" );
+        load();
     }
 }

MasterPassword/Java/masterpassword-algorithm/src/main/java/com/lyndir/lhunath/masterpassword/MasterPassword.java

@@ -31,7 +31,7 @@ public abstract class MasterPassword {
     private static final ByteOrder                    MP_byteOrder = ByteOrder.BIG_ENDIAN;
     private static final MessageDigests               MP_hash      = MessageDigests.SHA256;
     private static final MessageAuthenticationDigests MP_mac       = MessageAuthenticationDigests.HmacSHA256;
-    private static final MPTemplates                  templates    = MPTemplates.loadFromPList( "templates.plist" );
+    private static final MPTemplates                  templates    = MPTemplates.load();
 
     public static byte[] keyForPassword(final String password, final String username) {
 

MasterPassword/Java/masterpassword-algorithm/src/main/resources/ciphers.plist

@@ -0,0 +1 @@
+../../../../../../MasterPassword/Resources/Data/ciphers.plist

MasterPassword/Java/masterpassword-algorithm/src/main/resources/templates.plist

@@ -1 +0,0 @@
-../../../../../../Resources/ciphers.plist

MasterPassword/Java/masterpassword-android/AndroidManifest.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.lyndir.lhunath.masterpassword" android:versionCode="1" android:versionName="GIT-SNAPSHOT">
+
+  <uses-sdk android:minSdkVersion="8"
+            android:targetSdkVersion="16" />
+
+  <application android:icon="@drawable/icon" android:label="@string/app_name">
+    <activity android:name=".HelloAndroidActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+
+</manifest>
+

MasterPassword/Java/masterpassword-android/default.properties

@@ -0,0 +1,3 @@
+# File used by Eclipse to determine the target system
+# Project target.
+target=android-16

MasterPassword/Java/masterpassword-android/pom.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- PROJECT METADATA -->
+    <parent>
+        <groupId>com.lyndir.lhunath.masterpassword</groupId>
+        <artifactId>masterpassword</artifactId>
+        <version>GIT-SNAPSHOT</version>
+    </parent>
+
+    <name>Master Password Android</name>
+    <description>An Android application to the Master Password algorithm</description>
+
+    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <artifactId>masterpassword-android</artifactId>
+    <packaging>apk</packaging>
+
+    <!-- BUILD CONFIGURATION -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+
+                <!--configuration>
+                    <proguard>
+                        <skip>false</skip>
+                        <config>proguard.cfg</config>
+                    </proguard>
+                </configuration-->
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- DEPENDENCY MANAGEMENT -->
+    <dependencies>
+
+        <!-- PROJECT REFERENCES -->
+        <dependency>
+            <groupId>com.lyndir.lhunath.masterpassword</groupId>
+            <artifactId>masterpassword-algorithm</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <version>4.1.1.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

MasterPassword/Java/masterpassword-android/proguard.cfg

@@ -0,0 +1,5 @@
+-ignorewarnings
+-dontoptimize
+-dontobfuscate
+-dontskipnonpubliclibraryclasses
+-dontskipnonpubliclibraryclassmembers

MasterPassword/Java/masterpassword-android/res/layout/main.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>

MasterPassword/Java/masterpassword-android/res/values/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello masterpassword-android!</string>
+    <string name="app_name">masterpassword-android</string>
+</resources>

MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/HelloAndroidActivity.java

@@ -0,0 +1,25 @@
+package com.lyndir.lhunath.masterpassword;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+public class HelloAndroidActivity extends Activity {
+
+    private static String TAG = "masterpassword-android";
+
+    /**
+     * Called when the activity is first created.
+     * @param savedInstanceState If the activity is being re-initialized after 
+     * previously being shut down then this Bundle contains the data it most 
+     * recently supplied in onSaveInstanceState(Bundle). <b>Note: Otherwise it is null.</b>
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+		Log.i(TAG, "onCreate");
+        setContentView(R.layout.main);
+    }
+
+}
+

MasterPassword/Java/masterpassword-cli/pom.xml

@@ -29,30 +29,49 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>com.lyndir.lhunath.masterpassword.CLI</mainClass>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                        </manifest>
-                    </archive>
-                </configuration>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>prepare-package</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <target>
+                                <chmod file="${project.build.directory}/install" perm="755"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.4</version>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.2</version>
                 <executions>
                     <execution>
-                        <id>copy-dependencies</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>copy-dependencies</goal>
+                            <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>com.lyndir.lhunath.masterpassword.CLI</mainClass>
+                                </transformer>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>

MasterPassword/Java/masterpassword-cli/src/main/resources/logback.xml

@@ -8,10 +8,6 @@
 
     <logger name="com.lyndir" level="TRACE" />
 
-    <!--
-    <logger name="org.apache.wicket" level="DEBUG" />
-    -->
-
     <root level="INFO">
         <appender-ref ref="STDOUT" />
     </root>

MasterPassword/Java/masterpassword-cli/src/main/scripts/install

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# Install the Master Password CLI tool.
+set -e
+cd "${BASH_SOURCE%/*}"
+source bashlib
+
+inf "This will install the mpw tool."
+
+# Try to guess then ask for the bin dir to install to.
+IFS=: read -a paths <<< "$PATH"
+if inArray ~/bin "${paths[@]}"; then
+    bindir=~/bin
+elif inArray ~/.bin "${paths[@]}"; then
+    bindir=~/.bin
+elif inArray /usr/local/bin "${paths[@]}"; then
+    bindir=/usr/local/bin
+else
+    bindir=~/bin
+fi
+bindir=$(ask -d "$bindir" "What bin directory should I install to?")
+[[ -d "$bindir" ]] || mkdir "$bindir" || ftl 'Cannot create missing bin directory: %s' "$bindir" || exit
+[[ -w "$bindir" ]] || ftl 'Cannot write to bin directory: %s' "$bindir" || exit
+
+# Try to guess then ask for the share dir to install to.
+sharedir=$(cd -P "$bindir/.."; [[ $bindir = */.bin ]] && printf '%s/.share' "$PWD" || printf '%s/share' "$PWD")
+sharedir=$(ask -d "$sharedir" "What share directory should I install to?")
+[[ -d "$sharedir" ]] || mkdir "$sharedir" || ftl 'Cannot create missing share directory: %s' "$sharedir" || exit
+[[ -w "$sharedir" ]] || ftl 'Cannot write to share directory: %s' "$sharedir" || exit
+
+# Install Master Password.
+sharepath=$sharedir/masterpassword
+mkdir -p "$sharepath"
+cp -a "masterpassword-cli-"*".jar" bashlib mpw "$sharepath"
+ex -c "%s~%SHAREPATH%~$sharepath~g|x" "$sharepath/mpw"
+ln -sf "$sharepath/mpw" "$bindir/mpw"
+chmod +x "$sharepath/mpw"
+[[ ! -e "$bindir/bashlib" ]] && ln -s "$sharepath/bashlib" "$bindir/bashlib" ||:
+
+# Convenience bash function.
+inf "Installation successful!"
+echo
+inf "To improve usability, you can install an mpw function in your bash shell."
+inf "This function adds the following features:"
+inf "  - Ask the Master Password once, remember in the shell."
+inf "  - Automatically put the password in the clipboard (some platforms)."
+echo
+inf "To do this you need the following function in ~/.bashrc:\n%s" "$(<mpw.bashrc)"
+echo
+inf "We can do this for you automatically now."
+if ask -c Y!n "Append the mpw function to your .bashrc?"; then
+    cat mpw.bashrc >> ~/.bashrc
+    inf "Done!  Don't forget to run '%s' to apply the changes!" "source ~/.bashrc"
+fi
+echo
+inf "To begin using Master Password, type: mpw [site name]"

MasterPassword/Java/masterpassword-cli/src/main/scripts/mpw

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
 
-cd "${BASH_SOURCE[0]%/*}"
-java -jar masterpassword-cli-GIT-SNAPSHOT.jar "$@"
+# Uncomment this to set your user name.  Master Password will no longer ask you for a user name.
+# export MP_USERNAME="Robert Lee Mitchell"
+# Uncomment this to hardcode your master password.  Make sure this file's permissions are tight.  Master Password will not ask you for your master password anymore.  This is probably not a good idea.
+# export MP_PASSWORD="banana colored duckling"
+
+cd "%SHAREPATH%"
+exec java -jar masterpassword-cli-GIT-SNAPSHOT.jar "$@"

MasterPassword/Java/masterpassword-cli/src/main/scripts/mpw.bashrc

@@ -0,0 +1,15 @@
+source bashlib
+mpw() {
+    _nocopy() { echo >&2 "$(cat)"; }
+    _copy() { "$(type -P pbcopy || type -P xclip || echo _nocopy)"; }
+
+    # Empty the clipboard
+    :| _copy 2>/dev/null
+
+    # Ask for the user's name and password if not yet known.
+    MP_USERNAME=${MP_USERNAME:-$(ask -s 'Your Full Name:')}
+    MP_PASSWORD=${MP_PASSWORD:-$(ask -s 'Master Password:')}
+
+    # Start Master Password and copy the output.
+    printf %s "$(MP_USERNAME=$MP_USERNAME MP_PASSWORD=$MP_PASSWORD command mpw "$@")" | _copy
+}

MasterPassword/Java/masterpassword-gui/pom.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- PROJECT METADATA -->
+    <parent>
+        <groupId>com.lyndir.lhunath.masterpassword</groupId>
+        <artifactId>masterpassword</artifactId>
+        <version>GIT-SNAPSHOT</version>
+    </parent>
+
+    <name>Master Password GUI</name>
+    <description>A GUI interface to the Master Password algorithm</description>
+
+    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <artifactId>masterpassword-gui</artifactId>
+    <packaging>jar</packaging>
+
+    <!-- BUILD CONFIGURATION -->
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>com.lyndir.lhunath.masterpassword.GUI</mainClass>
+                                </transformer>
+                            </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- DEPENDENCY MANAGEMENT -->
+    <dependencies>
+
+        <!-- PROJECT REFERENCES -->
+        <dependency>
+            <groupId>com.lyndir.lhunath.masterpassword</groupId>
+            <artifactId>masterpassword-algorithm</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AppleGUI.java

@@ -0,0 +1,32 @@
+package com.lyndir.lhunath.masterpassword;
+
+import com.apple.eawt.*;
+
+
+/**
+ * @author lhunath, 2014-06-10
+ */
+public class AppleGUI extends GUI {
+
+    public AppleGUI() {
+
+        Application application = Application.getApplication();
+        application.addAppEventListener( new AppForegroundListener() {
+
+            @Override
+            public void appMovedToBackground(AppEvent.AppForegroundEvent arg0) {
+            }
+
+            @Override
+            public void appRaisedToForeground(AppEvent.AppForegroundEvent arg0) {
+                open();
+            }
+        } );
+        application.addAppEventListener( new AppReOpenedListener() {
+            @Override
+            public void appReOpened(AppEvent.AppReOpenedEvent arg0) {
+                open();
+            }
+        } );
+    }
+}

MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/AuthenticationPanel.java

@@ -0,0 +1,48 @@
+package com.lyndir.lhunath.masterpassword;
+
+import com.google.common.io.Resources;
+import java.awt.*;
+import javax.swing.*;
+
+
+/**
+ * @author lhunath, 2014-06-11
+ */
+public abstract class AuthenticationPanel extends JPanel {
+
+    protected final UnlockFrame unlockFrame;
+
+    public AuthenticationPanel(final UnlockFrame unlockFrame) {
+        this.unlockFrame = unlockFrame;
+
+        setLayout( new BoxLayout( this, BoxLayout.PAGE_AXIS ) );
+
+        // Avatar
+        add( Box.createVerticalGlue() );
+        add( new JLabel( Res.avatar(0) ) {
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, Integer.MAX_VALUE );
+            }
+        } );
+        add( Box.createVerticalGlue() );
+    }
+
+    protected void updateUser(boolean repack) {
+        unlockFrame.setUser( getUser() );
+        validate();
+
+        if (repack)
+            unlockFrame.repack();
+    }
+
+    protected abstract User getUser();
+
+    public Component getFocusComponent() {
+        return null;
+    }
+
+    public String getHelpText() {
+        return null;
+    }
+}

MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/ConfigAuthenticationPanel.java

@@ -0,0 +1,164 @@
+package com.lyndir.lhunath.masterpassword;
+
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
+
+import com.google.common.base.Splitter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.io.CharStreams;
+import java.awt.*;
+import java.awt.event.*;
+import java.io.*;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+
+/**
+ * @author lhunath, 2014-06-11
+ */
+public class ConfigAuthenticationPanel extends AuthenticationPanel implements ItemListener, ActionListener, DocumentListener {
+
+    private final JComboBox      userField;
+    private final JLabel         masterPasswordLabel;
+    private final JPasswordField masterPasswordField;
+
+    public ConfigAuthenticationPanel(final UnlockFrame unlockFrame) {
+
+        // User
+        super( unlockFrame );
+        JLabel userLabel = new JLabel( "User:" );
+        userLabel.setAlignmentX( LEFT_ALIGNMENT );
+        userLabel.setHorizontalAlignment( SwingConstants.CENTER );
+        userLabel.setVerticalAlignment( SwingConstants.BOTTOM );
+        add( userLabel );
+
+        userField = new JComboBox<User>( new DefaultComboBoxModel<>( readConfigUsers() ) ) {
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        };
+        userField.setAlignmentX( LEFT_ALIGNMENT );
+        userField.addItemListener( this );
+        userField.addActionListener( this );
+        add( userField );
+
+        // Master Password
+        masterPasswordLabel = new JLabel( "Master Password:" );
+        masterPasswordLabel.setAlignmentX( Component.LEFT_ALIGNMENT );
+        masterPasswordLabel.setHorizontalAlignment( SwingConstants.CENTER );
+        masterPasswordLabel.setVerticalAlignment( SwingConstants.BOTTOM );
+        add( masterPasswordLabel );
+
+        masterPasswordField = new JPasswordField() {
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        };
+        masterPasswordField.setAlignmentX( Component.LEFT_ALIGNMENT );
+        masterPasswordField.addActionListener( this );
+        masterPasswordField.getDocument().addDocumentListener( this );
+        add( masterPasswordField );
+    }
+
+    @Override
+    public Component getFocusComponent() {
+        return masterPasswordField.isVisible()? masterPasswordField: null;
+    }
+
+    @Override
+    protected void updateUser(boolean repack) {
+        boolean masterPasswordMissing = userField.getSelectedItem() == null || !((User) userField.getSelectedItem()).hasKey();
+        if (masterPasswordField.isVisible() != masterPasswordMissing) {
+            masterPasswordLabel.setVisible( masterPasswordMissing );
+            masterPasswordField.setVisible( masterPasswordMissing );
+            repack = true;
+        }
+
+        super.updateUser( repack );
+    }
+
+    @Override
+    protected User getUser() {
+        User selectedUser = (User) userField.getSelectedItem();
+        if (selectedUser.hasKey()) {
+            return selectedUser;
+        }
+
+        return new User( selectedUser.getName(), new String( masterPasswordField.getPassword() ) );
+    }
+
+    public String getHelpText() {
+        return "Reads users from ~/.mpw, the following syntax applies:\nUser Name:masterpassword"
+               + "\n\nEnsure the file's permissions make it only readable by you!";
+    }
+
+    public static boolean hasConfigUsers() {
+        return new File( System.getProperty( "user.home" ), ".mpw" ).canRead();
+    }
+
+    private User[] readConfigUsers() {
+        ImmutableList.Builder<User> users = ImmutableList.builder();
+        File mpwConfig = new File( System.getProperty( "user.home" ), ".mpw" );
+        try (FileReader mpwReader = new FileReader( mpwConfig )) {
+            for (String line : CharStreams.readLines( mpwReader )) {
+                if (line.startsWith( "#" ) || line.startsWith( "//" ) || line.isEmpty()) {
+                    continue;
+                }
+
+                Iterator<String> fields = Splitter.on( ':' ).limit( 2 ).split( line ).iterator();
+                String userName = fields.next(), masterPassword = fields.next();
+                users.add( new User( userName, masterPassword ) );
+            }
+
+            return Iterables.toArray( users.build(), User.class );
+        }
+        catch (FileNotFoundException e) {
+            JOptionPane.showMessageDialog( this, "First create the config file at:\n" + mpwConfig.getAbsolutePath() +
+                                                 "\n\nIt should contain a line for each user of the following format:" +
+                                                 "\nUser Name:masterpassword" +
+                                                 "\n\nEnsure the file's permissions make it only readable by you!", //
+                                           "Config File Not Found", JOptionPane.WARNING_MESSAGE );
+            return new User[0];
+        }
+        catch (IOException | NoSuchElementException e) {
+            e.printStackTrace();
+            String error = ifNotNullElse( e.getLocalizedMessage(), ifNotNullElse( e.getMessage(), e.toString() ) );
+            JOptionPane.showMessageDialog( this, //
+                                           "Problem reading config file:\n" + mpwConfig.getAbsolutePath() //
+                                           + "\n\n" + error, //
+                                           "Config File Not Readable", JOptionPane.WARNING_MESSAGE );
+            return new User[0];
+        }
+    }
+
+    @Override
+    public void itemStateChanged(final ItemEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        updateUser( false );
+        unlockFrame.trySignIn( userField );
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+}

MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/GUI.java

@@ -0,0 +1,73 @@
+/*
+ *   Copyright 2008, Maarten Billemont
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.lyndir.lhunath.masterpassword;
+
+import com.google.common.base.Optional;
+import com.lyndir.lhunath.opal.system.util.TypeUtils;
+import java.io.IOException;
+import javax.swing.*;
+
+
+/**
+ * <p> <i>Jun 10, 2008</i> </p>
+ *
+ * @author mbillemo
+ */
+public class GUI implements UnlockFrame.SignInCallback {
+
+    private UnlockFrame unlockFrame = new UnlockFrame( this );
+    private PasswordFrame passwordFrame;
+
+    public static void main(final String[] args)
+            throws IOException {
+
+        // Apple
+        Optional<? extends GUI> appleGUI = TypeUtils.newInstance( AppleGUI.class );
+        if (appleGUI.isPresent()) {
+            appleGUI.get().open();
+            return;
+        }
+
+        // All others
+        new GUI().open();
+    }
+
+    void open() {
+        SwingUtilities.invokeLater( new Runnable() {
+            @Override
+            public void run() {
+                if (passwordFrame == null) {
+                    unlockFrame.setVisible( true );
+                } else {
+                    passwordFrame.setVisible( true );
+                }
+            }
+        } );
+    }
+
+    @Override
+    public boolean signedIn(final User user) {
+        if (!user.hasKey()) {
+            return false;
+        }
+        user.getKey();
+
+        passwordFrame = new PasswordFrame( user );
+
+        open();
+        return true;
+    }
+}

MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/PasswordFrame.java

@@ -0,0 +1,175 @@
+package com.lyndir.lhunath.masterpassword;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+
+import com.google.common.collect.Iterables;
+import com.lyndir.lhunath.masterpassword.util.Components;
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.border.*;
+import javax.swing.event.*;
+
+
+/**
+ * @author lhunath, 2014-06-08
+ */
+public class PasswordFrame extends JFrame implements DocumentListener {
+
+    private final User                     user;
+    private final JTextField               siteNameField;
+    private final JComboBox<MPElementType> siteTypeField;
+    private final JSpinner                 siteCounterField;
+    private final JLabel                   passwordLabel;
+
+    public PasswordFrame(User user)
+            throws HeadlessException {
+        super( "Master Password" );
+        this.user = user;
+
+        JLabel label;
+
+        setDefaultCloseOperation( DISPOSE_ON_CLOSE );
+        setContentPane( new JPanel( new BorderLayout( 20, 20 ) ) {
+            {
+                setBorder( new EmptyBorder( 20, 20, 20, 20 ) );
+            }
+        } );
+
+        // User
+        add( label = new JLabel( strf( "Generating passwords for: %s", user.getName() ) ), BorderLayout.NORTH );
+        label.setAlignmentX( LEFT_ALIGNMENT );
+
+        // Site
+        JPanel sitePanel = new JPanel();
+        sitePanel.setLayout( new BoxLayout( sitePanel, BoxLayout.PAGE_AXIS ) );
+        sitePanel.setBorder( new CompoundBorder( new EtchedBorder( EtchedBorder.RAISED ), new EmptyBorder( 8, 8, 8, 8 ) ) );
+        add( sitePanel, BorderLayout.CENTER );
+
+        // Site Name
+        sitePanel.add( label = new JLabel( "Site Name:", JLabel.LEADING ) );
+        label.setAlignmentX( LEFT_ALIGNMENT );
+
+        sitePanel.add( siteNameField = new JTextField() {
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        } );
+        siteNameField.setAlignmentX( LEFT_ALIGNMENT );
+        siteNameField.getDocument().addDocumentListener( this );
+        siteNameField.addActionListener( new ActionListener() {
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                updatePassword( new PasswordCallback() {
+                    @Override
+                    public void passwordGenerated(final String siteName, final String sitePassword) {
+                        StringSelection clipboardContents = new StringSelection( sitePassword );
+                        Toolkit.getDefaultToolkit().getSystemClipboard().setContents( clipboardContents, null );
+
+                        SwingUtilities.invokeLater( new Runnable() {
+                            @Override
+                            public void run() {
+                                dispose();
+                            }
+                        } );
+                    }
+                } );
+            }
+        } );
+
+        // Site Type & Counter
+        MPElementType[] types = Iterables.toArray( MPElementType.forClass( MPElementTypeClass.Generated ), MPElementType.class );
+        JComponent siteSettings = Components.boxLayout( BoxLayout.LINE_AXIS, //
+                                                        siteTypeField = new JComboBox<>( types ), //
+                                                        siteCounterField = new JSpinner(
+                                                                new SpinnerNumberModel( 1, 1, Integer.MAX_VALUE, 1 ) ) {
+                                                            @Override
+                                                            public Dimension getMaximumSize() {
+                                                                return new Dimension( 20, getPreferredSize().height );
+                                                            }
+                                                        } );
+        siteSettings.setAlignmentX( LEFT_ALIGNMENT );
+        sitePanel.add( siteSettings );
+        siteTypeField.setAlignmentX( LEFT_ALIGNMENT );
+        siteTypeField.setAlignmentY( CENTER_ALIGNMENT );
+        siteTypeField.setSelectedItem( MPElementType.GeneratedLong );
+        siteTypeField.addItemListener( new ItemListener() {
+            @Override
+            public void itemStateChanged(final ItemEvent e) {
+                updatePassword( null );
+            }
+        } );
+
+        siteCounterField.setAlignmentX( RIGHT_ALIGNMENT );
+        siteCounterField.setAlignmentY( CENTER_ALIGNMENT );
+        siteCounterField.addChangeListener( new ChangeListener() {
+            @Override
+            public void stateChanged(final ChangeEvent e) {
+                updatePassword( null );
+            }
+        } );
+
+        // Password
+        add( passwordLabel = new JLabel( " ", JLabel.CENTER ), BorderLayout.SOUTH );
+        passwordLabel.setAlignmentX( LEFT_ALIGNMENT );
+        passwordLabel.setFont( Res.sourceCodeProBlack().deriveFont( 40f ) );
+
+        pack();
+        setMinimumSize( getSize() );
+        setPreferredSize( new Dimension( 600, getSize().height ) );
+        pack();
+
+        setLocationByPlatform( true );
+        setLocationRelativeTo( null );
+    }
+
+    private void updatePassword(final PasswordCallback callback) {
+        final MPElementType siteType = (MPElementType) siteTypeField.getSelectedItem();
+        final String siteName = siteNameField.getText();
+        final int siteCounter = (Integer) siteCounterField.getValue();
+
+        if (siteType.getTypeClass() != MPElementTypeClass.Generated || siteName == null || siteName.isEmpty() || !user.hasKey()) {
+            passwordLabel.setText( null );
+            return;
+        }
+
+        Res.execute( new Runnable() {
+            @Override
+            public void run() {
+                final String sitePassword = MasterPassword.generateContent( siteType, siteName, user.getKey(), siteCounter );
+                if (callback != null) {
+                    callback.passwordGenerated( siteName, sitePassword );
+                }
+
+                SwingUtilities.invokeLater( new Runnable() {
+                    @Override
+                    public void run() {
+                        passwordLabel.setText( sitePassword );
+                    }
+                } );
+            }
+        } );
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        updatePassword( null );
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        updatePassword( null );
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        updatePassword( null );
+    }
+
+    interface PasswordCallback {
+
+        void passwordGenerated(String siteName, String sitePassword);
+    }
+}

MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/Res.java

@@ -0,0 +1,120 @@
+package com.lyndir.lhunath.masterpassword;
+
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse;
+import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+
+import com.google.common.base.Throwables;
+import com.google.common.io.Resources;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.awt.*;
+import java.awt.image.ImageObserver;
+import java.io.IOException;
+import java.net.URL;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.swing.*;
+
+
+/**
+ * @author lhunath, 2014-06-11
+ */
+public abstract class Res {
+
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+    private static final Logger          logger   = Logger.get( Res.class );
+
+    private static Font sourceCodeProBlack;
+
+    public static void execute(final Runnable job) {
+        executor.submit( new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    job.run();
+                }
+                catch (Throwable t) {
+                    logger.err( t, "Unexpected: %s", t.getLocalizedMessage() );
+                }
+            }
+        } );
+    }
+
+    public static Icon iconQuestion() {
+        return new RetinaIcon( Resources.getResource( "media/icon_question@2x.png" ) );
+    }
+
+    public static Icon avatar(final int index) {
+        return new RetinaIcon( Resources.getResource( strf( "media/avatar-%d@2x.png", index ) ) );
+    }
+
+    public static Font sourceCodeProBlack() {
+        try {
+            URL resource = Resources.getResource( "fonts/SourceCodePro-Bold.otf" );
+            Font font = Font.createFont( Font.TRUETYPE_FONT, resource.openStream() );
+            return sourceCodeProBlack != null? sourceCodeProBlack: //
+                    (sourceCodeProBlack = font);
+        }
+        catch (FontFormatException | IOException e) {
+            throw Throwables.propagate( e );
+        }
+    }
+
+    private static final class RetinaIcon extends ImageIcon {
+
+        private static final Pattern scalePattern = Pattern.compile(".*@(\\d+)x.[^.]+$");
+
+        private final float scale;
+
+        public RetinaIcon(final URL url) {
+            super( url );
+
+            Matcher scaleMatcher = scalePattern.matcher( url.getPath() );
+            if (scaleMatcher.matches())
+                scale = Float.parseFloat( scaleMatcher.group( 1 ) );
+            else
+                scale = 1;
+        }
+
+        //private static URL retinaURL(final URL url) {
+        //    try {
+        //        final boolean[] isRetina = new boolean[1];
+        //        new apple.awt.CImage.HiDPIScaledImage(1,1, BufferedImage.TYPE_INT_ARGB) {
+        //            @Override
+        //            public void drawIntoImage(BufferedImage image, float v) {
+        //                isRetina[0] = v > 1;
+        //            }
+        //        };
+        //        return isRetina[0];
+        //    } catch (Throwable e) {
+        //        e.printStackTrace();
+        //        return url;
+        //    }
+        //}
+
+        @Override
+        public int getIconWidth() {
+            return (int) (super.getIconWidth() / scale);
+        }
+
+        @Override
+        public int getIconHeight() {
+            return (int) (super.getIconHeight() / scale);
+        }
+
+        public synchronized void paintIcon(Component c, Graphics g, int x, int y) {
+            ImageObserver observer = ifNotNullElse( getImageObserver(), c );
+
+            Image image = getImage();
+            int width = image.getWidth( observer );
+            int height = image.getHeight( observer );
+            final Graphics2D g2d = (Graphics2D) g.create( x, y, width, height );
+
+            g2d.scale( 1 / scale, 1 / scale );
+            g2d.drawImage( image, 0, 0, observer );
+            g2d.scale( 1, 1 );
+            g2d.dispose();
+        }
+    }
+}

MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/TextAuthenticationPanel.java

@@ -0,0 +1,89 @@
+package com.lyndir.lhunath.masterpassword;
+
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+
+/**
+ * @author lhunath, 2014-06-11
+ */
+public class TextAuthenticationPanel extends AuthenticationPanel implements DocumentListener, ActionListener {
+
+    private final JTextField     userNameField;
+    private final JPasswordField masterPasswordField;
+
+    public TextAuthenticationPanel(final UnlockFrame unlockFrame) {
+
+        // User Name
+        super( unlockFrame );
+        JLabel userNameLabel = new JLabel( "User Name:" );
+        userNameLabel.setAlignmentX( Component.LEFT_ALIGNMENT );
+        userNameLabel.setHorizontalAlignment( SwingConstants.CENTER );
+        userNameLabel.setVerticalAlignment( SwingConstants.BOTTOM );
+        add( userNameLabel );
+
+        userNameField = new JTextField() {
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        };
+        userNameField.setAlignmentX( Component.LEFT_ALIGNMENT );
+        userNameField.getDocument().addDocumentListener( this );
+        userNameField.addActionListener( this );
+        add( userNameField );
+
+        // Master Password
+        JLabel masterPasswordLabel = new JLabel( "Master Password:" );
+        masterPasswordLabel.setAlignmentX( Component.LEFT_ALIGNMENT );
+        masterPasswordLabel.setHorizontalAlignment( SwingConstants.CENTER );
+        masterPasswordLabel.setVerticalAlignment( SwingConstants.BOTTOM );
+        add( masterPasswordLabel );
+
+        masterPasswordField = new JPasswordField() {
+            @Override
+            public Dimension getMaximumSize() {
+                return new Dimension( Integer.MAX_VALUE, getPreferredSize().height );
+            }
+        };
+        masterPasswordField.setAlignmentX( Component.LEFT_ALIGNMENT );
+        masterPasswordField.addActionListener( this );
+        masterPasswordField.getDocument().addDocumentListener( this );
+        add( masterPasswordField );
+    }
+
+    @Override
+    public Component getFocusComponent() {
+        return userNameField;
+    }
+
+    @Override
+    protected User getUser() {
+        return new User( userNameField.getText(), new String( masterPasswordField.getPassword() ) );
+    }
+
+    @Override
+    public void insertUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void removeUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void changedUpdate(final DocumentEvent e) {
+        updateUser( false );
+    }
+
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        updateUser( false );
+        unlockFrame.trySignIn( userNameField, masterPasswordField );
+    }
+}

MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/UnlockFrame.java

@@ -0,0 +1,175 @@
+package com.lyndir.lhunath.masterpassword;
+
+import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
+
+import com.lyndir.lhunath.masterpassword.util.Components;
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.border.*;
+
+
+/**
+ * @author lhunath, 2014-06-08
+ */
+public class UnlockFrame extends JFrame {
+
+    private final SignInCallback signInCallback;
+    private final JPanel         root;
+    private final JButton        signInButton;
+    private final JPanel         authenticationContainer;
+    private       boolean        useConfig;
+    public        User           user;
+
+    public UnlockFrame(final SignInCallback signInCallback)
+            throws HeadlessException {
+        super( "Unlock Master Password" );
+        this.signInCallback = signInCallback;
+
+        setDefaultCloseOperation( DISPOSE_ON_CLOSE );
+        setContentPane( root = new JPanel( new BorderLayout( 20, 20 ) ) );
+        root.setBorder( new EmptyBorder( 20, 20, 20, 20 ) );
+
+        authenticationContainer = new JPanel();
+        authenticationContainer.setLayout( new BoxLayout( authenticationContainer, BoxLayout.PAGE_AXIS ) );
+        authenticationContainer.setBorder( new CompoundBorder( new EtchedBorder( EtchedBorder.RAISED ), new EmptyBorder( 8, 8, 8, 8 ) ) );
+        add( authenticationContainer );
+
+        // Sign In
+        root.add( Components.boxLayout( BoxLayout.LINE_AXIS, Box.createGlue(), signInButton = new JButton( "Sign In" ), Box.createGlue() ),
+                  BorderLayout.SOUTH );
+        signInButton.setAlignmentX( LEFT_ALIGNMENT );
+        signInButton.addActionListener( new AbstractAction() {
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                trySignIn();
+            }
+        } );
+
+        useConfig = ConfigAuthenticationPanel.hasConfigUsers();
+        createAuthenticationPanel();
+
+        setLocationByPlatform( true );
+        setLocationRelativeTo( null );
+    }
+
+    protected void repack() {
+        setPreferredSize( null );
+        pack();
+        setMinimumSize( getSize() );
+        setPreferredSize( new Dimension( 300, 300 ) );
+        pack();
+    }
+
+    private void createAuthenticationPanel() {
+        authenticationContainer.removeAll();
+
+        final AuthenticationPanel authenticationPanel;
+        if (useConfig) {
+            authenticationPanel = new ConfigAuthenticationPanel( this );
+        } else {
+            authenticationPanel = new TextAuthenticationPanel( this );
+        }
+        authenticationPanel.updateUser( false );
+        authenticationContainer.add( authenticationPanel, BorderLayout.CENTER );
+
+        final JCheckBox typeCheckBox = new JCheckBox( "Use Config File" );
+        typeCheckBox.setAlignmentX( LEFT_ALIGNMENT );
+        typeCheckBox.setSelected( useConfig );
+        typeCheckBox.addItemListener( new ItemListener() {
+            @Override
+            public void itemStateChanged(final ItemEvent e) {
+                useConfig = typeCheckBox.isSelected();
+                SwingUtilities.invokeLater( new Runnable() {
+                    @Override
+                    public void run() {
+                        createAuthenticationPanel();
+                    }
+                } );
+            }
+        } );
+
+        JButton typeHelp = new JButton( Res.iconQuestion() );
+        typeHelp.setMargin( new Insets( 0, 0, 0, 0 ) );
+        typeHelp.setBackground( Color.red );
+        typeHelp.setAlignmentX( RIGHT_ALIGNMENT );
+        typeHelp.setBorder( null );
+        typeHelp.addActionListener( new ActionListener() {
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                JOptionPane.showMessageDialog( UnlockFrame.this, authenticationPanel.getHelpText(), "Help",
+                                               JOptionPane.INFORMATION_MESSAGE );
+            }
+        } );
+        if (authenticationPanel.getHelpText() == null) {
+            typeHelp.setVisible( false );
+        }
+        JComponent typePanel = Components.boxLayout( BoxLayout.LINE_AXIS, typeCheckBox, Box.createGlue(), typeHelp );
+        typePanel.setAlignmentX( Component.LEFT_ALIGNMENT );
+        authenticationContainer.add( typePanel );
+
+        checkSignIn();
+        validate();
+        repack();
+
+        SwingUtilities.invokeLater( new Runnable() {
+            @Override
+            public void run() {
+                ifNotNullElse( authenticationPanel.getFocusComponent(), signInButton ).requestFocusInWindow();
+            }
+        } );
+    }
+
+    void setUser(User user) {
+        this.user = user;
+        checkSignIn();
+    }
+
+    boolean checkSignIn() {
+        boolean enabled = user != null && !user.getName().isEmpty() && user.hasKey();
+        signInButton.setEnabled( enabled );
+
+        return enabled;
+    }
+
+    void trySignIn(final JComponent... signInComponents) {
+        if (!checkSignIn()) {
+            return;
+        }
+
+        for (JComponent signInComponent : signInComponents) {
+            signInComponent.setEnabled( false );
+        }
+
+        signInButton.setEnabled( false );
+        signInButton.setText( "Signing In..." );
+
+        Res.execute( new Runnable() {
+            @Override
+            public void run() {
+                final boolean success = signInCallback.signedIn( user );
+
+                SwingUtilities.invokeLater( new Runnable() {
+                    @Override
+                    public void run() {
+                        if (success) {
+                            dispose();
+                            return;
+                        }
+
+                        signInButton.setText( "Sign In" );
+                        for (JComponent signInComponent : signInComponents) {
+                            signInComponent.setEnabled( true );
+                        }
+                        checkSignIn();
+                    }
+                } );
+            }
+        } );
+    }
+
+    interface SignInCallback {
+
+        boolean signedIn(User user);
+    }
+}

MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/lhunath/masterpassword/User.java

@@ -0,0 +1,49 @@
+package com.lyndir.lhunath.masterpassword;
+
+import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
+
+
+/**
+ * @author lhunath, 2014-06-08
+ */
+public class User {
+
+    private final String name;
+    private final String masterPassword;
+    private       byte[] key;
+
+    public User(final String name, final String masterPassword) {
+        this.name = name;
+        this.masterPassword = masterPassword;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public boolean hasKey() {
+        return key != null || (masterPassword != null && !masterPassword.isEmpty());
+    }
+
+    public byte[] getKey() {
+        if (key == null) {
+            if (!hasKey()) {
+                throw new IllegalStateException( strf( "Master password unknown for user: %s", name ) );
+            } else {
+                key = MasterPassword.keyForPassword( masterPassword, name );
+            }
+        }
+
+        return key;
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}