Email/support un news.

[UPDATED]   Refresh news whenever the app opens.
[UPDATED]   Email and support links in news.html

MasterPassword/ObjC/iOS/MPLogsViewController.h

@@ -22,6 +22,7 @@
 @interface MPLogsViewController : UIViewController
 @property (weak, nonatomic) IBOutlet UITextView *logView;
 @property (weak, nonatomic) IBOutlet UISegmentedControl *levelControl;
+@property(nonatomic, strong) PearlAlert *switchCloudStoreProgress;
 - (IBAction)action:(id)sender;
 - (IBAction)toggleLevelControl:(UISegmentedControl *)sender;
 - (IBAction)refresh:(UIBarButtonItem *)sender;

MasterPassword/ObjC/iOS/MPLogsViewController.m

@@ -21,7 +21,11 @@
 #import "MPAppDelegate_Store.h"
 #import "MPAppDelegate_Key.h"
 
-@implementation MPLogsViewController
+@implementation MPLogsViewController {
+    PearlAlert *switchCloudStoreProgress;
+}
+
+@synthesize switchCloudStoreProgress;
 
 - (void)viewDidLoad {
 
@@ -58,7 +62,10 @@
                              if (buttonIndex_ == alert.cancelButtonIndex)
                                  return;
 
-                             [self switchCloudStore];
+                             switchCloudStoreProgress = [PearlAlert showActivityWithTitle:@"Enumerating Stores"];
+                             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
+                                 [self switchCloudStore];
+                             });
                          }     cancelTitle:[PearlStrings get].commonButtonCancel otherTitles:[PearlStrings get].commonButtonContinue, nil];
         }
     }                  cancelTitle:[PearlStrings get].commonButtonCancel
@@ -80,22 +87,27 @@
         if ([[NSFileManager defaultManager] fileExistsAtPath:content.path isDirectory:&directory] && directory)
             [contentNames addObject:[content lastPathComponent]];
 
-    [PearlSheet showSheetWithTitle:[[MPiOSAppDelegate get].storeManager valueForKey:@"storeUUID_ThreadSafe"]
-                         viewStyle:UIActionSheetStyleAutomatic
-                         initSheet:^(UIActionSheet *sheet) {
-                             for (NSString *contentName in contentNames) {
-                                [sheet addButtonWithTitle:contentName];
-                             }
-                         }
-                 tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
-                     if (buttonIndex == sheet.cancelButtonIndex)
-                         return;
+    NSString *storeUUID = [[MPiOSAppDelegate get].storeManager valueForKey:@"storeUUID_ThreadSafe"];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [switchCloudStoreProgress cancelAlertAnimated:YES];
 
-                     [[MPiOSAppDelegate get].storeManager setValue:[contentNames objectAtIndex:(unsigned)buttonIndex] forKey:@"storeUUID"];
-                     [[MPiOSAppDelegate get].storeManager reloadStore];
-                     [[MPiOSAppDelegate get] signOutAnimated:YES];
-                 }
-                       cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil otherTitles:nil];
+        [PearlSheet showSheetWithTitle:storeUUID
+                             viewStyle:UIActionSheetStyleAutomatic
+                             initSheet:^(UIActionSheet *sheet) {
+                                 for (NSString *contentName in contentNames) {
+                                     [sheet addButtonWithTitle:contentName];
+                                 }
+                             }
+                     tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
+                         if (buttonIndex == sheet.cancelButtonIndex)
+                             return;
+                         
+                         [[MPiOSAppDelegate get].storeManager setValue:[contentNames objectAtIndex:(unsigned)buttonIndex] forKey:@"storeUUID"];
+                         [[MPiOSAppDelegate get].storeManager reloadStore];
+                         [[MPiOSAppDelegate get] signOutAnimated:YES];
+                     }
+                           cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil otherTitles:nil];
+    });
 }
 
 - (IBAction)toggleLevelControl:(UISegmentedControl *)sender {

MasterPassword/ObjC/iOS/MPUnlockViewController.m

@@ -124,9 +124,6 @@
 
 - (void)viewDidLoad {
 
-    NSString *newsURL = PearlString( @"http://www.masterpasswordapp.com/news.html?version=%@", [[PearlInfoPlist get] CFBundleVersion] );
-    [self.newsView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:newsURL]]];
-
     self.avatarToUserOID = [NSMutableDictionary dictionaryWithCapacity:3];
 
     [self.avatarsView addGestureRecognizer:self.targetedUserActionGesture];
@@ -193,6 +190,10 @@
                 [UIView animateWithDuration:1 animations:^{
                     self.uiContainer.alpha = 1;
                 }];
+
+                NSString *newsURL = PearlString( @"http://masterpasswordapp.com/news-dev.html?version=%@",
+                        [[PearlInfoPlist get] CFBundleVersion] );
+                [self.newsView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:newsURL]]];
             }];
 
     [self updateLayoutAnimated:NO allowScroll:YES completion:nil];
@@ -1006,38 +1007,35 @@
     if ([self selectedUserForThread])
         return;
 
-    [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-        MPUserEntity *targetedUser = [self userForAvatar:[self findTargetedAvatar] inContext:context];
-        if (!targetedUser)
+    NSManagedObjectContext *context = [MPiOSAppDelegate managedObjectContextForMainThreadIfReady];
+    MPUserEntity *targetedUser = [self userForAvatar:[self findTargetedAvatar] inContext:context];
+    if (!targetedUser)
+        return;
+
+    [PearlSheet showSheetWithTitle:targetedUser.name
+                         viewStyle:UIActionSheetStyleBlackTranslucent
+                         initSheet:nil tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
+        if (buttonIndex == [sheet cancelButtonIndex])
             return;
 
-        [PearlSheet showSheetWithTitle:targetedUser.name
-                             viewStyle:UIActionSheetStyleBlackTranslucent
-                             initSheet:nil tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
-            if (buttonIndex == [sheet cancelButtonIndex])
-                return;
+        if (buttonIndex == [sheet destructiveButtonIndex]) {
+            [context deleteObject:targetedUser];
+            [context saveToStore];
 
-            if (buttonIndex == [sheet destructiveButtonIndex]) {
-                [context performBlock:^{
-                    [context deleteObject:targetedUser];
-                    [context saveToStore];
+            dispatch_async( dispatch_get_main_queue(), ^{
+                [self updateUsers];
+            } );
+            return;
+        }
 
-                    dispatch_async( dispatch_get_main_queue(), ^{
-                        [self updateUsers];
-                    } );
-                }];
-                return;
-            }
-
-            if (buttonIndex == [sheet firstOtherButtonIndex])
-                [[MPiOSAppDelegate get] changeMasterPasswordFor:targetedUser saveInContext:context didResetBlock:^{
-                    dispatch_async( dispatch_get_main_queue(), ^{
-                        [[self avatarForUser:targetedUser] setSelected:YES];
-                    } );
-                }];
-        }                  cancelTitle:[PearlStrings get].commonButtonCancel
-                      destructiveTitle:@"Delete User" otherTitles:@"Reset Password", nil];
-    }];
+        if (buttonIndex == [sheet firstOtherButtonIndex])
+            [[MPiOSAppDelegate get] changeMasterPasswordFor:targetedUser saveInContext:context didResetBlock:^{
+                dispatch_async( dispatch_get_main_queue(), ^{
+                    [[self avatarForUser:targetedUser] setSelected:YES];
+                } );
+            }];
+    }                  cancelTitle:[PearlStrings get].commonButtonCancel
+                  destructiveTitle:@"Delete User" otherTitles:@"Reset Password", nil];
 }
 
 - (IBAction)facebook:(UIButton *)sender {

MasterPassword/ObjC/iOS/MPiOSAppDelegate.m

@@ -681,15 +681,19 @@
     self.handleCloudContentAlert.tappedButtonBlock = ^(UIAlertView *alert, NSInteger buttonIndex) {
         wSelf.fixCloudContentAlert = [PearlAlert showAlertWithTitle:@"Fix iCloud Now" message:
                 @"This problem can be auto‑corrected by opening the app on another device where you recently made changes.\n"
-                        @"You can correct the problem from this device anyway, but recent changes made on another device might get lost."
+                        @"You can correct the problem from this device anyway, but recent changes made on another device might get lost.\n\n"
+                        @"You can also turn iCloud off and go back to your local sites."
                                                           viewStyle:UIAlertViewStyleDefault initAlert:nil tappedButtonBlock:
                         ^(UIAlertView *alert_, NSInteger buttonIndex_) {
                             if (buttonIndex_ == alert_.cancelButtonIndex)
                                 [wSelf showCloudContentAlert];
                             if (buttonIndex_ == [alert_ firstOtherButtonIndex])
                                 [wSelf.storeManager rebuildCloudContentFromCloudStoreOrLocalStore:YES];
+                            if (buttonIndex_ == [alert_ firstOtherButtonIndex] + 1)
+                                wSelf.storeManager.cloudEnabled = NO;
                         }
-                                                        cancelTitle:[PearlStrings get].commonButtonBack otherTitles:@"Fix Anyway", nil];
+                                                        cancelTitle:[PearlStrings get].commonButtonBack otherTitles:@"Fix Anyway",
+                                                                                                                    @"Turn Off", nil];
     };
 }
 

MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard

@@ -2916,6 +2916,204 @@ However, it means that anyone who finds your device unlocked can do the same.</s
         <image name="ui_textfield.png" width="158" height="34"/>
         <image name="unlocked.png" width="84" height="80"/>
     </resources>
+    <classes>
+        <class className="IASKAppSettingsViewController" superclassName="UITableViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/IASKAppSettingsViewController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="delegate"/>
+            </relationships>
+        </class>
+        <class className="MPAppViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPAppViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="deblock:" candidateClass="UIButton"/>
+                <relationship kind="action" name="gorillas:" candidateClass="UIButton"/>
+            </relationships>
+        </class>
+        <class className="MPAppsViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPAppsViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="exit"/>
+                <relationship kind="outlet" name="pagePositionView" candidateClass="UIImageView"/>
+            </relationships>
+        </class>
+        <class className="MPElementListAllViewController" superclassName="MPElementListController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPElementListAllViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="add:"/>
+                <relationship kind="action" name="close:"/>
+                <relationship kind="outlet" name="navigationBar" candidateClass="UINavigationBar"/>
+            </relationships>
+        </class>
+        <class className="MPElementListController" superclassName="UITableViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPElementListController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="delegate"/>
+            </relationships>
+        </class>
+        <class className="MPElementListSearchController" superclassName="MPElementListController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPElementListSearchController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="searchDisplayController" candidateClass="UISearchDisplayController"/>
+                <relationship kind="outlet" name="searchTipContainer" candidateClass="UIView"/>
+            </relationships>
+        </class>
+        <class className="MPGuideViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPGuideViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="close"/>
+                <relationship kind="action" name="play"/>
+                <relationship kind="outlet" name="content" candidateClass="UIView"/>
+                <relationship kind="outlet" name="contentButton" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="contentText" candidateClass="UITextField"/>
+                <relationship kind="outlet" name="contentTip" candidateClass="UIView"/>
+                <relationship kind="outlet" name="contentTipText" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="largePlayButton" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="progress" candidateClass="UIProgressView"/>
+                <relationship kind="outlet" name="siteNameTip" candidateClass="UIView"/>
+                <relationship kind="outlet" name="smallPlayButton" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="toolButton" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="toolTip" candidateClass="UIView"/>
+                <relationship kind="outlet" name="typeButton" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="typeTip" candidateClass="UIView"/>
+                <relationship kind="outlet" name="usernameButton" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="usernameTip" candidateClass="UIView"/>
+            </relationships>
+        </class>
+        <class className="MPLogsViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPLogsViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="action:"/>
+                <relationship kind="action" name="mail:" candidateClass="UIBarButtonItem"/>
+                <relationship kind="action" name="refresh:" candidateClass="UIBarButtonItem"/>
+                <relationship kind="action" name="toggleLevelControl:" candidateClass="UISegmentedControl"/>
+                <relationship kind="outlet" name="levelControl" candidateClass="UISegmentedControl"/>
+                <relationship kind="outlet" name="logView" candidateClass="UITextView"/>
+            </relationships>
+        </class>
+        <class className="MPMainViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPMainViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="action:" candidateClass="UIBarButtonItem"/>
+                <relationship kind="action" name="closeAlert"/>
+                <relationship kind="action" name="closeOutdatedAlert"/>
+                <relationship kind="action" name="copyContent"/>
+                <relationship kind="action" name="editLoginName:" candidateClass="UILongPressGestureRecognizer"/>
+                <relationship kind="action" name="editPassword"/>
+                <relationship kind="action" name="incrementPasswordCounter"/>
+                <relationship kind="action" name="infoOutdatedAlert"/>
+                <relationship kind="action" name="panHelpDown:" candidateClass="UIPanGestureRecognizer"/>
+                <relationship kind="action" name="panHelpUp:" candidateClass="UIPanGestureRecognizer"/>
+                <relationship kind="action" name="resetPasswordCounter:" candidateClass="UILongPressGestureRecognizer"/>
+                <relationship kind="action" name="searchOutdatedElements"/>
+                <relationship kind="action" name="toggleUser"/>
+                <relationship kind="action" name="upgradePassword"/>
+                <relationship kind="outlet" name="actionsTipContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="alertBody" candidateClass="UITextView"/>
+                <relationship kind="outlet" name="alertContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="alertTitle" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="contentContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="contentField" candidateClass="UITextField"/>
+                <relationship kind="outlet" name="contentTipBody" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="contentTipContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="displayContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="helpContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="helpView" candidateClass="UIWebView"/>
+                <relationship kind="outlet" name="loginNameContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="loginNameField" candidateClass="UITextField"/>
+                <relationship kind="outlet" name="loginNameTipBody" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="loginNameTipContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="outdatedAlertBack" candidateClass="UIImageView"/>
+                <relationship kind="outlet" name="outdatedAlertCloseButton" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="outdatedAlertContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="passwordCounter" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="passwordEdit" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="passwordIncrementer" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="passwordUpgrade" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="passwordUser" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="pullDownGesture" candidateClass="UIPanGestureRecognizer"/>
+                <relationship kind="outlet" name="pullDownView" candidateClass="UIImageView"/>
+                <relationship kind="outlet" name="pullUpGesture" candidateClass="UIPanGestureRecognizer"/>
+                <relationship kind="outlet" name="pullUpView" candidateClass="UIImageView"/>
+                <relationship kind="outlet" name="searchDelegate" candidateClass="MPElementListSearchController"/>
+                <relationship kind="outlet" name="searchTipContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="siteName" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="toolTipBody" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="toolTipContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="toolTipEditIcon" candidateClass="UIImageView"/>
+                <relationship kind="outlet" name="typeButton" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="typeTipContainer" candidateClass="UIView"/>
+            </relationships>
+        </class>
+        <class className="MPPreferencesViewController" superclassName="UITableViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPPreferencesViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="didToggleSwitch:" candidateClass="UISwitch"/>
+                <relationship kind="outlet" name="avatarTemplate" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="avatarsView" candidateClass="UIScrollView"/>
+                <relationship kind="outlet" name="changeMPCell" candidateClass="UITableViewCell"/>
+                <relationship kind="outlet" name="defaultTypeLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="exportCell" candidateClass="UITableViewCell"/>
+                <relationship kind="outlet" name="savePasswordSwitch" candidateClass="UISwitch"/>
+            </relationships>
+        </class>
+        <class className="MPSetupViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPSetupViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="close:" candidateClass="UIBarButtonItem"/>
+                <relationship kind="outlet" name="cloudSwitch" candidateClass="UISwitch"/>
+                <relationship kind="outlet" name="rememberLoginSwitch" candidateClass="UISwitch"/>
+            </relationships>
+        </class>
+        <class className="MPTypeViewController" superclassName="UITableViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPTypeViewController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="recommendedTipContainer" candidateClass="UIView"/>
+            </relationships>
+        </class>
+        <class className="MPUnlockViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MPUnlockViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="add:" candidateClass="UIButton"/>
+                <relationship kind="action" name="emergencyClose:" candidateClass="UIButton"/>
+                <relationship kind="action" name="emergencyCopy:" candidateClass="UIButton"/>
+                <relationship kind="action" name="facebook:" candidateClass="UIButton"/>
+                <relationship kind="action" name="google:" candidateClass="UIButton"/>
+                <relationship kind="action" name="mail:" candidateClass="UIButton"/>
+                <relationship kind="action" name="targetedUserAction:" candidateClass="UILongPressGestureRecognizer"/>
+                <relationship kind="action" name="twitter:" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="avatarTemplate" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="avatarsView" candidateClass="UIScrollView"/>
+                <relationship kind="outlet" name="createPasswordTipView" candidateClass="UIView"/>
+                <relationship kind="outlet" name="emergencyActivity" candidateClass="UIActivityIndicatorView"/>
+                <relationship kind="outlet" name="emergencyContentTipContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="emergencyCounter" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="emergencyCounterStepper" candidateClass="UIStepper"/>
+                <relationship kind="outlet" name="emergencyGeneratorContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="emergencyMasterPassword" candidateClass="UITextField"/>
+                <relationship kind="outlet" name="emergencyName" candidateClass="UITextField"/>
+                <relationship kind="outlet" name="emergencyPassword" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="emergencySite" candidateClass="UITextField"/>
+                <relationship kind="outlet" name="emergencyTypeControl" candidateClass="UISegmentedControl"/>
+                <relationship kind="outlet" name="nameLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="newsView" candidateClass="UIWebView"/>
+                <relationship kind="outlet" name="oldNameLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="passwordField" candidateClass="UITextField"/>
+                <relationship kind="outlet" name="passwordFieldLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="passwordTipLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="passwordTipView" candidateClass="UIView"/>
+                <relationship kind="outlet" name="passwordView" candidateClass="UIView"/>
+                <relationship kind="outlet" name="spinner" candidateClass="UIImageView"/>
+                <relationship kind="outlet" name="targetedUserActionGesture" candidateClass="UILongPressGestureRecognizer"/>
+                <relationship kind="outlet" name="tip" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="uiContainer" candidateClass="UIView"/>
+                <relationship kind="outlet" name="wordWall" candidateClass="UIView"/>
+            </relationships>
+        </class>
+        <class className="PearlNavigationController" superclassName="UINavigationController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/PearlNavigationController.h"/>
+        </class>
+    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <nil key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -3262,7 +3262,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/bash -e";
-			shellScript = "PATH+=:/usr/libexec\n\naddPlistWithKey() {\n    local key=$1 type=$2 value=$3 plist=${4:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Delete :'$key'\" \"$plist\" 2>/dev/null || true\n    PlistBuddy -c \"Add :'$key' '$type' '$value'\" \"$plist\"\n}\nsetPlistWithKey() {\n    local key=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Set :'$key' '$value'\" \"$plist\"\n}\ngetPlistWithKey() {\n    local key=$1 plist=${2:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Print :'$key'\" \"$plist\"\n}\nsetSettingWithTitle() {\n    local i title=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Settings.bundle/Root.plist\"}\n    \n    for (( i=0; 1; ++i )); do\n        PlistBuddy -c \"Print :PreferenceSpecifiers:$i\" \"$plist\" &>/dev/null || break\n        echo \"Checking preference specifier $i\"\n    \n        [[ $(PlistBuddy -c \"Print :PreferenceSpecifiers:$i:Title\" \"$plist\" 2>/dev/null) = $title ]] || continue\n    \n        echo \"Correct title, setting value.\"\n        PlistBuddy -c \"Set :PreferenceSpecifiers:$i:DefaultValue $value\" \"$plist\"\n        break\n    done\n}\n\ndescription=$(git describe --always --dirty --long)\ncommit=${description##*-g} commit=$((0x$commit))\nversion=${description%-g*} version=${version//-/.}\n\naddPlistWithKey GITDescription string \"$description\"\nsetPlistWithKey CFBundleVersion \"$commit\"\nsetPlistWithKey CFBundleShortVersionString \"$version\"\n\nsetSettingWithTitle \"Build\" \"$commit\"\nsetSettingWithTitle \"Version\" \"$version\"\nsetSettingWithTitle \"Copyright\" \"$(getPlistWithKey NSHumanReadableCopyright)\"\n";
+			shellScript = "PATH+=:/usr/libexec\n\naddPlistWithKey() {\n    local key=$1 type=$2 value=$3 plist=${4:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Delete :'$key'\" \"$plist\" 2>/dev/null || true\n    PlistBuddy -c \"Add :'$key' '$type' '$value'\" \"$plist\"\n}\nsetPlistWithKey() {\n    local key=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Set :'$key' '$value'\" \"$plist\"\n}\ngetPlistWithKey() {\n    local key=$1 plist=${2:-\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"}\n    \n    PlistBuddy -c \"Print :'$key'\" \"$plist\"\n}\nsetSettingWithTitle() {\n    local i title=$1 value=$2 plist=${3:-\"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Settings.bundle/Root.plist\"}\n    \n    for (( i=0; 1; ++i )); do\n        PlistBuddy -c \"Print :PreferenceSpecifiers:$i\" \"$plist\" &>/dev/null || break\n        echo \"Checking preference specifier $i\"\n    \n        [[ $(PlistBuddy -c \"Print :PreferenceSpecifiers:$i:Title\" \"$plist\" 2>/dev/null) = $title ]] || continue\n    \n        echo \"Correct title, setting value.\"\n        PlistBuddy -c \"Set :PreferenceSpecifiers:$i:DefaultValue $value\" \"$plist\"\n        break\n    done\n}\n\ndescription=$(git describe --always --dirty --long)\ncommit=${description##*-g} commit=$((0x$commit))\nversion=${description%-g*} version=${version//-/.}\n\naddPlistWithKey GITDescription string \"$description\"\nsetPlistWithKey CFBundleVersion \"${version//.}$commit\" # No separator between version and commit because I had already submitted a CFBundleVersion with a really high major.  Cry.\nsetPlistWithKey CFBundleShortVersionString \"$version\"\n\nsetSettingWithTitle \"Build\" \"$commit\"\nsetSettingWithTitle \"Version\" \"$version\"\nsetSettingWithTitle \"Copyright\" \"$(getPlistWithKey NSHumanReadableCopyright)\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {

Site/2013-05/algorithm.html

@@ -37,6 +37,7 @@
                         <ul class="nav">
                             <li><a href="./">App</a></li>
                             <li class="active"><a href="algorithm.html">Algorithm</a></li>
+                            <li><a href="support.html">Support</a></li>
                             <li><a href="http://github.com/Lyndir/MasterPassword">Source</a></li>
                         </ul>
                         <ul class="nav pull-right">

Site/2013-05/css/main.css

@@ -89,19 +89,22 @@ header .background {
     background: url('../img/shot-laptop-standing-iphone-angled-flipped.png') center center;
     background-size: cover;
 }
-#algorithm header {
+#algorithm header,
+#support header {
     height: 40%;
     
     background: #272727;
 }
-#algorithm header .background {
+#algorithm header .background,
+#support header .background {
     width: 940px;
     height: auto;
     left: 50%;
     top: -10%;
     margin-left: -470px;
 }
-#algorithm header .container {
+#algorithm header .container,
+#support header .container {
     background: radial-gradient(50% 50% at 50% 30%, rgba(0,0,0,0.3) 50%, rgba(0,0,0,0.8) 100%);
 }
 header .content {

Site/2013-05/index.html

@@ -37,6 +37,7 @@
                         <ul class="nav">
                             <li class="active"><a href="./">App</a></li>
                             <li><a href="algorithm.html">Algorithm</a></li>
+                            <li><a href="support.html">Support</a></li>
                             <li><a href="http://github.com/Lyndir/MasterPassword">Source</a></li>
                         </ul>
                         <ul class="nav pull-right">

Site/2013-05/news.html

@@ -2,7 +2,20 @@
 <html>
     <head>
         <meta charset="utf-8">
+        <style>
+            body, html {
+                color: white;
+                font-family: 'Copperplate', sans-serif;
+                font-size: smaller;
+                text-align: center;
+            }
+            *:link, *:visited {
+                color: inherit;
+                font-weight: bold;
+            }
+        </style>
     </head>
     <body>
+        <p><a href="mailto:masterpassword@lyndir.com">E-mail us</a> or open <a href="http://masterpasswordapp.com/support.html">support</a> if you have any issues.</p>
     </body>
 </html>

Site/2013-05/support.html

@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<html class="no-js" itemscope itemtype="http://schema.org/Product">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title itemprop="name">Master Password &mdash; Secure your life, forget your passwords.</title>
+        <meta itemprop="description" content="Master Password is an ingenious password solution that makes your passwords truly impossible to lose." />
+        <meta itemprop="image" content="http://masterpassword.lyndir.com/img/iTunesArtwork-Rounded.png" />
+        <meta name="apple-itunes-app" content="app-id=510296984" />
+        <meta name="viewport" content="width=device-width">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+        <link rel="icon" href="img/favicon.png" type="image/x-png" />
+        <link rel="shortcut icon" href="img/favicon.png" type="image/x-png" />
+        <link rel="stylesheet" href="css/bootstrap.min.css">
+        <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
+        <link rel="stylesheet" href="css/main.css">
+
+        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
+        <script src="js/vendor/prefixfree.min.js"></script>
+    </head>
+    <body itemscope itemtype="http://schema.org/MobileSoftwareApplication" id="support">
+        <!--[if lt IE 7]>
+            <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
+        <![endif]-->
+
+        <nav class="navbar navbar-fixed-top">
+            <div class="navbar-inner">
+                <div class="container">
+                    <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <a class="brand" href="./">●●●|</a>
+                    <div class="nav-collapse collapse">
+                        <ul class="nav">
+                            <li><a href="./">App</a></li>
+                            <li><a href="algorithm.html">Algorithm</a></li>
+                            <li class="active"><a href="support.html">Support</a></li>
+                            <li><a href="http://github.com/Lyndir/MasterPassword">Source</a></li>
+                        </ul>
+                        <ul class="nav pull-right">
+                            <li class="divider-vertical"></li>
+                            <li><a href="MasterPassword_PressKit.zip" onclick="_gaq.push(['_trackPageview', '/outbound/presskit']);">⬇ Press Kit</a></li>
+                            <li><a href="http://itunes.apple.com/app/id510296984" onclick="goog_report_conversion('index-fixed-header');_gaq.push(['_trackPageview', '/outbound/itunes']);" class="img"><img src="img/appstore.svg" /></a></li>
+                        </ul>
+                    </div><!--/.nav-collapse -->
+                </div>
+            </div>
+        </nav>
+
+        <header>
+            <img class="background" src="img/mp-process-angled.png" data-stellar-ratio="2.5" />
+            <div class="container">
+        
+                <!-- <div class="box effect-8">
+                    iframe id="ytplayer" type="text/html" width="640" height="360" frameborder="0"
+                        src="http://www.youtube.com/embed/QTfA0O7YnHQ?origin=http://masterpassword.lyndir.com&autohide=1&autoplay=0&rel=0&showinfo=0&theme=light&color=white"></iframe
+                    <iframe width="640" height="360" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen
+                        src="http://player.vimeo.com/video/45803664?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff"></iframe>
+                </div> -->
+
+                <div class="content">
+                    <h2>Support</h2>
+                </div>
+            
+            </div>
+        </header>
+
+        <section><div class="content">
+        
+            <p>We take personal satisfaction and your security very seriously.  If you have any questions about features, usability, technical details, or any other topic, don't hesitate to get in touch with us.  We try to give <b>thorough, detailed and personal assistance to everyone</b>.
+
+            <div class="thumb clearfix">
+                <h1>Feedback Forums</h1>
+                <p>Please see the <a href="http://support.lyndir.com/forum/13031-master-password/">support forums</a> for answers to issues and questions or to open your own topic.</p>
+            </div>
+        
+            <div class="thumb clearfix">
+                <h1>Email</h1>
+                <p>If you'd prefer to talk via email, send us a message at <a href="mailto:masterpassword@lyndir.com">masterpassword@lyndir.com</a> instead.  You should get a personal reply within the hour if not in minutes.</p>
+            </div>
+
+        </div></section>
+
+        <footer><div class="muted content">
+        
+            <p><em>Master Password is a security product and algorithm by <a href="http://www.lhunath.com">Maarten Billemont</a>, <a href="http://www.lyndir.com">Lyndir</a>.</em></p>
+            <p><a href="http://gorillas.lyndir.com">Gorillas</a> ● <a href="http://deblock.lyndir.com">DeBlock</a> ● <a href="http://github.com/Lyndir">GitHub</a></p>
+
+        </div></footer>
+
+        <!-- Scripts -->
+        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+        <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
+
+        <script src="js/vendor/bootstrap.min.js"></script>
+
+        <script src="js/plugins.js"></script>
+        <script src="js/main.js"></script>
+
+        <!-- Google Analytics -->
+        <script>
+            var _gaq=[['_setAccount','UA-90535-15'],['_trackPageview']];
+            (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+            g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+            s.parentNode.insertBefore(g,s)}(document,'script'));
+        </script>
+
+        <!-- Google +1 -->
+        <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+
+        <!-- Get Satisfaction -->
+        <!--script type="text/javascript" charset="utf-8">
+          var is_ssl = ("https:" == document.location.protocol);
+          var asset_host = is_ssl ? "https://d3rdqalhjaisuu.cloudfront.net/" : "http://d3rdqalhjaisuu.cloudfront.net/";
+          document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
+        </script>
+        <script type="text/javascript" charset="utf-8">
+          var feedback_widget_options = {};
+          feedback_widget_options.display = "overlay";  
+          feedback_widget_options.company = "lyndir";
+          feedback_widget_options.placement = "right";
+          feedback_widget_options.color = "#222";
+          feedback_widget_options.style = "question";
+          var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
+        </script-->
+
+        <!-- UserEcho -->
+        <script type='text/javascript'>
+            var _ues = {
+            host:'support.lyndir.com',
+            forum:'13031',
+            lang:'en',
+            tab_icon_show:false,
+            tab_corner_radius:5,
+            tab_font_size:20,
+            tab_image_hash:'RmVlZGJhY2s%3D',
+            tab_alignment:'right',
+            tab_text_color:'#FFFFFF',
+            tab_bg_color:'#DDDDDD',
+            tab_hover_color:'#CCCCCC'
+            };
+
+            (function() {
+                var _ue = document.createElement('script'); _ue.type = 'text/javascript'; _ue.async = true;
+                _ue.src = ('https:' == document.location.protocol ? 'https://s3.amazonaws.com/' : 'http://') + 'cdn.userecho.com/js/widget-1.4.gz.js';
+                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(_ue, s);
+              })();
+        </script>
+
+        <!-- AdWords -->
+        <script type="text/javascript">
+            /* <![CDATA[ */
+            goog_snippet_vars = function() {
+                var w = window;
+                w.google_conversion_id = 1015576061;
+                w.google_conversion_label = "PcXqCPPz5AIQ_euh5AM";
+                w.google_conversion_value = 4;
+            }
+            goog_report_conversion = function(url) {
+                goog_snippet_vars();
+                window.google_conversion_format = "3";
+                window.google_is_call = true;
+                var opt = new Object();
+                opt.onload_callback = function() {
+                    if (typeof(url) != 'undefined') {
+                        window.location = url;
+                    }
+                }
+                var conv_handler = window['google_trackConversion'];
+                if (typeof(conv_handler) == 'function') {
+                    conv_handler(opt);
+                }
+            }
+            /* ]]> */
+        </script>
+        <script type="text/javascript" src="http://www.googleadservices.com/pagead/conversion_async.js"></script>
+    </body>
+
+</html>