Update logo.

[ADDED]     Password strength to type cells.
[FIXED]     Lots of misc UI fixes.
[ADDED]     Footer links in pull-down.

.gitignore

@@ -2,6 +2,7 @@
 .DS_Store
 
 # IntelliJ
+/MasterPassword/Java/.idea
 /.idea/*
 !/.idea/encodings.xml
 !/.idea/inspectionProfiles
@@ -12,14 +13,22 @@
 /*.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
+Press/Front-Page.png
+Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf
 
 # IPA
 /sendipa/*
 !/sendipa/sendipa.conf
+
+# Java
+MasterPassword/Java/**/target
+
+# C
+MasterPassword/C/mpw
+MasterPassword/C/lib/*/*
+!MasterPassword/C/lib/*/.source

.gitmodules

@@ -3,7 +3,13 @@
 	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/alekseyn/iCloudStoreManager.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
+[submodule "External/LoveLyndir"]
+	path = External/LoveLyndir
+	url = git://github.com/Lyndir/love-lyndir.client.git

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,17 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0" is_locked="false">
+    <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>

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</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/Headers/Crashlytics.h

@@ -1,89 +0,0 @@
-//
-//  Crashlytics.h
-//  Crashlytics
-//
-//  Copyright 2012 Crashlytics, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@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;
-}
-
-@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;
-
-@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 specififed a delay in one of the
- * startWithAPIKey:... calls, this will take at least that long to be invoked.
- *
- **/
-- (void)crashlyticsDidDetectCrashDuringPreviousExecution:(Crashlytics *)crashlytics;
-
-@end

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

@@ -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/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/TestFlight/README.md

@@ -0,0 +1,223 @@
+## Introduction
+
+The TestFlight SDK allows you to track how beta testers are testing your application. Out of the box we track simple usage information, such as which tester is using your application, their device model/OS, how long they used the application, and automatic recording of any crashes they encounter.
+
+The SDK can track more information if you pass it to TestFlight. The Checkpoint API is used to help you track exactly how your testers are using your application. Curious about which users passed level 5 in your game, or posted their high score to Twitter, or found that obscure feature? See "Checkpoint API" down below to see how.
+
+The SDK also offers a remote logging solution. Find out more about our logging system in the "Remote Logging" section.
+
+
+## Requirements
+
+The TestFlight SDK requires iOS 4.3 or above, the Apple LLVM compiler, and the libz library to run.
+
+                
+## Integration
+
+1. Add the files to your project: File -> Add Files to " "
+    1. Find and select the folder that contains the SDK
+    2. Make sure that "Copy items into destination folder (if needed)" is checked
+    3. Set Folders to "Create groups for any added folders"
+    4. Select all targets that you want to add the SDK to
+    
+2. Verify that libTestFlight.a has been added to the Link Binary With Libraries Build Phase for the targets you want to use the SDK with     
+    1. Select your Project in the Project Navigator
+    2. Select the target you want to enable the SDK for
+    3. Select the Build Phases tab
+    4. Open the Link Binary With Libraries Phase
+    5. If libTestFlight.a is not listed, drag and drop the library from your Project Navigator to the Link Binary With Libraries area
+    6. Repeat Steps 2 - 5 until all targets you want to use the SDK with have the SDK linked
+    
+3. Add libz to your Link Binary With Libraries Build Phase
+    1. Select your Project in the Project Navigator
+    2. Select the target you want to enable the SDK for
+    3. Select the Build Phases tab
+    4. Open the Link Binary With Libraries Phase
+    5. Click the + to add a new library
+    6. Find libz.dylib in the list and add it
+    7. Repeat Steps 2 - 6 until all targets you want to use the SDK with have libz.dylib
+    
+4. Get your App Token
+
+    1.  If this is a new application, and you have not uploaded it to TestFlight before, first register it here: [https://testflightapp.com/dashboard/applications/create/](https://testflightapp.com/dashboard/applications/create/).
+
+        Otherwise, if you have previously uploaded your app to TestFlight, go to your list of applications ([http://testflightapp.com/dashboard/applications/](http://testflightapp.com/dashboard/applications/)) and click on the application you are using from the list.
+        
+    2. Click on the "App Token" tab on the left. The App Token for that application will be there.
+    
+5. In your Application Delegate:
+
+    1. Import TestFlight: `#import "TestFlight.h"`
+    
+    2. Launch TestFlight with your App Token
+    
+        In your `-application:didFinishLaunchingWithOptions:` method, call `+[TestFlight takeOff:]` with your App Token.
+
+            -(BOOL)application:(UIApplication *)application 
+                didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+              // start of your application:didFinishLaunchingWithOptions 
+
+              [TestFlight takeOff:@"Insert your Application Token here"];
+
+              // The rest of your application:didFinishLaunchingWithOptions method
+              // ...
+            }
+
+    3. To report crashes to you we install our own uncaught exception handler. If you are not currently using an exception handler of your own then all you need to do is go to the next step. If you currently use an Exception Handler, or you use another framework that does please go to the section on advanced exception handling.
+
+
+## Uploading your build
+    
+After you have integrated the SDK into your application you need to upload your build to TestFlight. You can upload your build on our [website](https://testflightapp.com/dashboard/builds/add/), using our [desktop app](https://testflightapp.com/desktop/), or by using our [upload API](https://testflightapp.com/api/doc/).
+
+
+## Basic Features
+
+### Session Information
+
+View information about how often users use your app, how long they use it for, and when they use it. You can see what type of device the user is using, which OS, which language, etc.
+
+Sessions automatically start at when the app becomes active and end when the app resigns active. Sessions that start shortly after an end continue the session instead of starting a new one.
+
+NB: Sessions do not start when `takeOff:` is called, `takeOff:` registers callbacks to start sessions when the app is active.
+
+For **beta** users, you can see who the users are if they have a TestFlight account and their device is registered with TestFlight.
+
+
+### Crash Reports
+
+The TestFlight SDK automatically reports all crashes (beta and prod) to TestFlight's website where you can view them. Crash reports are sent **at** crash time. TestFlight will also automatically symbolicate all crashes (if you have uploaded your dSYM). For **beta** apps, on the site, you can see which checkpoints the user passed before the crash and see remote logs that were sent before the crash.
+
+
+### Beta In App Updates  
+
+If a user is using a **beta** version of your app and that user has permission to install it; an in app popup will ask them if they would like to install the update. If they tap "Install", the new version is installed from inside the app.
+
+NB: For this to work, you must increment your build version before uploading. Otherwise the new and old builds will have the same version number and we won't know if the user needs to update or is already using the new version.
+
+To turn this off set this option before calling `takeOff:`
+    
+    [TestFlight setOptions:@{ TFOptionDisableInAppUpdates : @YES }];
+
+
+## Additional Features
+    
+### Checkpoints
+
+When a tester does something you care about in your app, you can pass a checkpoint. For example completing a level, adding a todo item, etc. The checkpoint progress is used to provide insight into how your testers are testing your apps. The passed checkpoints are also attached to crashes, which can help when creating steps to replicate. Checkpoints are visible for all beta builds.
+
+    [TestFlight passCheckpoint:@"CHECKPOINT_NAME"];
+
+Use `passCheckpoint:` to track when a user performs certain tasks in your application. This can be useful for making sure testers are hitting all parts of your application, as well as tracking which testers are being thorough.
+
+Checkpoints are meant to tell you if a user visited a place in your app or completed a task. They should not be used for debugging purposes. Instead, use Remote Logging for debugging information (more information below).
+
+NB: Checkpoints are only recorded during BETA sessions.
+
+
+### Custom Environment Information
+
+In **beta** builds, if you want to see some extra information about your user, you can add some custom environment information. You must add this information before the session starts (a session starts at `takeOff:`) to see it on TestFlight's website. NB: You can only see this information for **beta** users.
+
+    [TestFlight addCustomEnvironmentInformation:@"info" forKey:@"key"];
+
+You may call this method as many times as you would like to add more information.
+
+
+### User Feedback
+
+In **beta** builds, if you collect feedback from your users, you may pass it back to TestFlight which will associate it with the user's current session.
+
+    [TestFlight submitFeedback:feedback];
+
+Once users have submitted feedback from inside of the application you can view it in the feedback area of your build page.
+
+
+### Remote Logging
+
+Remote Logging allows you to see the logs your app prints out remotely, on TestFlight's website. You can see logs for **beta sessions**.
+
+To use it, simply replace all of your `NSLog` calls with `TFLog` calls. An easy way to do this without rewriting all your `NSLog` calls is to add the following macro to your `.pch` file.
+
+    #import "TestFlight.h"
+    #define NSLog TFLog
+
+Not only will `TFLog` log remotely to TestFlight, it will also log to the console (viewable in a device's logs) and STDERR (shown while debugging) just like NSLog does, providing a complete replacement.
+
+For even better information in your remote logs, such as file name and line number, you can use this macro instead:
+
+    #define NSLog(__FORMAT__, ...) TFLog((@"%s [Line %d] " __FORMAT__), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__)
+
+Which will produce output that looks like
+
+    -[MyAppDelegate application:didFinishLaunchingWithOptions:] [Line 45] Launched!
+    
+NB: Logs are only recorded during sessions.
+
+**Custom Logging**
+
+If you have your own custom logging, call `TFLog` from your custom logging function. If you do not need `TFLog` to log to the console or STDERR because you handle those yourself, you can turn them off with these calls:
+
+    [TestFlight setOptions:@{ TFOptionLogToConsole : @NO }];
+    [TestFlight setOptions:@{ TFOptionLogToSTDERR : @NO }];
+    
+
+## Advanced Notes
+
+### Checkpoint API
+
+When passing a checkpoint, TestFlight logs the checkpoint synchronously (See Remote Logging for more information). If your app has very high performance needs, you can turn the logging off with the `TFOptionLogOnCheckpoint` option.
+
+
+### Remote Logging
+
+All logging is done synchronously. Every time the SDK logs, it must write data to a file. This is to ensure log integrity at crash time. Without this, we could not trust logs at crash time. If you have a high performance app, please email support@testflightapp.com for more options.
+
+
+### Advanced Session Control
+
+Continuing sessions: You can adjust the amount of time a user can leave the app for and still continue the same session when they come back by changing the `TFOptionSessionKeepAliveTimeout` option. Change it to 0 to turn the feature off.
+
+Manual Session Control: If your app is a music player that continues to play music in the background, a navigation app that continues to function in the background, or any app where a user is considered to be "using" the app even while the app is not active you should use Manual Session Control. Please only use manual session control if you know exactly what you are doing. There are many pitfalls which can result in bad session duration and counts. See `TestFlight+ManualSessions.h` for more information and instructions.
+
+
+### Advanced Exception/Signal Handling
+
+An uncaught exception means that your application is in an unknown state and there is not much that you can do but try and exit gracefully. Our SDK does its best to get the data we collect in this situation to you while it is crashing, but it is designed in such a way that the important act of saving the data occurs in as safe way a way as possible before trying to send anything. If you do use uncaught exception or signal handlers, install your handlers before calling `takeOff:`. Our SDK will then call your handler while ours is running. For example:
+
+      /*
+       My Apps Custom uncaught exception catcher, we do special stuff here, and TestFlight takes care of the rest
+      */
+      void HandleExceptions(NSException *exception) {
+        NSLog(@"This is where we save the application data during a exception");
+        // Save application data on crash
+      }
+      /*
+       My Apps Custom signal catcher, we do special stuff here, and TestFlight takes care of the rest
+      */
+      void SignalHandler(int sig) {
+        NSLog(@"This is where we save the application data during a signal");
+        // Save application data on crash
+      }
+
+      -(BOOL)application:(UIApplication *)application 
+      didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {    
+        // installs HandleExceptions as the Uncaught Exception Handler
+        NSSetUncaughtExceptionHandler(&HandleExceptions);
+        // create the signal action structure 
+        struct sigaction newSignalAction;
+        // initialize the signal action structure
+        memset(&newSignalAction, 0, sizeof(newSignalAction));
+        // set SignalHandler as the handler in the signal action structure
+        newSignalAction.sa_handler = &SignalHandler;
+        // set SignalHandler as the handlers for SIGABRT, SIGILL and SIGBUS
+        sigaction(SIGABRT, &newSignalAction, NULL);
+        sigaction(SIGILL, &newSignalAction, NULL);
+        sigaction(SIGBUS, &newSignalAction, NULL);
+        // Call takeOff after install your own unhandled exception and signal handlers
+        [TestFlight takeOff:@"Insert your Application Token here"];
+        // continue with your application initialization
+      }
+
+You do not need to add the above code if your application does not use exception handling already.
+

External/TestFlight/TestFlight+AsyncLogging.h

@@ -0,0 +1,30 @@
+//
+//  TestFlight+AsyncLogging.h
+//  libTestFlight
+//
+//  Created by Jason Gregori on 2/12/13.
+//  Copyright (c) 2013 TestFlight. All rights reserved.
+//
+
+/*
+
+ When logging, it is important that logs are written synchronously. In the event of a crash, all logs that happened before the crash are gauranteed to be on disk. If they were written asynchronously and a crash occurs, you might lose some very valuable logs that might have helped fixed the crash.
+ 
+ However, because TFLog waits until writing to disk is complete, it takes a while. If you have a very high preformance app that can't afford to wait for logs, these functions are for you.
+ 
+ USE THESE, BUT KNOW YOU RISK LOSING SOME LOGS AT CRASH TIME
+ 
+ */
+
+#import "TestFlight.h"
+
+
+
+#if __cplusplus
+extern "C" {
+#endif
+    void TFLog_async(NSString *format, ...) __attribute__((format(__NSString__, 1, 2)));
+    void TFLogv_async(NSString *format, va_list arg_list);
+#if __cplusplus
+}
+#endif

External/TestFlight/TestFlight+ManualSessions.h

@@ -0,0 +1,58 @@
+//
+//  TestFlight+ManualSessions.h
+//  libTestFlight
+//
+//  Created by Jason Gregori on 5/16/13.
+//  Copyright (c) 2013 TestFlight. All rights reserved.
+//
+
+/*
+ 
+ YOU ARE STRONGLY ADVISED NOT TO USE THESE METHODS unless you know exactly what you are doing. By using these you take on the responsibility of ensuring your session data is reported accurately.
+ 
+ The way TestFlight normally does sessions is to automatically start them at app launch, app did become active, and app will enter foreground and end them at app will resign active, app did enter background, or app will terminate.
+
+ If your app is a music player that continues to play music in the background, a navigation app that continues to function in the background, or any app where a user is considered to be "using" the app even while the app is not active, this file is for you.
+ 
+ 
+ Usage
+ -----
+ 
+ 1. Add this file to your project.
+
+ 2. Set the manual sessions option to true **before** calling `takeOff:`
+ 
+         [TestFlight setOptions:@{ TFOptionManualSessions : @YES }];
+ 
+ 3. Use the manually start/end session methods to control you sessions.
+ 
+ 
+ Pitfalls
+ --------
+ 
+ When using manual sessions in the background, you must always be aware of the fact that iOS may suspend your app at any time without any warning. You must end your session before that happens. If you do not, the session will continue and include all the time the app was suspended in it's duration if the app is brought back from suspension. This will lead to very inaccurate session lengths and counts.
+ 
+ On app termination: For the most accurate sessions, try to end your session if you know the app is about to terminate. If you do not, the session will still be ended on the next launch, however, it's end time will not be exact. In that case, the end time will be within 30 seconds of the correct time (session information is saved every 30 seconds and when a checkpoint is sent).
+ 
+ Sessions do not continue across termination if you do not end a session before termination.
+
+ On crashes: Do not worry about ending sessions in the event of a crash. Even manual sessions are automatically ended in the event of a crash.
+ 
+ Continuing sessions: If a session is started without 30 seconds of the last session ending (and their was no termination between the sessions), the last session will continue instead of a new session starting. This is the case in manual and automatic sessions. You may change the timeout or turn this feature off using the `TFOptionSessionKeepAliveTimeout` option.
+
+ */
+
+#import "TestFlight.h"
+
+
+
+extern NSString *const TFOptionManualSessions; // Defaults to @NO. Set to @YES before calling `takeOff:` in order to use manual session methods.
+
+
+@interface TestFlight (ManualSessions)
+
+// these methods are thread safe
++ (void)manuallyStartSession;
++ (void)manuallyEndSession;
+
+@end

External/TestFlight/TestFlight.h

@@ -0,0 +1,104 @@
+//
+//  TestFlight.h
+//  libTestFlight
+//
+//  Created by Jonathan Janzen on 06/11/11.
+//  Copyright 2011 TestFlight. All rights reserved.
+
+#import <Foundation/Foundation.h>
+#define TESTFLIGHT_SDK_VERSION @"3.0.0"
+#undef TFLog
+
+#if __cplusplus
+extern "C" { 
+#endif
+    /*
+     * Remote Logging
+     * BETA only
+     * Note: All Logging is synchronous, see the README for more information.
+     */
+    void TFLog(NSString *format, ...) __attribute__((format(__NSString__, 1, 2)));
+    void TFLogv(NSString *format, va_list arg_list);
+    void TFLogPreFormatted(NSString *message);
+#if __cplusplus
+}
+#endif
+
+/**
+ * TestFlight object
+ * All methods are class level
+ */
+@interface TestFlight : NSObject
+
+/**
+ * Add custom environment information
+ * BETA only
+ * If you want to track custom information such as a user name from your application you can add it here.
+ * NB: This information must be added before the session starts, it is recorded only on session start.
+ * 
+ * @param information A string containing the environment you are storing
+ * @param key The key to store the information with
+ */
++ (void)addCustomEnvironmentInformation:(NSString *)information forKey:(NSString*)key;
+
+
+/**
+ * Sets up TestFlight's infrastructure.
+ *
+ * - Saves App Token
+ * - Starts automatic session management
+ * - Installs Crash Handlers
+ * - Kicks off sending of old session data
+ *
+ * @param applicationToken Will be the application token for the current application.
+ *                         The token for this application can be retrieved by going to https://testflightapp.com/dashboard/applications/
+ *                         selecting this application from the list then selecting SDK.
+ */
++ (void)takeOff:(NSString *)applicationToken;
+
+/**
+ * Sets custom options
+ *
+ * @param options NSDictionary containing the options you want to set. Available options are described below at "TestFlight Option Keys"
+ *
+ */
++ (void)setOptions:(NSDictionary*)options;
+
+/**
+ * Track when a user has passed a checkpoint after the flight has taken off. Eg. passed level 1, posted high score.
+ * BETA only
+ * Checkpoints are sent in the background.
+ * Note: The checkpoint is logged synchronously (See TFLog and TFOptionLogOnCheckpoint for more information).
+ *
+ * @param checkpointName The name of the checkpoint, this should be a static string
+ */
++ (void)passCheckpoint:(NSString *)checkpointName;
+
+/**
+ * Submits custom feedback to the site. Sends the data in feedback to the site. This is to be used as the method to submit
+ * feedback from custom feedback forms.
+ * BETA only
+ *
+ * @param feedback Your users feedback, method does nothing if feedback is nil
+ */
++ (void)submitFeedback:(NSString*)feedback;
+
+@end
+
+
+/**
+ * TestFlight Option Keys
+ *
+ * Pass these as keys to the dictionary you pass to +`[TestFlight setOptions:]`.
+ * The values should be NSNumber BOOLs (`[NSNumber numberWithBool:YES]` or `@YES`)
+ */
+extern NSString *const TFOptionDisableInAppUpdates; // Defaults to @NO. Setting to @YES, disables the in app update screen shown in BETA apps when there is a new version available on TestFlight.
+extern NSString *const TFOptionFlushSecondsInterval; // Defaults to @60. Set to a number. @0 turns off the flush timer. 30 seconds is the minimum flush interval.
+extern NSString *const TFOptionLogOnCheckpoint; // Defaults to @YES. Because logging is synchronous, if you have a high preformance app, you might want to turn this off.
+extern NSString *const TFOptionLogToConsole; // Defaults to @YES. Prints remote logs to Apple System Log.
+extern NSString *const TFOptionLogToSTDERR; // Defaults to @YES. Sends remote logs to STDERR when debugger is attached.
+extern NSString *const TFOptionReinstallCrashHandlers; // If set to @YES: Reinstalls crash handlers, to be used if a third party library installs crash handlers overtop of the TestFlight Crash Handlers.
+extern NSString *const TFOptionReportCrashes; // Defaults to @YES. If set to @NO, crash handlers are never installed. Must be set **before** calling `takeOff:`.
+extern NSString *const TFOptionSendLogOnlyOnCrash; // Defaults to @NO. Setting to @YES stops remote logs from being sent when sessions end. They would only be sent in the event of a crash.
+extern NSString *const TFOptionSessionKeepAliveTimeout; // Defaults to @30. This is the amount of time a user can leave the app for and still continue the same session when they come back. If they are away from the app for longer, a new session is created when they come back. Must be a number. Change to @0 to turn off.
+

External/TestFlight/release_notes.md

@@ -0,0 +1,318 @@
+## 3.0.0 - February 18, 2014
+
+- Remove checkpoints, feedback, and logs from production apps.
+
+## 2.2.2 - February 5, 2014
+
+- Remove `+ (void)setDeviceIdentifier:(NSString *)deviceIdentifer`, it is no longer used
+- On start up, if unsent events are found only attempt to send some of them (this is in case a device doesn't have internet for a while and unsent events build up)
+- Fix crash if you try to run `TFLog(nil)` (thanks Florian!)
+
+## 2.2.1 - January 16, 2014
+
+- Consolidate both SDK versions into one which removes all access to `ASIdentifierManager`
+
+## 2.2 - December 17, 2013
+
+- Restore In App Updates
+- Automatic identification of beta testers
+
+## 2.1.3 - November 25, 2013
+
+- Fix bug in 2.1.2-noadid which caused adid to be collected
+
+## 2.1.2 - November 19, 2013
+
+- Fix for bug that caused events to not get sent properly when using the `TFOptionSessionKeepAliveTimeout` option
+- Fix for bug that caused logs that were sent immediately after start session to sometimes not be sent to server
+
+## 2.1.1 - October 2, 2013
+
+- Create sdk version that removes all access to `ASIdentifierManager`
+- Add UIDevice's `identifierForVendor`
+
+## 2.1 - September 30, 2013
+
+- Full support for the iPhone 5s’ ARM64 processor while still supporting down to iOS 4.3
+
+## 2.0.2 - August 30, 2013
+
+- Fixed a bug where the sdk would cause an app's CPU usage to rise significantly if the device had no internet connection when the app started
+
+## 2.0.1 - August 22, 2013
+
+- Fixed rare `8badf00d` crash in TFNetworkManager that happened when the app was in the background
+
+## 2.0 - August 12, 2013
+
+Improvements
+
+- ARC
+- All public TestFlight methods may be called from any thread or dispatch_queue
+- All public TestFlight methods (except for `TFLog` and `takeOff:`) are asynchronous, so there is never a wait on them
+- TestFlight never uses more than 1 network connection at a time
+- All network traffic is grouped together, sent at once, and transferred in MessagePack. This results in using less bandwidth and less network calls.
+- All network traffic if server is not reachable
+- Size of SDK reduced by 70%
+- New In App Update UI in an alert with landscape support. Should work for all different types of apps.
+- Manual Sessions: You can manually control session start and end. See `TestFlight+ManualSessions.h` for more information
+- Combining of back to back sessions. If a session starts less than 30 seconds from the last session which ended, the previous session is continued. You may change the time limit (or turn this off) using the `TFOptionSessionKeepAliveTimeout` option key.
+- No longer automatically starts a session on `+takeOff:` in order to support new background modes that might launch an app in the background.
+- `TFOptionReportCrashes` option to not install crash handlers
+- Remove all calls to `dispatch_get_current_queue`, it is deprecated
+
+Changes
+
+- Removed all access to mac address
+- Added AdSupport.framework requirement (as a replacement for mac address to get accurate user counts)
+- Add format attribute to TFLog to show warnings for wrong format specifiers or not using a format string
+- Removed Questions
+- Removed Feedback View (along with backtrace option)
+
+Bug Fixes
+
+- Fixed addrinfo memory leak
+- Fixed possible `-[TFAirTrafficController getNumberOrNilFrom:withKey:]` crash when bad data is received.
+- CoreTelephony crash work around: this is a workaround of a iOS bug that causes deallocated instances of `CTTelephonyNetworkInfo` to receive notifications which causes crashes. Core Telephony is used to retrieve the device's mobile carrier.
+- Fix bug with crash reporting in iOS 7
+
+
+## 1.2.4 - February 19, 2013
+
+- Fixed bug that caused crash reports to sometimes not send immediately (they would be resent later)
+
+## 1.2.3 - January 8, 2013
+
+- Fixed typos in readme
+- Fixed bug where logs not sent on crash
+- Fixed bug where empty crash files were created (but not sent)
+- Cache path to TF's directory so it does not need to be regenerated every time
+- Use consts for `setOptions:`
+- Updated `setDeviceIdentifier:` comments to make them clearer
+- Remove potentially conflicting function name `UIColorFromRGB`
+- Fixed crash on bad in app update data
+
+## 1.2.2 - December 26, 2012
+
+- Fix typo in app token error message
+
+## 1.2.1 - December 26, 2012
+
+- The max number of concurrent network connections has been reduced from 4 to 2.
+
+##1.2 - November 12, 2012
+
+* Removed Team Token support. As of version 1.2 takeOff must be called with the Application Token, https://testflightapp.com/dashboard/applications/, choose your application, select SDK, get the Token for this Application.
+
+##1.2 BETA 3 - October 11, 2012
+
+* Added application token support. Application Tokens are currently optional if you do not have one you do not need one
+
+##1.2 BETA 2 - October 9, 2012
+
+* Resolved an instance of close_file being called on a bad file descriptor
+
+##1.2 BETA 1 - October 1, 2012
+
+* Removed support for armv6
+* Exception handler now returns instead of raising a SIGTRAP
+
+##1.1 - September 13, 2012
+
+* armv7s and iOS 6 support
+* Updated for general release
+
+##1.1 BETA 3 - September 12, 2012
+
+* armv7s slice added to library
+* fixed typo for in application updates, inAppUdates changed to inAppUpdates
+
+##1.1 BETA 2 - September 6, 2012
+
+* Re-enabled armv6 support
+* Added option to disable in application updates
+
+##1.1 BETA 1 - July 13, 2012
+
+* Added TFLogv to allow for log customizations. Check the README or online docs for more information.
+* Added option attachBacktraceToFeedback, which attaches a backtrace to feedback sent from the SDK. For users who use feedback in more than one location in the application.
+* Resolved issue where other exception handlers would not be called during an exception.
+* SDK now sends the device language for a session.
+* Documentation fixes.
+* Stability fixes.
+
+###1.0 - March 29, 2012
+
+* Resolved occurrences of exceptions with the message "No background task exists with identifier 0"
+
+###1.0 BETA 1 - March 23, 2012
+
+* Privacy Updates
+* UDID is no longer collected by the SDK. During testing please use `[TestFlight setDeviceIdentifier:[[UIDevice currentDevice] uniqueIdentifier]];` to send the UDID so you can identify your testers. For release do not set `+setDeviceIdentifier`. See Beta Testing and Release Differentiation in the README or online at [https://testflightapp.com/sdk/doc/1.0beta1/](http://testflightapp.com/sdk/doc/1.0beta1/)
+
+###0.8.3 - February 14, 2012
+
+* Rolled previous beta code into release builds
+* No longer allow in application updates to occur in applications that were obtained from the app store.
+
+**Tested compiled library with:**
+
+* Xcode 4.3
+* Xcode 4.2
+* Xcode 4.1
+* Xcode 3.2.6
+
+###0.8.3 BETA 5 - February 10, 2012
+
+* Changed logging from asynchronous to synchronous.
+* Resolved crash when looking for a log path failed.
+* Added submitFeedback to the TestFlight class to allow for custom feedback forms.
+
+###0.8.3 BETA 4 - January 20, 2012
+
+* Resolved an issue that occured when an application was upgraded from 0.8.3 BETA 1 to 0.8.3 BETA 3+ with unsent data from 0.8.3 BETA 1
+
+###0.8.3 BETA 3 - January 19, 2012
+
+* On crash log files over 64k will not be sent until next launch.
+
+**Known Issues:**
+
+* Logging massive amounts of data at the end of a session may prevent the application from launching in time on next launch
+
+###0.8.3 BETA 2 - January 13, 2012
+
+* libz.dylib is now required to be added to your "Link Binary with Libraries" build phase
+* Log file compression, The compression is done on an as needed basis rather than before sending
+* Changed all outgoing data from JSON to MessagePack
+* Added option `logToSTDERR` to disable the `STDERR` logger
+
+###0.8.3 BETA 1 - December 29, 2011
+
+* In rare occurrences old session data that had not been sent to our server may have been discarded or attached to the wrong build. It is now no longer discarded
+* Made sending of Session End events more robust
+* Network queuing system does better bursting of unsent data
+* Log files that are larger than 64K are now sent sometime after the next launch
+* Log files that are larger than 16MB are no longer supported and will be replaced with a message indicating the log file was too large
+* Fixed crashes while resuming from background
+
+###0.8.2 - December 20, 2011
+
+* Promoted 0.8.2 BETA 4 to stable
+
+**Known Issues:**
+
+* Under some circumstances Session End events may not be sent until the next launch.
+* With large log files Session End events may take a long time to show up.
+
+**Tested compiled library with:**
+
+* Xcode 4.3
+* Xcode 4.2
+* Xcode 4.1
+* Xcode 3.2.6
+
+###0.8.2 BETA 4 - December 12, 2011
+
+* Prevented "The string argument is NULL" from occuring during finishedHandshake in rare cases
+* Resolved issue where data recorded while offline may not be sent
+
+###0.8.2 BETA 3 - December 8, 2011
+
+* Added auto-release pools to background setup and tear down
+
+###0.8.2 BETA 2 - December 5, 2011
+
+* Fixed the "pointer being freed was not allocated" bug
+
+###0.8.1 - November 18, 2011
+
+* Implemented TFLog logging system, see README for more information
+* Fixed an issue where Session End events may not be sent until next launch
+* Fixed an issue where duplicate events could be sent
+* Fixed an issue with Session End events not being sent from some iPod touch models
+
+**Tested compiled library with:**
+
+* Xcode 4.2
+* Xcode 4.1
+* Xcode 3.2.6
+
+###0.8 - November 8, 2011
+
+* Added `SIGTRAP` as a signal type that we catch
+* Removed all Objective-c from crash reporting
+* Removed the use of non signal safe functions from signal handling
+* Created a signal safe way to get symbols from a stack trace
+* Changed the keyboardType for Long Answer Questions and Feedback to allow for international character input
+* Changed `TESTFLIGHT_SDK_VERSION` string to be an `NSString`
+* Changed cache folder from Library/Caches/TestFlight to Library/Caches/com.testflight.testflightsdk
+* Fixed issue with saving data when device is offline
+* Fixed compability issues with iOS 3
+* Added calling into the rootViewController shouldAutorotateToInterfaceOrientation if a rootViewController is set
+* Made the comments in TestFlight.h compatible with Appledoc
+
+Tested compiled library with:
+
+* Xcode 4.2
+* Xcode 4.1
+* Xcode 3.2
+
+###0.7.2 - September 29, 2011
+
+* Changed `TESTFLIGHT_SDK_VERSION` string to be an `NSString`
+* Fixed an issue where exiting an application while the SDK is active caused modal views to be dismissed
+
+###0.7.1 - September 22, 2011
+
+* Internal release
+* Refactoring
+
+###0.7 - September 21, 2011
+
+* Moved TestFlight images and data to the Library/Caches folder
+* Resolved an issue where sometimes the rootViewController could not be found and feedback, questions and upgrade views would not be displayed
+* In application upgrade changed to allow skipping until the next version is installed and allows upgrades to be forced
+* Fixed a memory leak when launching questions
+
+###0.6 - September 2, 2011
+
+* Renamed base64_encode to testflight_base64_encode to remove a conflict with other third party libraries
+* Added ability to reinstall crash handlers when they are overwritten using the setOptions API
+* Fixed an issue where crash reports might not get sent under certain circumstances
+* Fixed a deadlock when the application is put in the background and then resumed before all information can be sent
+* Fixed an issue when attempting to un-install all signal handlers during a signal
+* Added support for landscape mode on the iPad to the Questions and Feedback views
+* Crash reporting now works in versions of Xcode earlier than 4.2
+* Fixed a memory leak during handshake
+
+###0.5 - August 19, 2011
+
+* Feedback that is not attached to a checkpoint [TestFlight openFeedbackView]
+* Usability changes to question views
+* Removed pause and resume sessions, replaced with sessions being stopped and started
+* Added text auto correction to the Long Answer question type
+* Crash reports now send on crash instead of next launch
+
+###0.4 - August 15, 2011
+
+* In Application Feedback with Questions
+* In application updates
+* Custom Environment Information added
+* Networking stack reimplementation
+* Exception handling fixes
+
+###0.3 - June 15, 2011
+
+* Removed all mention of JSONKit from the README
+* Added support for using both the Bundle Version and the Bundle Short Version string
+
+###0.2 - June 14, 2011
+
+* Removed all categories this allows users to use the SDK without having to set -ObjC and -load_all
+* Prefixed JSONKit for use in TestFlight to remove reported issues where some users were already using JSONKit
+* Added support for armv6 again
+
+###0.1 - June 11, 2011
+
+* Initial Version

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>11C74</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.0.1.3</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
+	<string>2.2.0</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0100.01.03</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>33</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,2 @@
+#!/usr/bin/env bash
+gcc -I"lib/scrypt/lib" -I"lib/scrypt/libcperciva" -I"lib/proplib/include" -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"prop" -L"lib/scrypt" -L"lib/proplib/src/.libs" mpw.c -o mpw

MasterPassword/C/ciphers.plist

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

MasterPassword/C/install

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+BINDIR=${BINDIR:+${PREFIX:+$PREFIX/bin}}
+[[ $BINDIR ]] && mkdir -p "$BINDIR"
+if [[ ! -w $BINDIR ]]; then
+    for dir in /usr/local/bin ~/.bin ~/bin /usr/bin; do
+        [[ -w $dir ]] && BINDIR=$dir && break
+    done
+    if [[ ! -w $BINDIR ]]; then
+        echo >&2 "Could not find directory to install to."
+        echo >&2 "You can specify a prefix to install to, eg. PREFIX=/usr/local ./install"
+        echo >&2 "You can specify a bin directory to install to, eg. BINDIR=~/bin ./install"
+        echo >&2 "Make sure you have write permission to the bin directory."
+    fi
+fi
+install -v -s mpw "$BINDIR"

MasterPassword/C/lib/proplib/.source

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

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.c

@@ -0,0 +1,218 @@
+#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 <uuid/uuid.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <alg/sha256.h>
+#include <crypto/crypto_scrypt.h>
+#include <prop/proplib.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"
+
+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[]) {
+
+    // Read the environment.
+    const char *userName = getenv( MP_env_username );
+    const char *masterPassword = NULL;
+    const char *siteName = NULL;
+    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:")) != -1)
+      switch (opt) {
+        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;
+    }
+    if (!siteName) {
+        fprintf (stderr, "Missing site name.\n");
+        return 1;
+    }
+    if (siteCounterString)
+        siteCounter = atoi( siteCounterString );
+    if (siteCounter < 1) {
+        fprintf (stderr, "Invalid site counter: %d\n", siteCounter);
+        return 1;
+    }
+
+    // Read the master password.
+    char *mpwConfigPath = homedir(".mpw");
+    if (!mpwConfigPath) {
+        fprintf (stderr, "Couldn't resolve path for configuration file: %d\n", errno);
+        return 1;
+    }
+    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 = line;
+            break;
+        }
+    if (!masterPassword) {
+        fprintf (stderr, "Missing master password for user: %s\n", userName);
+        return 1;
+    }
+
+    // Calculate the master key.
+    uint8_t *masterKey = malloc( MP_dkLen );
+    if (!masterKey) {
+        fprintf (stderr, "Could not allocate master key: %d\n", errno);
+        return 1;
+    }
+    const uint32_t n_userNameLength = htonl(strlen(userName));
+    char *masterKeySalt = NULL;
+    size_t masterKeySaltLength = asprintf(&masterKeySalt, "com.lyndir.masterpassword%s%s", (const char *) &n_userNameLength, userName);
+    if (!masterKeySalt) {
+        fprintf (stderr, "Could not allocate master key salt: %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);
+
+    // Calculate the site seed.
+    const uint32_t n_siteCounter = htonl(siteCounter), n_siteNameLength = htonl(strlen(siteName));
+    char *sitePasswordInfo = NULL;
+    size_t sitePasswordInfoLength = asprintf(&sitePasswordInfo, "com.lyndir.masterpassword%s%s%s", (const char *) &n_siteNameLength, siteName, (const char *) &n_siteCounter);
+    if (!sitePasswordInfo) {
+        fprintf (stderr, "Could not allocate site seed: %d\n", errno);
+        return 1;
+    }
+    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);
+
+    // Determine the cipher.
+    prop_dictionary_t MPTypes_ciphers = prop_dictionary_internalize_from_file("ciphers.plist");
+    if (!MPTypes_ciphers) {
+        fprintf (stderr, "Could not read cipher definitions: %d\n", errno);
+        return 1;
+    }
+    prop_array_t typeCiphers = prop_dictionary_get(prop_dictionary_get(MPTypes_ciphers, "[self classNameOfType:type]"), "[self nameOfType:type]");
+    if (!typeCiphers) {
+        fprintf (stderr, "Could not find cipher definition for type: %s\n", siteTypeString);
+        return 1;
+    }
+    prop_string_t cipher = prop_array_get(typeCiphers, sitePasswordSeed[0] % prop_array_count(typeCiphers));
+    if (!typeCiphers) {
+        fprintf (stderr, "Missing cipher definitions for type: %s\n", siteTypeString);
+        return 1;
+    }
+    //trc(@"type %@, ciphers: %@, selected: %@", [self nameOfType:type], typeCiphers, cipher);
+
+    // Encode the password from the seed using the cipher.
+    //NSAssert([seed length] >= [cipher length] + 1, @"Insufficient seed bytes to encode cipher.");
+    const prop_dictionary_t characterClasses = prop_dictionary_get(MPTypes_ciphers, "MPCharacterClasses");
+    char *sitePassword = calloc(prop_string_size(cipher) + 1, sizeof(char));
+    char cipherClass[2] = {0, 0};
+    for (int c = 0; c < prop_string_size(cipher); ++c) {
+        
+        const uint16_t keyByte = sitePasswordSeed[c + 1];
+        cipherClass[0] = prop_string_cstring_nocopy(cipher)[c];
+        const prop_string_t cipherClassCharacters = prop_dictionary_get(characterClasses, cipherClass);
+        const char character = prop_string_cstring_nocopy(cipherClassCharacters)[ keyByte % prop_string_size(cipherClassCharacters) ];
+
+        //trc(@"class %@ has characters: %@, index: %u, selected: %@", cipherClass, cipherClassCharacters, keyByte, character);
+        sitePassword[c] = character;
+    }
+    memset(sitePasswordSeed, 0, sizeof(sitePasswordSeed));
+
+    // Output the password.
+    fprintf( stdout, "%s\n", sitePassword );
+    return 0;
+}

MasterPassword/Java/masterpassword-algorithm/pom.xml

@@ -0,0 +1,49 @@
+<?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 Algorithm Implementation</name>
+    <description>The implementation of the Master Password algorithm</description>
+
+    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <artifactId>masterpassword-algorithm</artifactId>
+    <packaging>jar</packaging>
+
+    <!-- DEPENDENCY MANAGEMENT -->
+    <dependencies>
+
+        <!-- PROJECT REFERENCES -->
+        <dependency>
+            <groupId>com.lyndir.lhunath.opal</groupId>
+            <artifactId>opal-system</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lyndir.lhunath.opal</groupId>
+            <artifactId>opal-crypto</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <!-- EXTERNAL DEPENDENCIES -->
+        <dependency>
+            <groupId>net.sf.plist</groupId>
+            <artifactId>property-list</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.lambdaworks</groupId>
+            <artifactId>scrypt</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,14 @@
+package com.lyndir.lhunath.masterpassword;
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public enum MPElementFeature {
+
+    /** Export the key-protected content data. */
+    ExportContent,
+    /** Never export content. */
+    DevicePrivate,
+}

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

@@ -0,0 +1,79 @@
+package com.lyndir.lhunath.masterpassword;
+
+import com.google.common.collect.ImmutableSet;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.util.Set;
+
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+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 ),
+    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 );
+
+    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 String                description;
+
+    MPElementType(final String name, final String shortName, final String description, final MPElementTypeClass typeClass, final MPElementFeature... typeFeatures) {
+
+        this.name = name;
+        this.shortName = shortName;
+        this.typeClass = typeClass;
+        this.description = description;
+
+        ImmutableSet.Builder<MPElementFeature> typeFeaturesBuilder = ImmutableSet.builder();
+        for (final MPElementFeature typeFeature : typeFeatures)
+            typeFeaturesBuilder.add( typeFeature );
+        this.typeFeatures = typeFeaturesBuilder.build();
+    }
+
+    public MPElementTypeClass getTypeClass() {
+
+        return typeClass;
+    }
+
+    public Set<MPElementFeature> getTypeFeatures() {
+
+        return typeFeatures;
+    }
+
+    public String getName() {
+
+        return name;
+    }
+
+    public String getShortName() {
+
+        return shortName;
+    }
+
+    public String getDescription() {
+
+        return description;
+    }
+
+    public static MPElementType forName(final String name) {
+
+        for (final MPElementType type : values())
+            if (type.getName().equals( name ))
+                return type;
+
+        throw logger.bug( "Element type not known: %s", name );
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.lyndir.lhunath.masterpassword;
+
+import com.lyndir.lhunath.masterpassword.entity.*;
+
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public enum MPElementTypeClass {
+
+    Generated(MPElementGeneratedEntity.class),
+    Stored(MPElementStoredEntity.class);
+
+    private final Class<? extends MPElementEntity> entityClass;
+
+    MPElementTypeClass(final Class<? extends MPElementEntity> entityClass) {
+
+        this.entityClass = entityClass;
+    }
+
+    public Class<? extends MPElementEntity> getEntityClass() {
+
+        return entityClass;
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.lyndir.lhunath.masterpassword;
+
+import com.google.common.collect.ImmutableList;
+import com.lyndir.lhunath.opal.system.util.MetaObject;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public class MPTemplate extends MetaObject {
+
+    private final List<MPTemplateCharacterClass> template;
+
+    public MPTemplate(final String template, final Map<Character, MPTemplateCharacterClass> characterClasses) {
+
+        ImmutableList.Builder<MPTemplateCharacterClass> builder = ImmutableList.<MPTemplateCharacterClass>builder();
+        for (int i = 0; i < template.length(); ++i)
+            builder.add( characterClasses.get( template.charAt( i ) ) );
+
+        this.template = builder.build();
+    }
+
+    public MPTemplate(final List<MPTemplateCharacterClass> template) {
+
+        this.template = template;
+    }
+
+    public MPTemplateCharacterClass getCharacterClassAtIndex(final int index) {
+
+        return template.get( index );
+    }
+
+    public int length() {
+
+        return template.size();
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.lyndir.lhunath.masterpassword;
+
+import com.lyndir.lhunath.opal.system.util.MetaObject;
+import com.lyndir.lhunath.opal.system.util.ObjectMeta;
+
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public class MPTemplateCharacterClass extends MetaObject {
+
+    private final char   identifier;
+    @ObjectMeta(useFor = { })
+    private final char[] characters;
+
+    public MPTemplateCharacterClass(final char identifier, final char[] characters) {
+
+        this.identifier = identifier;
+        this.characters = characters;
+    }
+
+    public char getIdentifier() {
+
+        return identifier;
+    }
+
+    public char getCharacterAtRollingIndex(final int index) {
+
+        return characters[index % characters.length];
+    }
+}

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

@@ -0,0 +1,109 @@
+package com.lyndir.lhunath.masterpassword;
+
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Closeables;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.lhunath.opal.system.util.MetaObject;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import net.sf.plist.*;
+import net.sf.plist.io.PropertyListException;
+import net.sf.plist.io.PropertyListParser;
+
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public class MPTemplates extends MetaObject {
+
+    static final Logger logger = Logger.get( MPTemplates.class );
+
+    private final Map<MPElementType, List<MPTemplate>> templates;
+
+    public MPTemplates(final Map<MPElementType, List<MPTemplate>> templates) {
+
+        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() ) );
+            NSDictionary plist = (NSDictionary) plistObject;
+
+            NSDictionary characterClassesDict = (NSDictionary) plist.get( "MPCharacterClasses" );
+            NSDictionary templatesDict = (NSDictionary) plist.get( "MPElementGeneratedEntity" );
+
+            ImmutableMap.Builder<Character, MPTemplateCharacterClass> characterClassesBuilder = ImmutableMap.builder();
+            for (final Map.Entry<String, NSObject> characterClassEntry : characterClassesDict.entrySet()) {
+                String key = characterClassEntry.getKey();
+                NSObject value = characterClassEntry.getValue();
+                Preconditions.checkState( key.length() == 1 );
+                Preconditions.checkState( NSString.class.isAssignableFrom( value.getClass() ));
+
+                char character = key.charAt( 0 );
+                char[] characterClass = ((NSString)value).getValue().toCharArray();
+                characterClassesBuilder.put( character, new MPTemplateCharacterClass( character, characterClass ) );
+            }
+            ImmutableMap<Character, MPTemplateCharacterClass> characterClasses = characterClassesBuilder.build();
+
+            ImmutableMap.Builder<MPElementType, List<MPTemplate>> templatesBuilder = ImmutableMap.builder();
+            for (final Map.Entry<String, NSObject> template : templatesDict.entrySet()) {
+                String key = template.getKey();
+                NSObject value = template.getValue();
+                Preconditions.checkState( NSArray.class.isAssignableFrom( value.getClass() ) );
+
+                MPElementType type = MPElementType.forName( key );
+                List<NSObject> templateStrings = ((NSArray) value).getValue();
+
+                ImmutableList.Builder<MPTemplate> typeTemplatesBuilder = ImmutableList.<MPTemplate>builder();
+                for (final NSObject templateString : templateStrings)
+                    typeTemplatesBuilder.add( new MPTemplate( ((NSString) templateString).getValue(), characterClasses ) );
+
+                templatesBuilder.put( type, typeTemplatesBuilder.build() );
+            }
+            ImmutableMap<MPElementType, List<MPTemplate>> templates = templatesBuilder.build();
+
+            return new MPTemplates( templates );
+        }
+        catch (PropertyListException e) {
+            logger.err( e, "Could not parse templates from: %s", templateResource );
+            throw Throwables.propagate( e );
+        }
+        catch (IOException e) {
+            logger.err( e, "Could not read templates from: %s", templateResource );
+            throw Throwables.propagate( e );
+        }
+        finally {
+            Closeables.closeQuietly( templateStream );
+        }
+    }
+
+    public MPTemplate getTemplateForTypeAtRollingIndex(final MPElementType type, final int templateIndex) {
+
+        List<MPTemplate> typeTemplates = templates.get( type );
+
+        return typeTemplates.get( templateIndex % typeTemplates.size() );
+    }
+
+    public static void main(final String... arguments) {
+
+        load();
+    }
+}

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

@@ -0,0 +1,128 @@
+package com.lyndir.lhunath.masterpassword;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Bytes;
+import com.lambdaworks.crypto.SCrypt;
+import com.lyndir.lhunath.opal.crypto.CryptUtils;
+import com.lyndir.lhunath.opal.system.*;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
+import java.security.GeneralSecurityException;
+
+
+/**
+ * Implementation of the Master Password algorithm.
+ *
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public abstract class MasterPassword {
+
+    static final         Logger                       logger       = Logger.get( MasterPassword.class );
+    private static final int                          MP_N         = 32768;
+    private static final int                          MP_r         = 8;
+    private static final int                          MP_p         = 2;
+    private static final int                          MP_dkLen     = 64;
+    private static final Charset                      MP_charset   = Charsets.UTF_8;
+    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.load();
+
+    public static byte[] keyForPassword(final String password, final String username) {
+
+        long start = System.currentTimeMillis();
+        byte[] nusernameLengthBytes = ByteBuffer.allocate( Integer.SIZE / Byte.SIZE )
+                                                .order( MP_byteOrder )
+                                                .putInt( username.length() )
+                                                .array();
+        byte[] salt = Bytes.concat( "com.lyndir.masterpassword".getBytes( MP_charset ), //
+                                    nusernameLengthBytes, //
+                                    username.getBytes( MP_charset ) );
+
+        try {
+            byte[] key = SCrypt.scrypt( password.getBytes( MP_charset ), salt, MP_N, MP_r, MP_p, MP_dkLen );
+            logger.trc( "User: %s, password: %s derives to key ID: %s (took %.2fs)", username, password,
+                        CodeUtils.encodeHex( keyIDForKey( key ) ), (double) (System.currentTimeMillis() - start) / 1000 );
+
+            return key;
+        }
+        catch (GeneralSecurityException e) {
+            throw logger.bug( e );
+        }
+    }
+
+    public static byte[] subkeyForKey(final byte[] key, final int subkeyLength) {
+
+        byte[] subkey = new byte[Math.min( subkeyLength, key.length )];
+        System.arraycopy( key, 0, subkey, 0, subkey.length );
+
+        return subkey;
+    }
+
+    public static byte[] keyIDForPassword(final String password, final String username) {
+
+        return keyIDForKey( keyForPassword( password, username ) );
+    }
+
+    public static byte[] keyIDForKey(final byte[] key) {
+
+        return MP_hash.of( key );
+    }
+
+    public static String generateContent(final MPElementType type, final String name, final byte[] key, int counter) {
+
+        Preconditions.checkArgument( type.getTypeClass() == MPElementTypeClass.Generated );
+        Preconditions.checkArgument( !name.isEmpty() );
+        Preconditions.checkArgument( key.length > 0 );
+
+        if (counter == 0)
+            counter = (int) (System.currentTimeMillis() / (300 * 1000)) * 300;
+
+        byte[] nameLengthBytes = ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( MP_byteOrder ).putInt( name.length() ).array();
+        byte[] counterBytes = ByteBuffer.allocate( Integer.SIZE / Byte.SIZE ).order( MP_byteOrder ).putInt( counter ).array();
+        logger.trc( "seed from: hmac-sha256(%s, 'com.lyndir.masterpassword' | %s | %s | %s)", CryptUtils.encodeBase64( key ),
+                    CodeUtils.encodeHex( nameLengthBytes ), name, CodeUtils.encodeHex( counterBytes ) );
+        byte[] seed = MP_mac.of( key, Bytes.concat( "com.lyndir.masterpassword".getBytes( MP_charset ), //
+                                                    nameLengthBytes, //
+                                                    name.getBytes( MP_charset ), //
+                                                    counterBytes ) );
+        logger.trc( "seed is: %s", CryptUtils.encodeBase64( seed ) );
+
+        Preconditions.checkState( seed.length > 0 );
+        int templateIndex = seed[0] & 0xFF; // Mask the integer's sign.
+        MPTemplate template = templates.getTemplateForTypeAtRollingIndex( type, templateIndex );
+        logger.trc( "type: %s, template: %s", type, template );
+
+        StringBuilder password = new StringBuilder( template.length() );
+        for (int i = 0; i < template.length(); ++i) {
+            int characterIndex = seed[i + 1] & 0xFF; // Mask the integer's sign.
+            MPTemplateCharacterClass characterClass = template.getCharacterClassAtIndex( i );
+            char passwordCharacter = characterClass.getCharacterAtRollingIndex( characterIndex );
+            logger.trc( "class: %s, index: %d, byte: 0x%02X, chosen password character: %s", characterClass, characterIndex, seed[i + 1],
+                        passwordCharacter );
+
+            password.append( passwordCharacter );
+        }
+
+        return password.toString();
+    }
+
+    public static void main(final String... arguments) {
+
+        String masterPassword = "test-mp";
+        String username = "test-user";
+        String siteName = "test-site";
+        MPElementType siteType = MPElementType.GeneratedLong;
+        int siteCounter = 42;
+
+        String sitePassword = generateContent( siteType, siteName, keyForPassword( masterPassword, username ), siteCounter );
+
+        logger.inf( "master password: %s, username: %s\nsite name: %s, site type: %s, site counter: %d\n    => site password: %s",
+                    masterPassword, username, siteName, siteType, siteCounter, sitePassword );
+    }
+}

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

@@ -0,0 +1,10 @@
+package com.lyndir.lhunath.masterpassword.entity;
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public class MPElementEntity {
+
+}

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

@@ -0,0 +1,10 @@
+package com.lyndir.lhunath.masterpassword.entity;
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public class MPElementGeneratedEntity extends MPElementEntity {
+
+}

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

@@ -0,0 +1,10 @@
+package com.lyndir.lhunath.masterpassword.entity;
+
+/**
+ * <i>07 04, 2012</i>
+ *
+ * @author lhunath
+ */
+public class MPElementStoredEntity extends MPElementEntity {
+
+}

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

@@ -0,0 +1 @@
+../../../../../../MasterPassword/Resources/Data/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

@@ -0,0 +1,99 @@
+<?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 CLI</name>
+    <description>A CLI interface to the Master Password algorithm</description>
+
+    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <artifactId>masterpassword-cli</artifactId>
+    <packaging>jar</packaging>
+
+    <!-- BUILD CONFIGURATION -->
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/scripts</directory>
+                <filtering>true</filtering>
+                <targetPath>${project.build.directory}</targetPath>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <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-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.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>
+            </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-cli/src/main/java/com/lyndir/lhunath/masterpassword/CLI.java

@@ -0,0 +1,133 @@
+/*
+ *   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.io.LineReader;
+import com.lyndir.lhunath.opal.system.logging.Logger;
+import com.lyndir.lhunath.opal.system.util.ConversionUtils;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+
+
+/**
+ * <p> <i>Jun 10, 2008</i> </p>
+ *
+ * @author mbillemo
+ */
+public class CLI {
+
+    static final Logger logger = Logger.get( CLI.class );
+    private static final String ENV_USERNAME = "MP_USERNAME";
+    private static final String ENV_PASSWORD = "MP_PASSWORD";
+
+    public static void main(final String[] args)
+            throws IOException {
+
+        String userName, masterPassword, siteName = null;
+
+        /* Environment. */
+        userName = System.getenv().get( ENV_USERNAME );
+        masterPassword = System.getenv().get( ENV_PASSWORD );
+
+        /* Arguments. */
+        int counter = 1;
+        MPElementType type = MPElementType.GeneratedLong;
+        boolean typeArg = false, counterArg = false, userNameArg = false;
+        for (final String arg : Arrays.asList( args ))
+            if ("-t".equals( arg ) || "--type".equals( arg ))
+                typeArg = true;
+            else if (typeArg) {
+                if ("list".equalsIgnoreCase( arg )) {
+                    System.out.format( "%30s | %s\n", "type", "description" );
+                    for (final MPElementType aType : MPElementType.values())
+                        System.out.format( "%30s | %s\n", aType.getName(), aType.getDescription() );
+                    System.exit( 0 );
+                }
+
+                type = MPElementType.forName( arg );
+                typeArg = false;
+            } else if ("-c".equals( arg ) || "--counter".equals( arg ))
+                counterArg = true;
+            else if (counterArg) {
+                counter = ConversionUtils.toIntegerNN( arg );
+                counterArg = false;
+            } else if ("-u".equals( arg ) || "--username".equals( arg ))
+                userNameArg = true;
+            else if (userNameArg) {
+                userName = arg;
+                userNameArg = false;
+            } else if ("-h".equals( arg ) || "--help".equals( arg )) {
+                System.out.println();
+                System.out.println( "\tMaster Password CLI" );
+                System.out.println( "\t\tLyndir" );
+
+                System.out.println( "[options] [site name]" );
+                System.out.println();
+                System.out.println( "Available options:" );
+
+                System.out.println( "\t-t | --type [site password type]" );
+                System.out.format( "\t\tDefault: %s.  The password type to use for this site.\n", type.getName() );
+                System.out.println( "\t\tUse 'list' to see the available types." );
+
+                System.out.println();
+                System.out.println( "\t-c | --counter [site counter]" );
+                System.out.format( "\t\tDefault: %d.  The counter to use for this site.\n", counter );
+                System.out.println( "\t\tIncrement the counter if you need a new password." );
+
+                System.out.println();
+                System.out.println( "\t-u | --username [user's name]" );
+                System.out.println( "\t\tDefault: asked.  The name of the user." );
+
+                System.out.println();
+                System.out.println( "Available environment variables:" );
+
+                System.out.format( "\t%s\n", ENV_USERNAME );
+                System.out.println( "\t\tThe name of the user." );
+
+                System.out.format( "\t%s\n", ENV_PASSWORD );
+                System.out.println( "\t\tThe master password of the user." );
+
+                System.out.println();
+                return;
+            } else
+                siteName = arg;
+
+        InputStreamReader inReader = new InputStreamReader( System.in );
+        try {
+            LineReader lineReader = new LineReader( inReader );
+            if (siteName == null) {
+                System.err.format( "Site name: " );
+                siteName = lineReader.readLine();
+            }
+            if (userName == null) {
+                System.err.format( "User's name: " );
+                userName = lineReader.readLine();
+            }
+            if (masterPassword == null) {
+                System.err.format( "%s's master password: ", userName );
+                masterPassword = lineReader.readLine();
+            }
+
+            byte[] masterKey = MasterPassword.keyForPassword( masterPassword, userName );
+            String sitePassword = MasterPassword.generateContent( type, siteName, masterKey, counter );
+            System.out.println( sitePassword );
+        }
+        finally {
+            inReader.close();
+        }
+    }
+}

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

@@ -0,0 +1,15 @@
+<configuration scan="true">
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%-8relative %22c{0} [%-5level] %msg%n</Pattern>
+        </layout>
+    </appender>
+
+    <logger name="com.lyndir" level="TRACE" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>

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

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# 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 "$@"