Ability to handle versions without suffix after platform.

2.5-ios-4

platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -42,7 +42,6 @@
 		93D398ECD7D1A0DEDDADF516 /* MPEmergencyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39ACBA9F4878B6A1CC33B /* MPEmergencyViewController.m */; };
 		93D399246DC90F50913A1287 /* UIResponder+PearlFirstResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39A1DDFA09AE2E14D26DC /* UIResponder+PearlFirstResponder.m */; };
 		93D3992FA1546E01F498F665 /* PearlNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D398567FD02DB2647B8CF3 /* PearlNavigationController.h */; };
-		93D399433EA75E50656040CB /* Twitter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93D394077F8FAB8167647187 /* Twitter.framework */; };
 		93D39943D01E70DAC3B0DF76 /* mpw-util.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D396C311C3725870343EE0 /* mpw-util.c */; };
 		93D399D7E08A142776A74CB8 /* MPOverlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D395105935859D71679931 /* MPOverlayViewController.m */; };
 		93D399E4BC1E092A8C8B12AE /* NSOrderedSetOrArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D39FBF8FCEB4C106272334 /* NSOrderedSetOrArray.h */; };
@@ -87,6 +86,20 @@
 		DA0CC5361EAB99BA009A8ED9 /* IASKTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5241EAB99BA009A8ED9 /* IASKTextField.m */; };
 		DA0CC5371EAB99BA009A8ED9 /* IASKTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5261EAB99BA009A8ED9 /* IASKTextView.m */; };
 		DA0CC5381EAB99BA009A8ED9 /* IASKTextViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5281EAB99BA009A8ED9 /* IASKTextViewCell.m */; };
+		DA0CC53B1EB57B5C009A8ED9 /* Fabric.plist in Resources */ = {isa = PBXBuildFile; fileRef = DA0CC53A1EB57B5C009A8ED9 /* Fabric.plist */; };
+		DA0CC5411EB57BD4009A8ED9 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA0CC53F1EB57B91009A8ED9 /* Fabric.framework */; };
+		DA0CC5421EB57BD4009A8ED9 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAA141191922FED80032B392 /* Crashlytics.framework */; };
+		DA0CC54E1EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5441EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld */; };
+		DA0CC58C1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5791EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m */; };
+		DA0CC58D1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC57B1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m */; };
+		DA0CC58E1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC57D1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataClass.m */; };
+		DA0CC58F1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC57F1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.m */; };
+		DA0CC5901EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5811EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataClass.m */; };
+		DA0CC5911EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5831EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataProperties.m */; };
+		DA0CC5921EB6B030009A8ED9 /* MPUserEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5851EB6B030009A8ED9 /* MPUserEntity+CoreDataClass.m */; };
+		DA0CC5931EB6B030009A8ED9 /* MPUserEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5871EB6B030009A8ED9 /* MPUserEntity+CoreDataProperties.m */; };
+		DA0CC5941EB6B030009A8ED9 /* MPSiteEntity+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC5891EB6B030009A8ED9 /* MPSiteEntity+CoreDataClass.m */; };
+		DA0CC5951EB6B030009A8ED9 /* MPSiteEntity+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC58B1EB6B030009A8ED9 /* MPSiteEntity+CoreDataProperties.m */; };
 		DA24EBAE19DAD08900FF010B /* tip_basic_black_top.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD38941711E29700CF925C /* tip_basic_black_top.png */; };
 		DA24EBAF19DAD08C00FF010B /* tip_basic_black_top@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD38951711E29700CF925C /* tip_basic_black_top@2x.png */; };
 		DA24EBE819DAD6DE00FF010B /* Icon-320.png in Resources */ = {isa = PBXBuildFile; fileRef = DA24EBE619DAD6DE00FF010B /* Icon-320.png */; };
@@ -114,7 +127,6 @@
 		DA29993219C9132F00AF7DF1 /* thumb_generated_login@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA29993119C9132F00AF7DF1 /* thumb_generated_login@3x.png */; };
 		DA29993319C9214600AF7DF1 /* icon_star-hollow.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD382A1711E29600CF925C /* icon_star-hollow.png */; };
 		DA29993419C9214600AF7DF1 /* icon_star-hollow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD382B1711E29600CF925C /* icon_star-hollow@2x.png */; };
-		DA2C3D611BD95EEE001137B3 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2C3D601BD95EEE001137B3 /* Fabric.framework */; };
 		DA2C3D631BD96126001137B3 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2C3D621BD96126001137B3 /* libc++.tbd */; };
 		DA2C3D651BD9612F001137B3 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2C3D641BD9612F001137B3 /* libz.tbd */; };
 		DA2CA4DD18D28859007798F8 /* NSArray+Pearl.m in Sources */ = {isa = PBXBuildFile; fileRef = DA2CA4D918D28859007798F8 /* NSArray+Pearl.m */; };
@@ -128,10 +140,6 @@
 		DA30E9D415722EF400A68B4C /* Pearl-UIKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30E9D315722EF400A68B4C /* Pearl-UIKit.m */; };
 		DA30E9D715723E6900A68B4C /* PearlLazy.h in Headers */ = {isa = PBXBuildFile; fileRef = DA30E9D515723E6900A68B4C /* PearlLazy.h */; };
 		DA30E9D815723E6900A68B4C /* PearlLazy.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30E9D615723E6900A68B4C /* PearlLazy.m */; };
-		DA32CFF019CF1C8F004F3F0E /* MPUserEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32CFE619CF1C8F004F3F0E /* MPUserEntity.m */; };
-		DA32CFF119CF1C8F004F3F0E /* MPStoredSiteEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32CFE819CF1C8F004F3F0E /* MPStoredSiteEntity.m */; };
-		DA32CFF319CF1C8F004F3F0E /* MPSiteEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32CFEC19CF1C8F004F3F0E /* MPSiteEntity.m */; };
-		DA32CFF419CF1C8F004F3F0E /* MPGeneratedSiteEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32CFEE19CF1C8F004F3F0E /* MPGeneratedSiteEntity.m */; };
 		DA32D00919CF5C55004F3F0E /* icon_question.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37FE1711E29600CF925C /* icon_question.png */; };
 		DA32D00A19CF5C55004F3F0E /* icon_question@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37FF1711E29600CF925C /* icon_question@2x.png */; };
 		DA32D01A19D046E1004F3F0E /* PearlFixedTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */; };
@@ -149,7 +157,6 @@
 		DA32D05019D2F59B004F3F0E /* meter_fuel.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D04D19D2F59B004F3F0E /* meter_fuel.png */; };
 		DA32D05119D3D107004F3F0E /* icon_meter.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37BA1711E29600CF925C /* icon_meter.png */; };
 		DA32D05219D3D107004F3F0E /* icon_meter@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37BB1711E29600CF925C /* icon_meter@2x.png */; };
-		DA32D05519D741DC004F3F0E /* MPSiteQuestionEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32D05419D741DC004F3F0E /* MPSiteQuestionEntity.m */; };
 		DA32D07A19D7D784004F3F0E /* background@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D07719D7D784004F3F0E /* background@3x.png */; };
 		DA32D07B19D7D784004F3F0E /* background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D07819D7D784004F3F0E /* background@2x.png */; };
 		DA32D07C19D7D784004F3F0E /* background.png in Resources */ = {isa = PBXBuildFile; fileRef = DA32D07919D7D784004F3F0E /* background.png */; };
@@ -165,7 +172,6 @@
 		DA45224A190628A1008F650A /* icon_wrench@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD386B1711E29700CF925C /* icon_wrench@2x.png */; };
 		DA45224B190628B2008F650A /* icon_gear.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37821711E29500CF925C /* icon_gear.png */; };
 		DA45224C190628B2008F650A /* icon_gear@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37831711E29500CF925C /* icon_gear@2x.png */; };
-		DA48856019A5A82E000C2D79 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAA141191922FED80032B392 /* Crashlytics.framework */; };
 		DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; };
 		DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */; };
 		DA5A09DF171A70E4005284AB /* play.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5A09DD171A70E4005284AB /* play.png */; };
@@ -202,7 +208,6 @@
 		DA945C8717E3F3FD0053236B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA945C8617E3F3FD0053236B /* Images.xcassets */; };
 		DA95B50C1C476B6A0067F5EF /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA95B50B1C476B6A0067F5EF /* LocalAuthentication.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		DA95B50F1C4776F00067F5EF /* NSMutableSet+Pearl.m in Sources */ = {isa = PBXBuildFile; fileRef = DA95B50E1C4776F00067F5EF /* NSMutableSet+Pearl.m */; };
-		DA95B5191C477DB50067F5EF /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA95B5101C477DB50067F5EF /* MasterPassword.xcdatamodeld */; };
 		DA95D5F214DF0B2C008D1B94 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA95D5F014DF0B1E008D1B94 /* MessageUI.framework */; };
 		DAA141201922FF020032B392 /* PearlTween.m in Sources */ = {isa = PBXBuildFile; fileRef = DAA1411C1922FF020032B392 /* PearlTween.m */; };
 		DAA141211922FF020032B392 /* PearlTween.h in Headers */ = {isa = PBXBuildFile; fileRef = DAA1411D1922FF020032B392 /* PearlTween.h */; };
@@ -335,7 +340,6 @@
 		DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DAC8DF47192831E100BA7D71 /* icon_key.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD379A1711E29600CF925C /* icon_key.png */; };
 		DAC8DF48192831E100BA7D71 /* icon_key@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD379B1711E29600CF925C /* icon_key@2x.png */; };
-		DACA296F1705DF81002C6C22 /* Crashlytics.plist in Resources */ = {isa = PBXBuildFile; fileRef = DACA269A1705DF81002C6C22 /* Crashlytics.plist */; };
 		DACA29731705E1A8002C6C22 /* ciphers.plist in Resources */ = {isa = PBXBuildFile; fileRef = DACA29711705E1A8002C6C22 /* ciphers.plist */; };
 		DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */ = {isa = PBXBuildFile; fileRef = DACA29721705E1A8002C6C22 /* dictionary.lst */; };
 		DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29771705E2BD002C6C22 /* JRSwizzle.h */; };
@@ -667,6 +671,37 @@
 		DA0CC5261EAB99BA009A8ED9 /* IASKTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextView.m; sourceTree = "<group>"; };
 		DA0CC5271EAB99BA009A8ED9 /* IASKTextViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKTextViewCell.h; sourceTree = "<group>"; };
 		DA0CC5281EAB99BA009A8ED9 /* IASKTextViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextViewCell.m; sourceTree = "<group>"; };
+		DA0CC53A1EB57B5C009A8ED9 /* Fabric.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Fabric.plist; sourceTree = "<group>"; };
+		DA0CC53F1EB57B91009A8ED9 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = "<group>"; };
+		DA0CC5451EB6AD0E009A8ED9 /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5461EB6AD0E009A8ED9 /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5471EB6AD0E009A8ED9 /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5481EB6AD0E009A8ED9 /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5491EB6AD0E009A8ED9 /* MasterPassword 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 5.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC54A1EB6AD0E009A8ED9 /* MasterPassword 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 6.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC54B1EB6AD0E009A8ED9 /* MasterPassword 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 7.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC54C1EB6AD0E009A8ED9 /* MasterPassword 8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 8.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC54D1EB6AD0E009A8ED9 /* MasterPassword 9.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 9.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5781EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPGeneratedSiteEntity+CoreDataClass.h"; sourceTree = "<group>"; };
+		DA0CC5791EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPGeneratedSiteEntity+CoreDataClass.m"; sourceTree = "<group>"; };
+		DA0CC57A1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPGeneratedSiteEntity+CoreDataProperties.h"; sourceTree = "<group>"; };
+		DA0CC57B1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPGeneratedSiteEntity+CoreDataProperties.m"; sourceTree = "<group>"; };
+		DA0CC57C1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPSiteQuestionEntity+CoreDataClass.h"; sourceTree = "<group>"; };
+		DA0CC57D1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPSiteQuestionEntity+CoreDataClass.m"; sourceTree = "<group>"; };
+		DA0CC57E1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPSiteQuestionEntity+CoreDataProperties.h"; sourceTree = "<group>"; };
+		DA0CC57F1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPSiteQuestionEntity+CoreDataProperties.m"; sourceTree = "<group>"; };
+		DA0CC5801EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPStoredSiteEntity+CoreDataClass.h"; sourceTree = "<group>"; };
+		DA0CC5811EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPStoredSiteEntity+CoreDataClass.m"; sourceTree = "<group>"; };
+		DA0CC5821EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPStoredSiteEntity+CoreDataProperties.h"; sourceTree = "<group>"; };
+		DA0CC5831EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPStoredSiteEntity+CoreDataProperties.m"; sourceTree = "<group>"; };
+		DA0CC5841EB6B030009A8ED9 /* MPUserEntity+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPUserEntity+CoreDataClass.h"; sourceTree = "<group>"; };
+		DA0CC5851EB6B030009A8ED9 /* MPUserEntity+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPUserEntity+CoreDataClass.m"; sourceTree = "<group>"; };
+		DA0CC5861EB6B030009A8ED9 /* MPUserEntity+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPUserEntity+CoreDataProperties.h"; sourceTree = "<group>"; };
+		DA0CC5871EB6B030009A8ED9 /* MPUserEntity+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPUserEntity+CoreDataProperties.m"; sourceTree = "<group>"; };
+		DA0CC5881EB6B030009A8ED9 /* MPSiteEntity+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPSiteEntity+CoreDataClass.h"; sourceTree = "<group>"; };
+		DA0CC5891EB6B030009A8ED9 /* MPSiteEntity+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPSiteEntity+CoreDataClass.m"; sourceTree = "<group>"; };
+		DA0CC58A1EB6B030009A8ED9 /* MPSiteEntity+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MPSiteEntity+CoreDataProperties.h"; sourceTree = "<group>"; };
+		DA0CC58B1EB6B030009A8ED9 /* MPSiteEntity+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPSiteEntity+CoreDataProperties.m"; sourceTree = "<group>"; };
 		DA24EBB219DAD4D000FF010B /* Icon-60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-60.png"; sourceTree = "<group>"; };
 		DA24EBB319DAD4D000FF010B /* Icon-60@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-60@2x.png"; sourceTree = "<group>"; };
 		DA24EBB419DAD4D000FF010B /* Icon-60@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-60@3x.png"; sourceTree = "<group>"; };
@@ -715,14 +750,6 @@
 		DA30E9D315722EF400A68B4C /* Pearl-UIKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Pearl-UIKit.m"; sourceTree = "<group>"; };
 		DA30E9D515723E6900A68B4C /* PearlLazy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlLazy.h; sourceTree = "<group>"; };
 		DA30E9D615723E6900A68B4C /* PearlLazy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlLazy.m; sourceTree = "<group>"; };
-		DA32CFE619CF1C8F004F3F0E /* MPUserEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUserEntity.m; sourceTree = "<group>"; };
-		DA32CFE719CF1C8F004F3F0E /* MPUserEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPUserEntity.h; sourceTree = "<group>"; };
-		DA32CFE819CF1C8F004F3F0E /* MPStoredSiteEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPStoredSiteEntity.m; sourceTree = "<group>"; };
-		DA32CFE919CF1C8F004F3F0E /* MPStoredSiteEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPStoredSiteEntity.h; sourceTree = "<group>"; };
-		DA32CFEC19CF1C8F004F3F0E /* MPSiteEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSiteEntity.m; sourceTree = "<group>"; };
-		DA32CFED19CF1C8F004F3F0E /* MPSiteEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSiteEntity.h; sourceTree = "<group>"; };
-		DA32CFEE19CF1C8F004F3F0E /* MPGeneratedSiteEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPGeneratedSiteEntity.m; sourceTree = "<group>"; };
-		DA32CFEF19CF1C8F004F3F0E /* MPGeneratedSiteEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPGeneratedSiteEntity.h; sourceTree = "<group>"; };
 		DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlFixedTableView.m; sourceTree = "<group>"; };
 		DA32D01919D046E1004F3F0E /* PearlFixedTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlFixedTableView.h; sourceTree = "<group>"; };
 		DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKCOrderedAccessorFix.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -737,8 +764,6 @@
 		DA32D04B19D2F59B004F3F0E /* meter_fuel@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "meter_fuel@3x.png"; sourceTree = "<group>"; };
 		DA32D04C19D2F59B004F3F0E /* meter_fuel@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "meter_fuel@2x.png"; sourceTree = "<group>"; };
 		DA32D04D19D2F59B004F3F0E /* meter_fuel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = meter_fuel.png; sourceTree = "<group>"; };
-		DA32D05319D741DC004F3F0E /* MPSiteQuestionEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSiteQuestionEntity.h; sourceTree = "<group>"; };
-		DA32D05419D741DC004F3F0E /* MPSiteQuestionEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSiteQuestionEntity.m; sourceTree = "<group>"; };
 		DA32D07719D7D784004F3F0E /* background@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background@3x.png"; path = "ios/launch/background@3x.png"; sourceTree = "<group>"; };
 		DA32D07819D7D784004F3F0E /* background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "background@2x.png"; path = "ios/launch/background@2x.png"; sourceTree = "<group>"; };
 		DA32D07919D7D784004F3F0E /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background.png; path = ios/launch/background.png; sourceTree = "<group>"; };
@@ -775,14 +800,6 @@
 		DA95B50B1C476B6A0067F5EF /* LocalAuthentication.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalAuthentication.framework; path = System/Library/Frameworks/LocalAuthentication.framework; sourceTree = SDKROOT; };
 		DA95B50D1C4776F00067F5EF /* NSMutableSet+Pearl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableSet+Pearl.h"; sourceTree = "<group>"; };
 		DA95B50E1C4776F00067F5EF /* NSMutableSet+Pearl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableSet+Pearl.m"; sourceTree = "<group>"; };
-		DA95B5111C477DB50067F5EF /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5121C477DB50067F5EF /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5131C477DB50067F5EF /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5141C477DB50067F5EF /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5151C477DB50067F5EF /* MasterPassword 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 5.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5161C477DB50067F5EF /* MasterPassword 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 6.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5171C477DB50067F5EF /* MasterPassword 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 7.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5181C477DB50067F5EF /* MasterPassword 8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 8.xcdatamodel"; sourceTree = "<group>"; };
 		DA95D5F014DF0B1E008D1B94 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		DAA141191922FED80032B392 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
 		DAA1411C1922FF020032B392 /* PearlTween.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlTween.m; sourceTree = "<group>"; };
@@ -1496,7 +1513,6 @@
 		DAC632871486D95D0075AEA5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		DAC77CAD148291A600BCF976 /* libPearl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPearl.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DAC77CB1148291A600BCF976 /* Pearl-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Pearl-Prefix.pch"; path = "../../Source/Pearl/Pearl-Prefix.pch"; sourceTree = "<group>"; };
-		DACA269A1705DF81002C6C22 /* Crashlytics.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Crashlytics.plist; sourceTree = "<group>"; };
 		DACA29711705E1A8002C6C22 /* ciphers.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ciphers.plist; sourceTree = "<group>"; };
 		DACA29721705E1A8002C6C22 /* dictionary.lst */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dictionary.lst; sourceTree = "<group>"; };
 		DACA29771705E2BD002C6C22 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JRSwizzle.h; sourceTree = "<group>"; };
@@ -1623,6 +1639,7 @@
 				DA2C3D651BD9612F001137B3 /* libz.tbd in Frameworks */,
 				DA2C3D631BD96126001137B3 /* libc++.tbd in Frameworks */,
 				DAA1761B19D86D0D0044227B /* libAttributedMarkdown.a in Frameworks */,
+				DA0CC5421EB57BD4009A8ED9 /* Crashlytics.framework in Frameworks */,
 				DA32D03E19D11293004F3F0E /* libKCOrderedAccessorFix.a in Frameworks */,
 				DA04E33E14B1E70400ECA4F3 /* MobileCoreServices.framework in Frameworks */,
 				DAE2725A19C93B8E007C5262 /* StoreKit.framework in Frameworks */,
@@ -1634,15 +1651,13 @@
 				DA672D3014F9413D004A189C /* libPearl.a in Frameworks */,
 				DAEBC45314F6364500987BF6 /* QuartzCore.framework in Frameworks */,
 				DA95D5F214DF0B2C008D1B94 /* MessageUI.framework in Frameworks */,
-				DA48856019A5A82E000C2D79 /* Crashlytics.framework in Frameworks */,
 				DAC632891486D9690075AEA5 /* Security.framework in Frameworks */,
 				DA5BFA49147E415C00F98B1E /* UIKit.framework in Frameworks */,
 				DA0979171E9A81EE00F0BFE8 /* libsodium.a in Frameworks */,
 				DA5BFA4B147E415C00F98B1E /* Foundation.framework in Frameworks */,
 				DA5BFA4D147E415C00F98B1E /* CoreGraphics.framework in Frameworks */,
 				DA5BFA4F147E415C00F98B1E /* CoreData.framework in Frameworks */,
-				93D399433EA75E50656040CB /* Twitter.framework in Frameworks */,
+				DA0CC5411EB57BD4009A8ED9 /* Fabric.framework in Frameworks */,
-				DA2C3D611BD95EEE001137B3 /* Fabric.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1861,6 +1876,14 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
+		DA0CC5391EB57B5C009A8ED9 /* Fabric */ = {
+			isa = PBXGroup;
+			children = (
+				DA0CC53A1EB57B5C009A8ED9 /* Fabric.plist */,
+			);
+			path = Fabric;
+			sourceTree = "<group>";
+		};
 		DA24EBB019DAD4D000FF010B /* ios */ = {
 			isa = PBXGroup;
 			children = (
@@ -2022,6 +2045,7 @@
 		DAA141181922FED80032B392 /* iOS */ = {
 			isa = PBXGroup;
 			children = (
+				DA0CC53F1EB57B91009A8ED9 /* Fabric.framework */,
 				DAA141191922FED80032B392 /* Crashlytics.framework */,
 			);
 			path = iOS;
@@ -2771,7 +2795,7 @@
 			children = (
 				DABD3BD71711E2DC00CF925C /* iOS */,
 				DA771FE41E6E1595004D7EDE /* MasterPassword-Prefix.pch */,
-				DA95B5101C477DB50067F5EF /* MasterPassword.xcdatamodeld */,
+				DA0CC5441EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld */,
 				DABD3BA01711E2DC00CF925C /* MPAlgorithm.h */,
 				DABD3BA11711E2DC00CF925C /* MPAlgorithm.m */,
 				DABD3BA21711E2DC00CF925C /* MPAlgorithmV0.h */,
@@ -2796,20 +2820,30 @@
 				DABD3BB51711E2DC00CF925C /* MPEntities.m */,
 				93D399F244BB522A317811BB /* MPFixable.h */,
 				93D39A813CA9D7E192261ED2 /* MPFixable.m */,
-				DA32CFEF19CF1C8F004F3F0E /* MPGeneratedSiteEntity.h */,
+				DA0CC5781EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.h */,
-				DA32CFEE19CF1C8F004F3F0E /* MPGeneratedSiteEntity.m */,
+				DA0CC5791EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m */,
+				DA0CC57A1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.h */,
+				DA0CC57B1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m */,
 				DABD3BB61711E2DC00CF925C /* MPKey.h */,
 				DABD3BB71711E2DC00CF925C /* MPKey.m */,
-				DA32CFED19CF1C8F004F3F0E /* MPSiteEntity.h */,
+				DA0CC5881EB6B030009A8ED9 /* MPSiteEntity+CoreDataClass.h */,
-				DA32CFEC19CF1C8F004F3F0E /* MPSiteEntity.m */,
+				DA0CC5891EB6B030009A8ED9 /* MPSiteEntity+CoreDataClass.m */,
-				DA32D05319D741DC004F3F0E /* MPSiteQuestionEntity.h */,
+				DA0CC58A1EB6B030009A8ED9 /* MPSiteEntity+CoreDataProperties.h */,
-				DA32D05419D741DC004F3F0E /* MPSiteQuestionEntity.m */,
+				DA0CC58B1EB6B030009A8ED9 /* MPSiteEntity+CoreDataProperties.m */,
-				DA32CFE919CF1C8F004F3F0E /* MPStoredSiteEntity.h */,
+				DA0CC57C1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataClass.h */,
-				DA32CFE819CF1C8F004F3F0E /* MPStoredSiteEntity.m */,
+				DA0CC57D1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataClass.m */,
+				DA0CC57E1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.h */,
+				DA0CC57F1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.m */,
+				DA0CC5801EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataClass.h */,
+				DA0CC5811EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataClass.m */,
+				DA0CC5821EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataProperties.h */,
+				DA0CC5831EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataProperties.m */,
 				DABD3BB81711E2DC00CF925C /* MPTypes.h */,
 				93D39D72239990DDAC2D75B0 /* MPTypes.m */,
-				DA32CFE719CF1C8F004F3F0E /* MPUserEntity.h */,
+				DA0CC5841EB6B030009A8ED9 /* MPUserEntity+CoreDataClass.h */,
-				DA32CFE619CF1C8F004F3F0E /* MPUserEntity.m */,
+				DA0CC5851EB6B030009A8ED9 /* MPUserEntity+CoreDataClass.m */,
+				DA0CC5861EB6B030009A8ED9 /* MPUserEntity+CoreDataProperties.h */,
+				DA0CC5871EB6B030009A8ED9 /* MPUserEntity+CoreDataProperties.m */,
 				93D393CB0B1F4EC8C17CFE43 /* NSString+MPMarkDown.h */,
 				93D39C41A27AA42D044D68AE /* NSString+MPMarkDown.m */,
 			);
@@ -2908,7 +2942,7 @@
 		DACA23B41705DF7D002C6C22 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				DACA26991705DF81002C6C22 /* Crashlytics */,
+				DA0CC5391EB57B5C009A8ED9 /* Fabric */,
 				DACA29701705E1A8002C6C22 /* Data */,
 				DAE1EF2417E942DE00BC0086 /* Localizable.strings */,
 				DABD360D1711E29400CF925C /* Media */,
@@ -2916,14 +2950,6 @@
 			path = Resources;
 			sourceTree = "<group>";
 		};
-		DACA26991705DF81002C6C22 /* Crashlytics */ = {
-			isa = PBXGroup;
-			children = (
-				DACA269A1705DF81002C6C22 /* Crashlytics.plist */,
-			);
-			path = Crashlytics;
-			sourceTree = "<group>";
-		};
 		DACA29701705E1A8002C6C22 /* Data */ = {
 			isa = PBXGroup;
 			children = (
@@ -3287,7 +3313,7 @@
 				DA5BFA41147E415C00F98B1E /* Frameworks */,
 				DA5BFA42147E415C00F98B1E /* Resources */,
 				DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */,
-				DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */,
+				DAD3125D155288AA00A3F9ED /* Run Script: Fabric */,
 			);
 			buildRules = (
 			);
@@ -3548,7 +3574,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				DAFE4A5A1503982E003ABA7C /* Pearl.strings in Resources */,
-				DACA296F1705DF81002C6C22 /* Crashlytics.plist in Resources */,
+				DA0CC53B1EB57B5C009A8ED9 /* Fabric.plist in Resources */,
 				DACA29731705E1A8002C6C22 /* ciphers.plist in Resources */,
 				DA32D04F19D2F59B004F3F0E /* meter_fuel@2x.png in Resources */,
 				DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */,
@@ -3778,19 +3804,19 @@
 			shellScript = "exec Scripts/genassets";
 			showEnvVarsInLog = 0;
 		};
-		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
+		DAD3125D155288AA00A3F9ED /* Run Script: Fabric */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Run Script: Crashlytics";
+			name = "Run Script: Fabric";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/bash -e";
-			shellScript = "[[ $DEPLOYMENT_LOCATION != YES ]] && exit\n\napiKey=$(/usr/libexec/PlistBuddy -c \"Print :'API Key'\" Resources/Crashlytics/Crashlytics.plist)\n[[ $apiKey ]] && External/iOS/Crashlytics.framework/run \"$apiKey\"";
+			shellScript = "[[ $DEPLOYMENT_LOCATION != YES ]] && exit\n\napiKey=$(/usr/libexec/PlistBuddy -c \"Print :'API Key'\" Resources/Fabric/Fabric.plist)\n[[ $apiKey ]] && External/iOS/Fabric.framework/run \"$apiKey\"";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -3808,7 +3834,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DA0CC5921EB6B030009A8ED9 /* MPUserEntity+CoreDataClass.m in Sources */,
 				DABD3BFD1711E2DC00CF925C /* MPAlgorithm.m in Sources */,
+				DA0CC5951EB6B030009A8ED9 /* MPSiteEntity+CoreDataProperties.m in Sources */,
 				DABD3BFE1711E2DC00CF925C /* MPAlgorithmV0.m in Sources */,
 				DABD3BFF1711E2DC00CF925C /* MPAlgorithmV1.m in Sources */,
 				DABD3C001711E2DC00CF925C /* MPAppDelegate_Key.m in Sources */,
@@ -3816,38 +3844,40 @@
 				DABD3C021711E2DC00CF925C /* MPAppDelegate_Store.m in Sources */,
 				DABD3C031711E2DC00CF925C /* MPConfig.m in Sources */,
 				DABD3C071711E2DC00CF925C /* MPEntities.m in Sources */,
-				DA32CFF319CF1C8F004F3F0E /* MPSiteEntity.m in Sources */,
 				DABD3C081711E2DC00CF925C /* MPKey.m in Sources */,
 				DABD3C151711E2DC00CF925C /* MPiOSAppDelegate.m in Sources */,
+				DA0CC5941EB6B030009A8ED9 /* MPSiteEntity+CoreDataClass.m in Sources */,
 				DABD3C1C1711E2DC00CF925C /* MPGuideViewController.m in Sources */,
 				DABD3C1E1711E2DC00CF925C /* MPPreferencesViewController.m in Sources */,
 				DABD3C1F1711E2DC00CF925C /* MPTypeViewController.m in Sources */,
 				DABD3C211711E2DC00CF925C /* MPiOSConfig.m in Sources */,
+				DA0CC5901EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataClass.m in Sources */,
+				DA0CC58D1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataProperties.m in Sources */,
 				DABD3C271711E2DC00CF925C /* main.m in Sources */,
+				DA0CC5931EB6B030009A8ED9 /* MPUserEntity+CoreDataProperties.m in Sources */,
 				93D39F8A9254177891F38705 /* MPSetupViewController.m in Sources */,
 				DA095E75172F4CD8001C948B /* MPLogsViewController.m in Sources */,
 				93D39D596A2E376D6F6F5DA1 /* MPCombinedViewController.m in Sources */,
-				DA32CFF419CF1C8F004F3F0E /* MPGeneratedSiteEntity.m in Sources */,
 				93D3957237D303DE2D38C267 /* MPAvatarCell.m in Sources */,
 				93D39B8F90F58A5D158DDBA3 /* MPPasswordsViewController.m in Sources */,
-				DA32D05519D741DC004F3F0E /* MPSiteQuestionEntity.m in Sources */,
 				93D3954FCE045A3CC7E804B7 /* MPUsersViewController.m in Sources */,
 				93D39392DEDA376F93C6C718 /* MPCell.m in Sources */,
+				DA0CC58E1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataClass.m in Sources */,
 				93D39A5FF670957C0AF8298D /* MPPasswordCell.m in Sources */,
 				93D398ECD7D1A0DEDDADF516 /* MPEmergencyViewController.m in Sources */,
 				DA95B50F1C4776F00067F5EF /* NSMutableSet+Pearl.m in Sources */,
 				93D394B5036C882B33C71872 /* MPPasswordsSegue.m in Sources */,
+				DA0CC5911EB6B030009A8ED9 /* MPStoredSiteEntity+CoreDataProperties.m in Sources */,
 				93D39673DDC085BE72C34D7C /* MPPopdownSegue.m in Sources */,
 				93D39BA1EA3CAAC8A220B4A6 /* MPAppSettingsViewController.m in Sources */,
+				DA0CC58F1EB6B030009A8ED9 /* MPSiteQuestionEntity+CoreDataProperties.m in Sources */,
 				93D396D8B67DA6522CDBA142 /* MPCoachmarkViewController.m in Sources */,
 				DAADBFE01A68763B00F7A756 /* mpw-algorithm.c in Sources */,
-				DA95B5191C477DB50067F5EF /* MasterPassword.xcdatamodeld in Sources */,
+				DA0CC54E1EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld in Sources */,
 				93D39EAA4D064193074D3021 /* MPFixable.m in Sources */,
-				DA32CFF119CF1C8F004F3F0E /* MPStoredSiteEntity.m in Sources */,
 				93D394982CBD25D46692DD7C /* MPWebViewController.m in Sources */,
 				93D39D8F78978196D6ABDEDE /* MPNavigationController.m in Sources */,
 				93D3939661CE37180AF7CD6A /* MPStoreViewController.m in Sources */,
-				DA32CFF019CF1C8F004F3F0E /* MPUserEntity.m in Sources */,
 				93D390C1B93F9D3AE37DD0A5 /* MPAnswersViewController.m in Sources */,
 				93D399D7E08A142776A74CB8 /* MPOverlayViewController.m in Sources */,
 				93D39A27F2506C6FEEF9C588 /* MPAlgorithmV2.m in Sources */,
@@ -3857,6 +3887,7 @@
 				93D39943D01E70DAC3B0DF76 /* mpw-util.c in Sources */,
 				93D39577FD8BB0945DB2F0A3 /* MPAlgorithmV3.m in Sources */,
 				93D39E5F7F6D7F5C0FAD090F /* MPTypes.m in Sources */,
+				DA0CC58C1EB6B030009A8ED9 /* MPGeneratedSiteEntity+CoreDataClass.m in Sources */,
 				DA92614E1BE1A57500369DE5 /* MPAppDelegate_InApp.m in Sources */,
 				93D39508A6814612A5B3C226 /* MPMessageViewController.m in Sources */,
 			);
@@ -4137,6 +4168,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO;
 				CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
 				COPY_PHASE_STRIP = YES;
@@ -4146,8 +4178,9 @@
 					"\"$(SRCROOT)/External/iOS\"",
 				);
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
+				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				INFOPLIST_FILE = "Source/iOS/MasterPassword-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/External/libsodium/libsodium-ios/lib",
@@ -4263,6 +4296,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					"CRASHLYTICS=1",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
@@ -4404,6 +4438,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO;
 				CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4411,8 +4446,9 @@
 					"\"$(SRCROOT)/External/iOS\"",
 				);
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
+				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				INFOPLIST_FILE = "Source/iOS/MasterPassword-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/External/libsodium/libsodium-ios/lib",
@@ -4430,6 +4466,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = NO;
 				CODE_SIGN_ENTITLEMENTS = Source/iOS/MasterPassword.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
@@ -4439,8 +4476,9 @@
 					"\"$(SRCROOT)/External/iOS\"",
 				);
 				GCC_PREFIX_HEADER = "Source/MasterPassword-Prefix.pch";
+				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
 				INFOPLIST_FILE = "Source/iOS/MasterPassword-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/External/libsodium/libsodium-ios/lib",
@@ -4627,19 +4665,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCVersionGroup section */
-		DA95B5101C477DB50067F5EF /* MasterPassword.xcdatamodeld */ = {
+		DA0CC5441EB6AD0E009A8ED9 /* MasterPassword.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
-				DA95B5111C477DB50067F5EF /* MasterPassword 1.xcdatamodel */,
+				DA0CC5451EB6AD0E009A8ED9 /* MasterPassword 1.xcdatamodel */,
-				DA95B5121C477DB50067F5EF /* MasterPassword 2.xcdatamodel */,
+				DA0CC5461EB6AD0E009A8ED9 /* MasterPassword 2.xcdatamodel */,
-				DA95B5131C477DB50067F5EF /* MasterPassword 3.xcdatamodel */,
+				DA0CC5471EB6AD0E009A8ED9 /* MasterPassword 3.xcdatamodel */,
-				DA95B5141C477DB50067F5EF /* MasterPassword 4.xcdatamodel */,
+				DA0CC5481EB6AD0E009A8ED9 /* MasterPassword 4.xcdatamodel */,
-				DA95B5151C477DB50067F5EF /* MasterPassword 5.xcdatamodel */,
+				DA0CC5491EB6AD0E009A8ED9 /* MasterPassword 5.xcdatamodel */,
-				DA95B5161C477DB50067F5EF /* MasterPassword 6.xcdatamodel */,
+				DA0CC54A1EB6AD0E009A8ED9 /* MasterPassword 6.xcdatamodel */,
-				DA95B5171C477DB50067F5EF /* MasterPassword 7.xcdatamodel */,
+				DA0CC54B1EB6AD0E009A8ED9 /* MasterPassword 7.xcdatamodel */,
-				DA95B5181C477DB50067F5EF /* MasterPassword 8.xcdatamodel */,
+				DA0CC54C1EB6AD0E009A8ED9 /* MasterPassword 8.xcdatamodel */,
+				DA0CC54D1EB6AD0E009A8ED9 /* MasterPassword 9.xcdatamodel */,
 			);
-			currentVersion = DA95B5181C477DB50067F5EF /* MasterPassword 8.xcdatamodel */;
+			currentVersion = DA0CC54D1EB6AD0E009A8ED9 /* MasterPassword 9.xcdatamodel */;
 			path = MasterPassword.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;

platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj

@@ -27,6 +27,8 @@
 		DA09745B1E99582900F0BFE8 /* mpw-tests.c in Sources */ = {isa = PBXBuildFile; fileRef = DA0974571E99582200F0BFE8 /* mpw-tests.c */; };
 		DA09745E1E99586600F0BFE8 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA09745D1E99586600F0BFE8 /* libxml2.tbd */; };
 		DA0979681E9A834C00F0BFE8 /* libsodium.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA0979571E9A824700F0BFE8 /* libsodium.a */; };
+		DA0CC53E1EB57B69009A8ED9 /* Fabric.plist in Resources */ = {isa = PBXBuildFile; fileRef = DA0CC53D1EB57B69009A8ED9 /* Fabric.plist */; };
+		DA0CC5591EB6AE45009A8ED9 /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA0CC54F1EB6AE45009A8ED9 /* MasterPassword.xcdatamodeld */; };
 		DA1000801998A4C6002B873F /* openssl in Headers */ = {isa = PBXBuildFile; fileRef = DAE8E65719867AF500416A0F /* openssl */; settings = {ATTRIBUTES = (Public, ); }; };
 		DA16B341170661DB000A0EAB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B340170661DB000A0EAB /* Carbon.framework */; };
 		DA16B342170661E0000A0EAB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC632871486D95D0075AEA5 /* Security.framework */; };
@@ -96,7 +98,6 @@
 		DA9261521BE1A86700369DE5 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261501BE1A86700369DE5 /* Fabric.framework */; };
 		DA9261541BE1A88900369DE5 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261531BE1A88900369DE5 /* libc++.tbd */; };
 		DA9261561BE1A89600369DE5 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261551BE1A89600369DE5 /* libz.tbd */; };
-		DA95B5231C477DE10067F5EF /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA95B51A1C477DE10067F5EF /* MasterPassword.xcdatamodeld */; };
 		DAAA81B0195A8D1300FA30D9 /* gradient.png in Resources */ = {isa = PBXBuildFile; fileRef = DAAA81AF195A8D1300FA30D9 /* gradient.png */; };
 		DAADCC4719FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */; };
 		DAADCC4819FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */; };
@@ -148,7 +149,6 @@
 		DACA27381705DF81002C6C22 /* menu-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = DACA24581705DF7D002C6C22 /* menu-icon.png */; };
 		DACA29671705DF81002C6C22 /* SourceCodePro-ExtraLight.otf in Resources */ = {isa = PBXBuildFile; fileRef = DACA268E1705DF81002C6C22 /* SourceCodePro-ExtraLight.otf */; };
 		DACA29681705DF81002C6C22 /* SourceCodePro-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = DACA268F1705DF81002C6C22 /* SourceCodePro-Black.otf */; };
-		DACA296F1705DF81002C6C22 /* Crashlytics.plist in Resources */ = {isa = PBXBuildFile; fileRef = DACA269A1705DF81002C6C22 /* Crashlytics.plist */; };
 		DACA29731705E1A8002C6C22 /* ciphers.plist in Resources */ = {isa = PBXBuildFile; fileRef = DACA29711705E1A8002C6C22 /* ciphers.plist */; };
 		DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */ = {isa = PBXBuildFile; fileRef = DACA29721705E1A8002C6C22 /* dictionary.lst */; };
 		DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29771705E2BD002C6C22 /* JRSwizzle.h */; };
@@ -350,6 +350,16 @@
 		DA0979531E9A824700F0BFE8 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
 		DA0979541E9A824700F0BFE8 /* sodium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sodium.h; sourceTree = "<group>"; };
 		DA0979571E9A824700F0BFE8 /* libsodium.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsodium.a; sourceTree = "<group>"; };
+		DA0CC53D1EB57B69009A8ED9 /* Fabric.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Fabric.plist; sourceTree = "<group>"; };
+		DA0CC5501EB6AE45009A8ED9 /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5511EB6AE45009A8ED9 /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5521EB6AE45009A8ED9 /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5531EB6AE45009A8ED9 /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5541EB6AE45009A8ED9 /* MasterPassword 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 5.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5551EB6AE45009A8ED9 /* MasterPassword 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 6.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5561EB6AE45009A8ED9 /* MasterPassword 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 7.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5571EB6AE45009A8ED9 /* MasterPassword 8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 8.xcdatamodel"; sourceTree = "<group>"; };
+		DA0CC5581EB6AE45009A8ED9 /* MasterPassword 9.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 9.xcdatamodel"; sourceTree = "<group>"; };
 		DA16B340170661DB000A0EAB /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		DA16B343170661EE000A0EAB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		DA2508F019511D3600AC23F1 /* MPPasswordWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MPPasswordWindowController.xib; sourceTree = "<group>"; };
@@ -849,14 +859,6 @@
 		DA9261501BE1A86700369DE5 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = "<group>"; };
 		DA9261531BE1A88900369DE5 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		DA9261551BE1A89600369DE5 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		DA95B51B1C477DE10067F5EF /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B51C1C477DE10067F5EF /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B51D1C477DE10067F5EF /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B51E1C477DE10067F5EF /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B51F1C477DE10067F5EF /* MasterPassword 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 5.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5201C477DE10067F5EF /* MasterPassword 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 6.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5211C477DE10067F5EF /* MasterPassword 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 7.xcdatamodel"; sourceTree = "<group>"; };
-		DA95B5221C477DE10067F5EF /* MasterPassword 8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 8.xcdatamodel"; sourceTree = "<group>"; };
 		DAAA81AF195A8D1300FA30D9 /* gradient.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gradient.png; sourceTree = "<group>"; };
 		DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+PearlEasyCleanup.h"; sourceTree = "<group>"; };
 		DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPersistentStore+PearlMigration.h"; sourceTree = "<group>"; };
@@ -911,7 +913,6 @@
 		DACA24581705DF7D002C6C22 /* menu-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menu-icon.png"; sourceTree = "<group>"; };
 		DACA268E1705DF81002C6C22 /* SourceCodePro-ExtraLight.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-ExtraLight.otf"; sourceTree = "<group>"; };
 		DACA268F1705DF81002C6C22 /* SourceCodePro-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-Black.otf"; sourceTree = "<group>"; };
-		DACA269A1705DF81002C6C22 /* Crashlytics.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Crashlytics.plist; sourceTree = "<group>"; };
 		DACA29711705E1A8002C6C22 /* ciphers.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ciphers.plist; sourceTree = "<group>"; };
 		DACA29721705E1A8002C6C22 /* dictionary.lst */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dictionary.lst; sourceTree = "<group>"; };
 		DACA29771705E2BD002C6C22 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JRSwizzle.h; sourceTree = "<group>"; };
@@ -1132,6 +1133,14 @@
 			path = lib;
 			sourceTree = "<group>";
 		};
+		DA0CC53C1EB57B69009A8ED9 /* Fabric */ = {
+			isa = PBXGroup;
+			children = (
+				DA0CC53D1EB57B69009A8ED9 /* Fabric.plist */,
+			);
+			path = Fabric;
+			sourceTree = "<group>";
+		};
 		DA2508F819513C1400AC23F1 /* Other Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -1212,7 +1221,7 @@
 			children = (
 				DA5E5CB21724A667003798D8 /* Mac */,
 				DA771FE51E6E15A1004D7EDE /* MasterPassword-Prefix.pch */,
-				DA95B51A1C477DE10067F5EF /* MasterPassword.xcdatamodeld */,
+				DA0CC54F1EB6AE45009A8ED9 /* MasterPassword.xcdatamodeld */,
 				DA5E5C971724A667003798D8 /* MPAlgorithm.h */,
 				DA5E5C981724A667003798D8 /* MPAlgorithm.m */,
 				DA5E5C991724A667003798D8 /* MPAlgorithmV0.h */,
@@ -1772,8 +1781,8 @@
 		DACA23B41705DF7D002C6C22 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				DA0CC53C1EB57B69009A8ED9 /* Fabric */,
 				DA09745F1E995EB500F0BFE8 /* mpw_tests.xml */,
-				DACA26991705DF81002C6C22 /* Crashlytics */,
 				DACA29701705E1A8002C6C22 /* Data */,
 				DACA23B51705DF7D002C6C22 /* Media */,
 			);
@@ -1856,14 +1865,6 @@
 			path = Fonts;
 			sourceTree = "<group>";
 		};
-		DACA26991705DF81002C6C22 /* Crashlytics */ = {
-			isa = PBXGroup;
-			children = (
-				DACA269A1705DF81002C6C22 /* Crashlytics.plist */,
-			);
-			path = Crashlytics;
-			sourceTree = "<group>";
-		};
 		DACA29701705E1A8002C6C22 /* Data */ = {
 			isa = PBXGroup;
 			children = (
@@ -2086,7 +2087,7 @@
 				DA5BFA42147E415C00F98B1E /* Resources */,
 				DAD9B5EE1762CA3A001835F9 /* Copy LoginHelper */,
 				DA6556E314D55F3000841C99 /* Run Script: GIT version -> Info.plist */,
-				DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */,
+				DAD3125D155288AA00A3F9ED /* Run Script: Fabric */,
 			);
 			buildRules = (
 			);
@@ -2295,13 +2296,13 @@
 				DACA27331705DF81002C6C22 /* avatar-12@2x.png in Resources */,
 				DACA27341705DF81002C6C22 /* avatar-2@2x.png in Resources */,
 				DA60717D195D040500CA98B5 /* icon_gear@2x.png in Resources */,
+				DA0CC53E1EB57B69009A8ED9 /* Fabric.plist in Resources */,
 				DACA27351705DF81002C6C22 /* avatar-11.png in Resources */,
 				DACA27361705DF81002C6C22 /* avatar-0@2x.png in Resources */,
 				DACA27371705DF81002C6C22 /* avatar-10@2x.png in Resources */,
 				DACA27381705DF81002C6C22 /* menu-icon.png in Resources */,
 				DACA29671705DF81002C6C22 /* SourceCodePro-ExtraLight.otf in Resources */,
 				DACA29681705DF81002C6C22 /* SourceCodePro-Black.otf in Resources */,
-				DACA296F1705DF81002C6C22 /* Crashlytics.plist in Resources */,
 				DACA29731705E1A8002C6C22 /* ciphers.plist in Resources */,
 				DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */,
 				DA5E5D081724A667003798D8 /* MasterPassword.entitlements in Resources */,
@@ -2359,19 +2360,19 @@
 			shellPath = "/bin/sh -e";
 			shellScript = "exec Scripts/updatePlist";
 		};
-		DAD3125D155288AA00A3F9ED /* Run Script: Crashlytics */ = {
+		DAD3125D155288AA00A3F9ED /* Run Script: Fabric */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Run Script: Crashlytics";
+			name = "Run Script: Fabric";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/sh -e";
-			shellScript = "[[ $DEPLOYMENT_LOCATION != YES ]] && exit\n\napiKey=$(/usr/libexec/PlistBuddy -c \"Print :'API Key'\" Resources/Crashlytics/Crashlytics.plist)\n[[ $apiKey ]] && External/Mac/Fabric.framework/run \"$apiKey\" 410fb41450e3a2e50fa8357682d812ecd3e1846f2141a99bdb9d3a6a981ad69c";
+			shellScript = "[[ $DEPLOYMENT_LOCATION != YES ]] && exit\n\napiKey=$(/usr/libexec/PlistBuddy -c \"Print :'API Key'\" Resources/Fabric/Fabric.plist)\n[[ $apiKey ]] && External/Mac/Fabric.framework/run \"$apiKey\" 410fb41450e3a2e50fa8357682d812ecd3e1846f2141a99bdb9d3a6a981ad69c";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -2408,8 +2409,8 @@
 				93D39784E725A34D1EE3FB3B /* MPInitialWindowController.m in Sources */,
 				DA32CFDF19CF1C70004F3F0E /* MPSiteEntity.m in Sources */,
 				93D394C4254EEB45FB335AFB /* MPSitesTableView.m in Sources */,
-				DA95B5231C477DE10067F5EF /* MasterPassword.xcdatamodeld in Sources */,
 				DA6774291A4746AF004F356A /* mpw-algorithm.c in Sources */,
+				DA0CC5591EB6AE45009A8ED9 /* MasterPassword.xcdatamodeld in Sources */,
 				93D395E4830290EBB6E71F34 /* MPNoStateButton.m in Sources */,
 				DA4DAE941A7D8117003E5423 /* MPAlgorithmV3.m in Sources */,
 				DA4DAE951A7D8117003E5423 /* MPTypes.m in Sources */,
@@ -3129,19 +3130,20 @@
 /* End XCConfigurationList section */
 
 /* Begin XCVersionGroup section */
-		DA95B51A1C477DE10067F5EF /* MasterPassword.xcdatamodeld */ = {
+		DA0CC54F1EB6AE45009A8ED9 /* MasterPassword.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
-				DA95B51B1C477DE10067F5EF /* MasterPassword 1.xcdatamodel */,
+				DA0CC5501EB6AE45009A8ED9 /* MasterPassword 1.xcdatamodel */,
-				DA95B51C1C477DE10067F5EF /* MasterPassword 2.xcdatamodel */,
+				DA0CC5511EB6AE45009A8ED9 /* MasterPassword 2.xcdatamodel */,
-				DA95B51D1C477DE10067F5EF /* MasterPassword 3.xcdatamodel */,
+				DA0CC5521EB6AE45009A8ED9 /* MasterPassword 3.xcdatamodel */,
-				DA95B51E1C477DE10067F5EF /* MasterPassword 4.xcdatamodel */,
+				DA0CC5531EB6AE45009A8ED9 /* MasterPassword 4.xcdatamodel */,
-				DA95B51F1C477DE10067F5EF /* MasterPassword 5.xcdatamodel */,
+				DA0CC5541EB6AE45009A8ED9 /* MasterPassword 5.xcdatamodel */,
-				DA95B5201C477DE10067F5EF /* MasterPassword 6.xcdatamodel */,
+				DA0CC5551EB6AE45009A8ED9 /* MasterPassword 6.xcdatamodel */,
-				DA95B5211C477DE10067F5EF /* MasterPassword 7.xcdatamodel */,
+				DA0CC5561EB6AE45009A8ED9 /* MasterPassword 7.xcdatamodel */,
-				DA95B5221C477DE10067F5EF /* MasterPassword 8.xcdatamodel */,
+				DA0CC5571EB6AE45009A8ED9 /* MasterPassword 8.xcdatamodel */,
+				DA0CC5581EB6AE45009A8ED9 /* MasterPassword 9.xcdatamodel */,
 			);
-			currentVersion = DA95B5221C477DE10067F5EF /* MasterPassword 8.xcdatamodel */;
+			currentVersion = DA0CC5581EB6AE45009A8ED9 /* MasterPassword 9.xcdatamodel */;
 			path = MasterPassword.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;

platform-darwin/Scripts/updatePlist

@@ -41,9 +41,9 @@ case $PLATFORM_NAME in
     *)      ftl 'ERROR: Unknown platform: %s.' "$PLATFORM_NAME"; exit 1 ;;
 esac
 
-description=$(git describe --always --dirty --long --match "*-$platform-*")
+description=$(git describe --always --dirty --long --match "*-$platform*")
 version=${description%-g*} build=${version##*-} version=${version%-$build}
-version=${version//-*-/.} release=${version%%-*} commit=${description##*-g}
+version=${version//-$platform/} version=${version//-/.} commit=${description##*-g}
 
 addPlistWithKey GITDescription string "$description"
 setPlistWithKey CFBundleVersion "$(hr "${version%%.*}" 14).${version#*.}"
@@ -55,14 +55,14 @@ setSettingWithTitle "Copyright" "$(getPlistWithKey NSHumanReadableCopyright)"
 
 if [[ $DEPLOYMENT_LOCATION = YES ]]; then
     # This build is a release.  Do some release checks.
-    crashlyticsPlist="$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/Crashlytics.plist"
+    fabricPlist="$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/Fabric.plist"
     passed=1
     [[ $description != *-dirty ]] || \
         { passed=0; err 'ERROR: Cannot release a dirty version, first commit any changes.'; }
     [[ $build == 0 ]] || \
         { passed=0; err 'ERROR: Commit is not tagged for release, first tag accordingly.'; }
-    [[ -r "$crashlyticsPlist" && $(PlistBuddy -c "Print :'API Key'" "$crashlyticsPlist" 2>/dev/null) ]] || \
+    [[ -r "$fabricPlist" && $(PlistBuddy -c "Print :'API Key'" "$fabricPlist" 2>/dev/null) ]] || \
-        { passed=0; err 'ERROR: Cannot release: Crashlytics API key is missing.'; }
+        { passed=0; err 'ERROR: Cannot release: Fabric API key is missing.'; }
     (( passed )) || \
         { ftl "Failed to pass release checks.  Fix the above errors and re-try.  Aborting."; exit 1; }
 fi

platform-darwin/Source/MPAlgorithm.h

@@ -17,9 +17,9 @@
 //==============================================================================
 
 #import "MPKey.h"
-#import "MPStoredSiteEntity.h"
+#import "MPStoredSiteEntity+CoreDataClass.h"
-#import "MPGeneratedSiteEntity.h"
+#import "MPGeneratedSiteEntity+CoreDataClass.h"
-#import "MPSiteQuestionEntity.h"
+#import "MPSiteQuestionEntity+CoreDataClass.h"
 #import "mpw-algorithm.h"
 
 #define MPAlgorithmDefaultVersion MPAlgorithmVersionCurrent

platform-darwin/Source/MPAlgorithmV0.m

@@ -93,7 +93,7 @@ NSOperationQueue *_mpwQueue = nil;
     migrationRequest.predicate = [NSPredicate predicateWithFormat:@"version_ < %d AND user == %@", self.version, user];
     NSArray *migrationSites = [moc executeFetchRequest:migrationRequest error:&error];
     if (!migrationSites) {
-        err( @"While looking for sites to migrate: %@", [error fullDescription] );
+        MPError( error, @"While looking for sites to migrate." );
         return NO;
     }
 

platform-darwin/Source/MPAppDelegate_InApp.h

@@ -25,17 +25,20 @@
 #define MPProductTouchID                        @"com.lyndir.masterpassword.products.touchid"
 #define MPProductFuel                           @"com.lyndir.masterpassword.products.fuel"
 
-#define MP_FUEL_HOURLY_RATE                     30.f /* Tier 1 purchases/h ~> USD/h */
+#define MP_FUEL_HOURLY_RATE                     40.f /* payment in tier 1 purchases / h (≅ USD / h) */
 
 @protocol MPInAppDelegate
 
-- (void)updateWithProducts:(NSArray /* SKProduct */ *)products;
+- (void)updateWithProducts:(NSDictionary<NSString *, SKProduct *> *)products
-- (void)updateWithTransaction:(SKPaymentTransaction *)transaction;
+              transactions:(NSDictionary<NSString *, SKPaymentTransaction *> *)transactions;
 
 @end
 
 @interface MPAppDelegate_Shared(InApp)
 
+- (NSDictionary<NSString *, SKProduct *> *)products;
+- (NSDictionary<NSString *, SKPaymentTransaction *> *)transactions;
+
 - (void)registerProductsObserver:(id<MPInAppDelegate>)delegate;
 - (void)removeProductsObserver:(id<MPInAppDelegate>)delegate;
 

platform-darwin/Source/MPAppDelegate_InApp.m

@@ -23,9 +23,20 @@
 
 @implementation MPAppDelegate_Shared(InApp)
 
-PearlAssociatedObjectProperty( NSArray*, Products, products );
+PearlAssociatedObjectProperty( NSDictionary*, Products, products );
+
 PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObservers );
 
+- (NSDictionary<NSString *, SKPaymentTransaction *> *)transactions {
+
+    NSMutableDictionary<NSString *, SKPaymentTransaction *> *transactions =
+            [NSMutableDictionary dictionaryWithCapacity:self.paymentQueue.transactions.count];
+    for (SKPaymentTransaction *transaction in self.paymentQueue.transactions)
+        transactions[transaction.payment.productIdentifier] = transaction;
+
+    return transactions;
+}
+
 - (void)registerProductsObserver:(id<MPInAppDelegate>)delegate {
 
     if (!self.productObservers)
@@ -33,7 +44,7 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
     [self.productObservers addObject:delegate];
 
     if (self.products)
-        [delegate updateWithProducts:self.products];
+        [delegate updateWithProducts:self.products transactions:[self transactions]];
     else
         [self reloadProducts];
 }
@@ -101,11 +112,13 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
     }
 #endif
 
-    for (SKProduct *product in self.products)
+    for (SKProduct *product in [self.products allValues])
         if ([product.productIdentifier isEqualToString:productIdentifier]) {
             SKMutablePayment *payment = [SKMutablePayment paymentWithProduct:product];
-            payment.quantity = quantity;
+            if (payment) {
-            [[self paymentQueue] addPayment:payment];
+                payment.quantity = quantity;
+                [[self paymentQueue] addPayment:payment];
+            }
             return;
         }
 }
@@ -114,15 +127,22 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
 
 - (void)productsRequest:(SKProductsRequest *)request didReceiveResponse:(SKProductsResponse *)response {
 
-    inf( @"products: %@, invalid: %@", response.products, response.invalidProductIdentifiers );
+    if ([response.invalidProductIdentifiers count])
-    self.products = response.products;
+        inf( @"Invalid products: %@", response.invalidProductIdentifiers );
+
+    NSMutableDictionary *products = [NSMutableDictionary dictionaryWithCapacity:[response.products count]];
+    for (SKProduct *product in response.products)
+        products[product.productIdentifier] = product;
+    self.products = products;
 
     for (id<MPInAppDelegate> productObserver in self.productObservers)
-        [productObserver updateWithProducts:self.products];
+        [productObserver updateWithProducts:self.products transactions:[self transactions]];
 }
 
 - (void)request:(SKRequest *)request didFailWithError:(NSError *)error {
 
+    MPError( error, @"StoreKit request (%@) failed.", request );
+
 #if TARGET_OS_IPHONE
     [PearlAlert showAlertWithTitle:@"Purchase Failed" message:
                     strf( @"%@\n\n%@", error.localizedDescription,
@@ -131,7 +151,6 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
                        cancelTitle:@"OK" otherTitles:nil];
 #else
 #endif
-    err( @"StoreKit request (%@) failed: %@", request, [error fullDescription] );
 }
 
 - (void)requestDidFinish:(SKRequest *)request {
@@ -145,23 +164,41 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
 
     for (SKPaymentTransaction *transaction in transactions) {
         dbg( @"transaction updated: %@ -> %d", transaction.payment.productIdentifier, (int)(transaction.transactionState) );
+
         switch (transaction.transactionState) {
             case SKPaymentTransactionStatePurchased: {
-                inf( @"purchased: %@", transaction.payment.productIdentifier );
+                inf( @"Purchased: %@", transaction.payment.productIdentifier );
+                NSMutableDictionary *attributes = [NSMutableDictionary new];
+
                 if ([transaction.payment.productIdentifier isEqualToString:MPProductFuel]) {
                     float currentFuel = [[MPiOSConfig get].developmentFuelRemaining floatValue];
                     float purchasedFuel = transaction.payment.quantity / MP_FUEL_HOURLY_RATE;
                     [MPiOSConfig get].developmentFuelRemaining = @(currentFuel + purchasedFuel);
                     if (![MPiOSConfig get].developmentFuelChecked || currentFuel < DBL_EPSILON)
                         [MPiOSConfig get].developmentFuelChecked = [NSDate date];
+                    [attributes addEntriesFromDictionary:@{
+                            @"currentFuel"  : @(currentFuel),
+                            @"purchasedFuel": @(purchasedFuel),
+                    }];
                 }
+
                 [[NSUserDefaults standardUserDefaults] setObject:transaction.transactionIdentifier
                                                           forKey:transaction.payment.productIdentifier];
                 [queue finishTransaction:transaction];
+
+                if ([[MPConfig get].sendInfo boolValue]) {
+#ifdef CRASHLYTICS
+                    SKProduct *product = self.products[transaction.payment.productIdentifier];
+                    for (int q = 0; q < transaction.payment.quantity; ++q)
+                        [Answers logPurchaseWithPrice:product.price currency:[product.priceLocale objectForKey:NSLocaleCurrencyCode]
+                                              success:@YES itemName:product.localizedTitle itemType:@"InApp"
+                                               itemId:product.productIdentifier customAttributes:attributes];
+#endif
+                }
                 break;
             }
             case SKPaymentTransactionStateRestored: {
-                inf( @"restored: %@", transaction.payment.productIdentifier );
+                inf( @"Restored: %@", transaction.payment.productIdentifier );
                 [[NSUserDefaults standardUserDefaults] setObject:transaction.transactionIdentifier
                                                           forKey:transaction.payment.productIdentifier];
                 [queue finishTransaction:transaction];
@@ -171,21 +208,38 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
             case SKPaymentTransactionStateDeferred:
                 break;
             case SKPaymentTransactionStateFailed:
-                err( @"Transaction failed: %@, reason: %@", transaction.payment.productIdentifier, [transaction.error fullDescription] );
+                MPError( transaction.error, @"Transaction failed: %@.", transaction.payment.productIdentifier );
                 [queue finishTransaction:transaction];
+
+                if ([[MPConfig get].sendInfo boolValue]) {
+#ifdef CRASHLYTICS
+                    SKProduct *product = self.products[transaction.payment.productIdentifier];
+                    [Answers logPurchaseWithPrice:product.price currency:[product.priceLocale objectForKey:NSLocaleCurrencyCode]
+                                          success:@NO itemName:product.localizedTitle itemType:@"InApp" itemId:product.productIdentifier
+                                 customAttributes:@{
+                                         @"state"   : @"Failed",
+                                         @"quantity": @(transaction.payment.quantity),
+                                         @"reason"  : [transaction.error localizedFailureReason]?: [transaction.error localizedDescription],
+                                 }];
+#endif
+                }
                 break;
         }
-
-        for (id<MPInAppDelegate> productObserver in self.productObservers)
-            [productObserver updateWithTransaction:transaction];
     }
+
     if (![[NSUserDefaults standardUserDefaults] synchronize])
         wrn( @"Couldn't synchronize after transaction updates." );
+
+    NSMutableDictionary<NSString *, SKPaymentTransaction *> *allTransactions = [[self transactions] mutableCopy];
+    for (SKPaymentTransaction *transaction in transactions)
+        allTransactions[transaction.payment.productIdentifier] = transaction;
+    for (id<MPInAppDelegate> productObserver in self.productObservers)
+        [productObserver updateWithProducts:self.products transactions:allTransactions];
 }
 
 - (void)paymentQueue:(SKPaymentQueue *)queue restoreCompletedTransactionsFailedWithError:(NSError *)error {
 
-    err( @"StoreKit restore failed: %@", [error fullDescription] );
+    MPError( error, @"StoreKit restore failed." );
 }
 
 @end

platform-darwin/Source/MPAppDelegate_Key.m

@@ -16,18 +16,19 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+#import <Crashlytics/Answers.h>
 #import "MPAppDelegate_Key.h"
 #import "MPAppDelegate_Store.h"
 
 @interface MPAppDelegate_Shared()
 
-@property(strong, nonatomic) MPKey *key;
+@property(strong, atomic) MPKey *key;
 
 @end
 
 @implementation MPAppDelegate_Shared(Key)
 
-static NSDictionary *createKeyQuery(MPUserEntity *user, BOOL newItem, MPKeyOrigin *keyOrigin) {
+- (NSDictionary *)createKeyQueryforUser:(MPUserEntity *)user origin:(out MPKeyOrigin *)keyOrigin {
 
 #if TARGET_OS_IPHONE
     if (user.touchID && kSecUseAuthenticationUI) {
@@ -37,17 +38,17 @@ static NSDictionary *createKeyQuery(MPUserEntity *user, BOOL newItem, MPKeyOrigi
         CFErrorRef acError = NULL;
         id accessControl = (__bridge_transfer id)SecAccessControlCreateWithFlags( kCFAllocatorDefault,
                 kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly, kSecAccessControlTouchIDCurrentSet, &acError );
-        if (!accessControl || acError)
+        if (!accessControl)
-            err( @"Could not use TouchID on this device: %@", acError );
+            MPError( (__bridge_transfer NSError *)acError, @"Could not use TouchID on this device." );
 
         else
             return [PearlKeyChain createQueryForClass:kSecClassGenericPassword
                                            attributes:@{
-                                                   (__bridge id)kSecAttrService         : @"Saved Master Password",
+                                                   (__bridge id)kSecAttrService        : @"Saved Master Password",
-                                                   (__bridge id)kSecAttrAccount         : user.name?: @"",
+                                                   (__bridge id)kSecAttrAccount        : user.name?: @"",
-                                                   (__bridge id)kSecAttrAccessControl   : accessControl,
+                                                   (__bridge id)kSecAttrAccessControl  : accessControl,
-                                                   (__bridge id)kSecUseAuthenticationUI : (__bridge id)kSecUseAuthenticationUIAllow,
+                                                   (__bridge id)kSecUseAuthenticationUI: (__bridge id)kSecUseAuthenticationUIAllow,
-                                                   (__bridge id)kSecUseOperationPrompt  :
+                                                   (__bridge id)kSecUseOperationPrompt :
                                                    strf( @"Access %@'s master password.", user.name ),
                                            }
                                               matches:nil];
@@ -59,10 +60,10 @@ static NSDictionary *createKeyQuery(MPUserEntity *user, BOOL newItem, MPKeyOrigi
 
     return [PearlKeyChain createQueryForClass:kSecClassGenericPassword
                                    attributes:@{
-                                           (__bridge id)kSecAttrService: @"Saved Master Password",
+                                           (__bridge id)kSecAttrService   : @"Saved Master Password",
-                                           (__bridge id)kSecAttrAccount: user.name?: @"",
+                                           (__bridge id)kSecAttrAccount   : user.name?: @"",
 #if TARGET_OS_IPHONE
-                                           (__bridge id)kSecAttrAccessible : (__bridge id)(kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly?: kSecAttrAccessibleWhenUnlockedThisDeviceOnly),
+                                           (__bridge id)kSecAttrAccessible: (__bridge id)(kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly?: kSecAttrAccessibleWhenUnlockedThisDeviceOnly),
 #endif
                                    }
                                       matches:nil];
@@ -71,7 +72,7 @@ static NSDictionary *createKeyQuery(MPUserEntity *user, BOOL newItem, MPKeyOrigi
 - (MPKey *)loadSavedKeyFor:(MPUserEntity *)user {
 
     MPKeyOrigin keyOrigin;
-    NSDictionary *keyQuery = createKeyQuery( user, NO, &keyOrigin );
+    NSDictionary *keyQuery = [self createKeyQueryforUser:user origin:&keyOrigin];
     id<MPAlgorithm> keyAlgorithm = user.algorithm;
     MPKey *key = [[MPKey alloc] initForFullName:user.name withKeyResolver:^NSData *(id<MPAlgorithm> algorithm) {
         return ![algorithm isEqual:keyAlgorithm]? nil:
@@ -99,7 +100,7 @@ static NSDictionary *createKeyQuery(MPUserEntity *user, BOOL newItem, MPKeyOrigi
             [self forgetSavedKeyFor:user];
 
             inf( @"Saving key in keychain for user: %@", user.userID );
-            [PearlKeyChain addOrUpdateItemForQuery:createKeyQuery( user, YES, nil )
+            [PearlKeyChain addOrUpdateItemForQuery:[self createKeyQueryforUser:user origin:nil]
                                     withAttributes:@{ (__bridge id)kSecValueData: keyData }];
         }
     }
@@ -107,7 +108,7 @@ static NSDictionary *createKeyQuery(MPUserEntity *user, BOOL newItem, MPKeyOrigi
 
 - (void)forgetSavedKeyFor:(MPUserEntity *)user {
 
-    OSStatus result = [PearlKeyChain deleteItemForQuery:createKeyQuery( user, NO, nil )];
+    OSStatus result = [PearlKeyChain deleteItemForQuery:[self createKeyQueryforUser:user origin:nil]];
     if (result == noErr) {
         inf( @"Removed key from keychain for user: %@", user.userID );
 
@@ -177,6 +178,14 @@ static NSDictionary *createKeyQuery(MPUserEntity *user, BOOL newItem, MPKeyOrigi
         else
             dbg( @"Automatic login failed for user: %@", user.userID );
 
+        if ([[MPConfig get].sendInfo boolValue]) {
+#ifdef CRASHLYTICS
+            [Answers logLoginWithMethod:password? @"Password": @"Automatic" success:@NO customAttributes:@{
+                    @"algorithm": @(user.algorithm.version),
+            }];
+#endif
+        }
+
         return NO;
     }
     inf( @"Logged in user: %@", user.userID );
@@ -198,8 +207,11 @@ static NSDictionary *createKeyQuery(MPUserEntity *user, BOOL newItem, MPKeyOrigi
     @try {
         if ([[MPConfig get].sendInfo boolValue]) {
 #ifdef CRASHLYTICS
-            [[Crashlytics sharedInstance] setObjectValue:user.userID forKey:@"username"];
             [[Crashlytics sharedInstance] setUserName:user.userID];
+
+            [Answers logLoginWithMethod:password? @"Password": @"Automatic" success:@YES customAttributes:@{
+                    @"algorithm": @(user.algorithm.version),
+            }];
 #endif
         }
     }

platform-darwin/Source/MPAppDelegate_Shared.h

@@ -26,9 +26,9 @@
 
 #endif
 
-@property(strong, nonatomic, readonly) MPKey *key;
+@property(strong, atomic, readonly) MPKey *key;
-@property(strong, nonatomic, readonly) NSManagedObjectID *activeUserOID;
+@property(strong, atomic, readonly) NSManagedObjectID *activeUserOID;
-@property(strong, nonatomic, readonly) NSPersistentStoreCoordinator *storeCoordinator;
+@property(strong, atomic, readonly) NSPersistentStoreCoordinator *storeCoordinator;
 
 + (instancetype)get;
 

platform-darwin/Source/MPAppDelegate_Shared.m

@@ -23,9 +23,9 @@
 
 @interface MPAppDelegate_Shared()
 
-@property(strong, nonatomic) MPKey *key;
+@property(strong, atomic) MPKey *key;
-@property(strong, nonatomic) NSManagedObjectID *activeUserOID;
+@property(strong, atomic) NSManagedObjectID *activeUserOID;
-@property(strong, nonatomic) NSPersistentStoreCoordinator *storeCoordinator;
+@property(strong, atomic) NSPersistentStoreCoordinator *storeCoordinator;
 
 @end
 
@@ -74,14 +74,11 @@
 
 - (void)setActiveUser:(MPUserEntity *)activeUser {
 
-    NSError *error;
+    self.activeUserOID = activeUser.permanentObjectID;
-    if (activeUser.objectID.isTemporaryID && ![activeUser.managedObjectContext obtainPermanentIDsForObjects:@[ activeUser ] error:&error])
-        err( @"Failed to obtain a permanent object ID after setting active user: %@", [error fullDescription] );
-
-    self.activeUserOID = activeUser.objectID;
 }
 
 - (void)handleCoordinatorError:(NSError *)error {
+
 }
 
 @end

platform-darwin/Source/MPAppDelegate_Store.m

@@ -237,7 +237,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         NSURL *localStoreURL = [self localStoreURL];
         if (![[NSFileManager defaultManager] createDirectoryAtURL:[localStoreURL URLByDeletingLastPathComponent]
                                       withIntermediateDirectories:YES attributes:nil error:&error]) {
-            err( @"Couldn't create our application support directory: %@", [error fullDescription] );
+            MPError( error, @"Couldn't create our application support directory." );
             return;
         }
         if (![self.storeCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:[self localStoreURL]
@@ -246,7 +246,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                                                                NSInferMappingModelAutomaticallyOption      : @YES,
                                                                STORE_OPTIONS
                                                        } error:&error]) {
-            err( @"Failed to open store: %@", [error fullDescription] );
+            MPError( error, @"Failed to open store." );
             self.storeCorrupted = @YES;
             [self handleCoordinatorError:error];
             return;
@@ -255,12 +255,15 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
 
 #if TARGET_OS_IPHONE
         PearlAddNotificationObserver( UIApplicationWillResignActiveNotification, UIApp, [NSOperationQueue mainQueue],
+                ^(MPAppDelegate_Shared *self, NSNotification *note) {
+                    [self.mainManagedObjectContext saveToStore];
+                } );
 #else
         PearlAddNotificationObserver( NSApplicationWillResignActiveNotification, NSApp, [NSOperationQueue mainQueue],
-#endif
                 ^(MPAppDelegate_Shared *self, NSNotification *note) {
-        [self.mainManagedObjectContext saveToStore];
+                    [self.mainManagedObjectContext saveToStore];
-        } );
+                } );
+#endif
 
         // Perform a data sanity check on the newly loaded store to find and fix any issues.
         if ([[MPConfig get].checkInconsistency boolValue])
@@ -286,10 +289,10 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         NSError *error = nil;
         for (NSPersistentStore *store in self.storeCoordinator.persistentStores) {
             if (![self.storeCoordinator removePersistentStore:store error:&error])
-                err( @"Couldn't remove persistence store from coordinator: %@", [error fullDescription] );
+                MPError( error, @"Couldn't remove persistence store from coordinator." );
         }
         if (![[NSFileManager defaultManager] removeItemAtURL:self.localStoreURL error:&error])
-            err( @"Couldn't remove persistence store at URL %@: %@", self.localStoreURL, [error fullDescription] );
+            MPError( error, @"Couldn't remove persistence store at URL %@.", self.localStoreURL );
 
         [self loadStore];
     }
@@ -307,7 +310,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
             fetchRequest.entity = entity;
             NSArray *objects = [context executeFetchRequest:fetchRequest error:&error];
             if (!objects) {
-                err( @"Failed to fetch %@ objects: %@", entity, [error fullDescription] );
+                MPError( error, @"Failed to fetch %@ objects.", entity );
                 continue;
             }
 
@@ -332,7 +335,8 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
 
 - (void)migrateStore {
 
-    MPStoreMigrationLevel migrationLevel = (signed)[[NSUserDefaults standardUserDefaults] integerForKey:MPMigrationLevelLocalStoreKey];
+    MPStoreMigrationLevel migrationLevel = (MPStoreMigrationLevel)
+            [[NSUserDefaults standardUserDefaults] integerForKey:MPMigrationLevelLocalStoreKey];
     if (migrationLevel >= MPStoreMigrationLevelCurrent)
         // Local store up-to-date.
         return;
@@ -374,8 +378,8 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
     NSError *error = nil;
     if (![NSPersistentStore migrateStore:oldLocalStoreURL withOptions:@{ STORE_OPTIONS }
                                  toStore:newLocalStoreURL withOptions:@{ STORE_OPTIONS }
-                                   model:nil error:&error]) {
+                                   error:&error]) {
-        err( @"Couldn't migrate the old store to the new location: %@", [error fullDescription] );
+        MPError( error, @"Couldn't migrate the old store to the new location." );
         return NO;
     }
 
@@ -421,14 +425,52 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
             NSMigratePersistentStoresAutomaticallyOption: @YES,
             NSInferMappingModelAutomaticallyOption      : @YES,
             STORE_OPTIONS
-    }                              model:nil error:&error]) {
+    }                              error:&error]) {
-        err( @"Couldn't migrate the old store to the new location: %@", [error fullDescription] );
+        MPError( error, @"Couldn't migrate the old store to the new location." );
         return NO;
     }
 
     return YES;
 }
 
+//- (BOOL)migrateV3LocalStore {
+//
+//    inf( @"Migrating V3 local store" );
+//    NSURL *localStoreURL = [self localStoreURL];
+//    if (![[NSFileManager defaultManager] fileExistsAtPath:localStoreURL.path isDirectory:NULL]) {
+//        inf( @"No V3 local store to migrate." );
+//        return YES;
+//    }
+//
+//    NSError *error = nil;
+//    NSDictionary<NSString *, id> *metadata = [NSPersistentStore metadataForPersistentStoreWithURL:localStoreURL error:&error];
+//    if (!metadata) {
+//        MPError( error, @"Couldn't inspect metadata for store: %@", localStoreURL );
+//        return NO;
+//    }
+//    NSPersistentStoreCoordinator *coordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:
+//            [NSManagedObjectModel mergedModelFromBundles:nil forStoreMetadata:metadata]];
+//    if (![coordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil
+//                                             URL:localStoreURL options:@{ STORE_OPTIONS }
+//                                           error:&error]) {
+//        MPError( error, @"Couldn't open V3 local store to migrate." );
+//        return NO;
+//    }
+//
+//    NSManagedObjectContext *context = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+//    [context performBlockAndWait:^{
+//        context.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy;
+//        context.persistentStoreCoordinator = coordinator;
+//        for (MPStoredSiteEntity *storedSite in [[MPStoredSiteEntity fetchRequest] execute:&error]) {
+//            id contentObject = [storedSite valueForKey:@"contentObject"];
+//            if ([contentObject isKindOfClass:[NSData class]])
+//                storedSite.contentObject = contentObject;
+//        }
+//    }];
+//
+//    return YES;
+//}
+
 #pragma mark - Utilities
 
 - (void)addSiteNamed:(NSString *)siteName completion:(void ( ^ )(MPSiteEntity *site, NSManagedObjectContext *context))completion {
@@ -457,10 +499,6 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         site.lastUsed = [NSDate date];
         site.algorithm = algorithm;
 
-        NSError *error = nil;
-        if (site.objectID.isTemporaryID && ![context obtainPermanentIDsForObjects:@[ site ] error:&error])
-            err( @"Failed to obtain a permanent object ID after creating new site: %@", [error fullDescription] );
-
         [context saveToStore];
 
         completion( site, context );
@@ -489,18 +527,14 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
         newSite.algorithm = site.algorithm;
         newSite.loginName = site.loginName;
 
-        NSError *error = nil;
-        if (![context obtainPermanentIDsForObjects:@[ newSite ] error:&error])
-            err( @"Failed to obtain a permanent object ID after changing object type: %@", [error fullDescription] );
-
         [context deleteObject:site];
         [context saveToStore];
 
-        [[NSNotificationCenter defaultCenter] postNotificationName:MPSiteUpdatedNotification object:site.objectID];
+        [[NSNotificationCenter defaultCenter] postNotificationName:MPSiteUpdatedNotification object:site.permanentObjectID];
         site = newSite;
     }
 
-    [[NSNotificationCenter defaultCenter] postNotificationName:MPSiteUpdatedNotification object:site.objectID];
+    [[NSNotificationCenter defaultCenter] postNotificationName:MPSiteUpdatedNotification object:site.permanentObjectID];
     return site;
 }
 
@@ -537,7 +571,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                 initWithPattern:@"^#[[:space:]]*([^:]+): (.*)"
                         options:(NSRegularExpressionOptions)0 error:&error];
         if (error) {
-            err( @"Error loading the header pattern: %@", [error fullDescription] );
+            MPError( error, @"Error loading the header pattern." );
             return MPImportResultInternalError;
         }
     }
@@ -551,7 +585,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                                 options:(NSRegularExpressionOptions)0 error:&error]
         ];
         if (error) {
-            err( @"Error loading the site patterns: %@", [error fullDescription] );
+            MPError( error, @"Error loading the site patterns." );
             return MPImportResultInternalError;
         }
     }
@@ -610,7 +644,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
                 userFetchRequest.predicate = [NSPredicate predicateWithFormat:@"name == %@", importUserName];
                 NSArray *users = [context executeFetchRequest:userFetchRequest error:&error];
                 if (!users) {
-                    err( @"While looking for user: %@, error: %@", importUserName, [error fullDescription] );
+                    MPError( error, @"While looking for user: %@.", importUserName );
                     return MPImportResultInternalError;
                 }
                 if ([users count] > 1) {
@@ -694,7 +728,7 @@ PearlAssociatedObjectProperty( NSNumber*, StoreCorrupted, storeCorrupted );
             siteFetchRequest.predicate = [NSPredicate predicateWithFormat:@"name == %@ AND user == %@", siteName, user];
             NSArray *existingSites = [context executeFetchRequest:siteFetchRequest error:&error];
             if (!existingSites) {
-                err( @"Lookup of existing sites failed for site: %@, user: %@, error: %@", siteName, user.userID, [error fullDescription] );
+                MPError( error, @"Lookup of existing sites failed for site: %@, user: %@.", siteName, user.userID );
                 return MPImportResultInternalError;
             }
             if ([existingSites count]) {

platform-darwin/Source/MPConfig.m

@@ -20,7 +20,7 @@
     [self.defaults registerDefaults:@{
             NSStringFromSelector( @selector( askForReviews ) )     : @YES,
 
-            NSStringFromSelector( @selector( sendInfo ) )          : @NO,
+            NSStringFromSelector( @selector( sendInfo ) )          : @YES,
             NSStringFromSelector( @selector( rememberLogin ) )     : @NO,
             NSStringFromSelector( @selector( hidePasswords ) )     : @NO,
             NSStringFromSelector( @selector( checkInconsistency ) ): @NO,

platform-darwin/Source/MPEntities.h

@@ -7,10 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "MPSiteEntity.h"
+#import "MPSiteEntity+CoreDataClass.h"
-#import "MPStoredSiteEntity.h"
+#import "MPStoredSiteEntity+CoreDataClass.h"
-#import "MPGeneratedSiteEntity.h"
+#import "MPGeneratedSiteEntity+CoreDataClass.h"
-#import "MPUserEntity.h"
+#import "MPUserEntity+CoreDataClass.h"
 #import "MPAlgorithm.h"
 #import "MPFixable.h"
 
@@ -22,6 +22,12 @@
 
 @end
 
+@interface NSManagedObject(MP)
+
+- (NSManagedObjectID *)permanentObjectID;
+
+@end
+
 @interface MPSiteQuestionEntity(MP)
 
 - (NSString *)resolveQuestionAnswerUsingKey:(MPKey *)key;

platform-darwin/Source/MPEntities.m

@@ -21,11 +21,11 @@
             @try {
                 NSError *error = nil;
                 if (!(success = [self save:&error]))
-                    err( @"While saving: %@", [error fullDescription] );
+                    MPError( error, @"While saving." );
             }
             @catch (NSException *exception) {
                 success = NO;
-                err( @"While saving: %@", [exception fullDescription] );
+                err( @"While saving.\n%@", [exception fullDescription] );
             }
         }];
 
@@ -34,6 +34,23 @@
 
 @end
 
+@implementation NSManagedObject(MP)
+
+- (NSManagedObjectID *)permanentObjectID {
+
+    NSManagedObjectID *objectID = self.objectID;
+    if ([objectID isTemporaryID]) {
+        NSError *error = nil;
+        if (![self.managedObjectContext obtainPermanentIDsForObjects:@[ self ] error:&error])
+            MPError( error, @"Failed to obtain permanent object ID." );
+        objectID = self.objectID;
+    }
+
+    return objectID.isTemporaryID? nil: objectID;
+}
+
+@end
+
 @implementation MPSiteQuestionEntity(MP)
 
 - (NSString *)resolveQuestionAnswerUsingKey:(MPKey *)key {

platform-darwin/Source/MPGeneratedSiteEntity+CoreDataClass.h

@@ -0,0 +1,20 @@
+//
+//  MPGeneratedSiteEntity+CoreDataClass.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "MPSiteEntity+CoreDataClass.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPGeneratedSiteEntity : MPSiteEntity
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "MPGeneratedSiteEntity+CoreDataProperties.h"

platform-darwin/Source/MPGeneratedSiteEntity+CoreDataClass.m

@@ -0,0 +1,13 @@
+//
+//  MPGeneratedSiteEntity+CoreDataClass.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPGeneratedSiteEntity+CoreDataClass.h"
+
+@implementation MPGeneratedSiteEntity
+
+@end

platform-darwin/Source/MPGeneratedSiteEntity+CoreDataProperties.h

@@ -0,0 +1,22 @@
+//
+//  MPGeneratedSiteEntity+CoreDataProperties.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPGeneratedSiteEntity+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPGeneratedSiteEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPGeneratedSiteEntity *> *)fetchRequest;
+
+@property (nullable, nonatomic, copy) NSNumber *counter_;
+
+@end
+
+NS_ASSUME_NONNULL_END

platform-darwin/Source/MPGeneratedSiteEntity+CoreDataProperties.m

@@ -0,0 +1,19 @@
+//
+//  MPGeneratedSiteEntity+CoreDataProperties.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPGeneratedSiteEntity+CoreDataProperties.h"
+
+@implementation MPGeneratedSiteEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPGeneratedSiteEntity *> *)fetchRequest {
+	return [[NSFetchRequest alloc] initWithEntityName:@"MPGeneratedSiteEntity"];
+}
+
+@dynamic counter_;
+
+@end

platform-darwin/Source/MPGeneratedSiteEntity.h

@@ -1,17 +0,0 @@
-//
-//  MPGeneratedSiteEntity.h
-//  MasterPassword-Mac
-//
-//  Created by Maarten Billemont on 2014-09-21.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-#import "MPSiteEntity.h"
-
-@interface MPGeneratedSiteEntity : MPSiteEntity
-
-@property(nonatomic, retain) NSNumber *counter_;
-
-@end

platform-darwin/Source/MPGeneratedSiteEntity.m

@@ -1,15 +0,0 @@
-//
-//  MPGeneratedSiteEntity.m
-//  MasterPassword-Mac
-//
-//  Created by Maarten Billemont on 2014-09-21.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import "MPGeneratedSiteEntity.h"
-
-@implementation MPGeneratedSiteEntity
-
-@dynamic counter_;
-
-@end

platform-darwin/Source/MPSiteEntity+CoreDataClass.h

@@ -0,0 +1,22 @@
+//
+//  MPSiteEntity+CoreDataClass.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+@class MPSiteQuestionEntity, MPUserEntity, NSObject;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPSiteEntity : NSManagedObject
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "MPSiteEntity+CoreDataProperties.h"

platform-darwin/Source/MPSiteEntity+CoreDataClass.m

@@ -0,0 +1,16 @@
+//
+//  MPSiteEntity+CoreDataClass.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPSiteEntity+CoreDataClass.h"
+#import "MPSiteQuestionEntity+CoreDataClass.h"
+
+#import "MPUserEntity+CoreDataClass.h"
+
+@implementation MPSiteEntity
+
+@end

platform-darwin/Source/MPSiteEntity+CoreDataProperties.h

@@ -0,0 +1,48 @@
+//
+//  MPSiteEntity+CoreDataProperties.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPSiteEntity+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPSiteEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPSiteEntity *> *)fetchRequest;
+
+@property (nullable, nonatomic, retain) NSObject *content;
+@property (nullable, nonatomic, copy) NSDate *lastUsed;
+@property (nullable, nonatomic, copy) NSNumber *loginGenerated_;
+@property (nullable, nonatomic, copy) NSString *loginName;
+@property (nullable, nonatomic, copy) NSString *name;
+@property (nullable, nonatomic, copy) NSNumber *requiresExplicitMigration_;
+@property (nullable, nonatomic, copy) NSNumber *type_;
+@property (nullable, nonatomic, copy) NSNumber *uses_;
+@property (nullable, nonatomic, copy) NSNumber *version_;
+@property (nullable, nonatomic, copy) NSString *url;
+@property (nullable, nonatomic, retain) NSOrderedSet<MPSiteQuestionEntity *> *questions;
+@property (nullable, nonatomic, retain) MPUserEntity *user;
+
+@end
+
+@interface MPSiteEntity (CoreDataGeneratedAccessors)
+
+- (void)insertObject:(MPSiteQuestionEntity *)value inQuestionsAtIndex:(NSUInteger)idx;
+- (void)removeObjectFromQuestionsAtIndex:(NSUInteger)idx;
+- (void)insertQuestions:(NSArray<MPSiteQuestionEntity *> *)value atIndexes:(NSIndexSet *)indexes;
+- (void)removeQuestionsAtIndexes:(NSIndexSet *)indexes;
+- (void)replaceObjectInQuestionsAtIndex:(NSUInteger)idx withObject:(MPSiteQuestionEntity *)value;
+- (void)replaceQuestionsAtIndexes:(NSIndexSet *)indexes withQuestions:(NSArray<MPSiteQuestionEntity *> *)values;
+- (void)addQuestionsObject:(MPSiteQuestionEntity *)value;
+- (void)removeQuestionsObject:(MPSiteQuestionEntity *)value;
+- (void)addQuestions:(NSOrderedSet<MPSiteQuestionEntity *> *)values;
+- (void)removeQuestions:(NSOrderedSet<MPSiteQuestionEntity *> *)values;
+
+@end
+
+NS_ASSUME_NONNULL_END

platform-darwin/Source/MPSiteEntity+CoreDataProperties.m

@@ -0,0 +1,30 @@
+//
+//  MPSiteEntity+CoreDataProperties.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPSiteEntity+CoreDataProperties.h"
+
+@implementation MPSiteEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPSiteEntity *> *)fetchRequest {
+	return [[NSFetchRequest alloc] initWithEntityName:@"MPSiteEntity"];
+}
+
+@dynamic content;
+@dynamic lastUsed;
+@dynamic loginGenerated_;
+@dynamic loginName;
+@dynamic name;
+@dynamic requiresExplicitMigration_;
+@dynamic type_;
+@dynamic uses_;
+@dynamic version_;
+@dynamic url;
+@dynamic questions;
+@dynamic user;
+
+@end

platform-darwin/Source/MPSiteEntity.h

@@ -1,41 +0,0 @@
-//
-//  MPSiteEntity.h
-//  MasterPassword-Mac
-//
-//  Created by Maarten Billemont on 2014-09-21.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-@class MPSiteQuestionEntity, MPUserEntity;
-
-@interface MPSiteEntity : NSManagedObject
-
-//@property (nonatomic, retain) id content; // Hide here, reveal in MPStoredSiteEntity
-@property(nonatomic, retain) NSDate *lastUsed;
-@property(nonatomic, retain) NSNumber *loginGenerated_;
-@property(nonatomic, retain) NSString *loginName;
-@property(nonatomic, retain) NSString *name;
-@property(nonatomic, retain) NSNumber *requiresExplicitMigration_;
-@property(nonatomic, retain) NSNumber *type_;
-@property(nonatomic, retain) NSNumber *uses_;
-@property(nonatomic, retain) NSNumber *version_;
-@property(nonatomic, retain) NSOrderedSet *questions;
-@property(nonatomic, retain) MPUserEntity *user;
-@end
-
-@interface MPSiteEntity(CoreDataGeneratedAccessors)
-
-- (void)insertObject:(MPSiteQuestionEntity *)value inQuestionsAtIndex:(NSUInteger)idx;
-- (void)removeObjectFromQuestionsAtIndex:(NSUInteger)idx;
-- (void)insertQuestions:(NSArray *)value atIndexes:(NSIndexSet *)indexes;
-- (void)removeQuestionsAtIndexes:(NSIndexSet *)indexes;
-- (void)replaceObjectInQuestionsAtIndex:(NSUInteger)idx withObject:(MPSiteQuestionEntity *)value;
-- (void)replaceQuestionsAtIndexes:(NSIndexSet *)indexes withQuestions:(NSArray *)values;
-- (void)addQuestionsObject:(MPSiteQuestionEntity *)value;
-- (void)removeQuestionsObject:(MPSiteQuestionEntity *)value;
-- (void)addQuestions:(NSOrderedSet *)values;
-- (void)removeQuestions:(NSOrderedSet *)values;
-@end

platform-darwin/Source/MPSiteEntity.m

@@ -1,27 +0,0 @@
-//
-//  MPSiteEntity.m
-//  MasterPassword-Mac
-//
-//  Created by Maarten Billemont on 2014-09-21.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import "MPSiteEntity.h"
-#import "MPSiteQuestionEntity.h"
-#import "MPUserEntity.h"
-
-@implementation MPSiteEntity
-
-//@dynamic content;
-@dynamic lastUsed;
-@dynamic loginGenerated_;
-@dynamic loginName;
-@dynamic name;
-@dynamic requiresExplicitMigration_;
-@dynamic type_;
-@dynamic uses_;
-@dynamic version_;
-@dynamic questions;
-@dynamic user;
-
-@end

platform-darwin/Source/MPSiteQuestionEntity+CoreDataClass.h

@@ -0,0 +1,22 @@
+//
+//  MPSiteQuestionEntity+CoreDataClass.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+@class MPSiteEntity;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPSiteQuestionEntity : NSManagedObject
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "MPSiteQuestionEntity+CoreDataProperties.h"

platform-darwin/Source/MPSiteQuestionEntity+CoreDataClass.m

@@ -0,0 +1,14 @@
+//
+//  MPSiteQuestionEntity+CoreDataClass.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPSiteQuestionEntity+CoreDataClass.h"
+#import "MPSiteEntity+CoreDataClass.h"
+
+@implementation MPSiteQuestionEntity
+
+@end

platform-darwin/Source/MPSiteQuestionEntity+CoreDataProperties.h

@@ -0,0 +1,23 @@
+//
+//  MPSiteQuestionEntity+CoreDataProperties.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPSiteQuestionEntity+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPSiteQuestionEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPSiteQuestionEntity *> *)fetchRequest;
+
+@property (nullable, nonatomic, copy) NSString *keyword;
+@property (nullable, nonatomic, retain) MPSiteEntity *site;
+
+@end
+
+NS_ASSUME_NONNULL_END

platform-darwin/Source/MPSiteQuestionEntity+CoreDataProperties.m

@@ -0,0 +1,20 @@
+//
+//  MPSiteQuestionEntity+CoreDataProperties.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPSiteQuestionEntity+CoreDataProperties.h"
+
+@implementation MPSiteQuestionEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPSiteQuestionEntity *> *)fetchRequest {
+	return [[NSFetchRequest alloc] initWithEntityName:@"MPSiteQuestionEntity"];
+}
+
+@dynamic keyword;
+@dynamic site;
+
+@end

platform-darwin/Source/MPSiteQuestionEntity.h

@@ -1,19 +0,0 @@
-//
-//  MPSiteQuestionEntity.h
-//  MasterPassword-iOS
-//
-//  Created by Maarten Billemont on 2014-09-27.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-@class MPSiteEntity;
-
-@interface MPSiteQuestionEntity : NSManagedObject
-
-@property(nonatomic, retain) NSString *keyword;
-@property(nonatomic, retain) MPSiteEntity *site;
-
-@end

platform-darwin/Source/MPSiteQuestionEntity.m

@@ -1,17 +0,0 @@
-//
-//  MPSiteQuestionEntity.m
-//  MasterPassword-iOS
-//
-//  Created by Maarten Billemont on 2014-09-27.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import "MPSiteQuestionEntity.h"
-#import "MPSiteEntity.h"
-
-@implementation MPSiteQuestionEntity
-
-@dynamic keyword;
-@dynamic site;
-
-@end

platform-darwin/Source/MPStoredSiteEntity+CoreDataClass.h

@@ -0,0 +1,22 @@
+//
+//  MPStoredSiteEntity+CoreDataClass.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "MPSiteEntity+CoreDataClass.h"
+
+@class NSObject;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPStoredSiteEntity : MPSiteEntity
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "MPStoredSiteEntity+CoreDataProperties.h"

platform-darwin/Source/MPStoredSiteEntity+CoreDataClass.m

@@ -0,0 +1,13 @@
+//
+//  MPStoredSiteEntity+CoreDataClass.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPStoredSiteEntity+CoreDataClass.h"
+
+@implementation MPStoredSiteEntity
+
+@end

platform-darwin/Source/MPStoredSiteEntity+CoreDataProperties.h

@@ -0,0 +1,22 @@
+//
+//  MPStoredSiteEntity+CoreDataProperties.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-05-01.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPStoredSiteEntity+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPStoredSiteEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPStoredSiteEntity *> *)fetchRequest;
+
+@property (nullable, nonatomic, retain) NSData *contentObject;
+
+@end
+
+NS_ASSUME_NONNULL_END

platform-darwin/Source/MPStoredSiteEntity+CoreDataProperties.m

@@ -0,0 +1,19 @@
+//
+//  MPStoredSiteEntity+CoreDataProperties.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-05-01.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPStoredSiteEntity+CoreDataProperties.h"
+
+@implementation MPStoredSiteEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPStoredSiteEntity *> *)fetchRequest {
+	return [[NSFetchRequest alloc] initWithEntityName:@"MPStoredSiteEntity"];
+}
+
+@dynamic contentObject;
+
+@end

platform-darwin/Source/MPStoredSiteEntity.h

@@ -1,17 +0,0 @@
-//
-//  MPStoredSiteEntity.h
-//  MasterPassword-Mac
-//
-//  Created by Maarten Billemont on 2014-09-21.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-#import "MPSiteEntity.h"
-
-@interface MPStoredSiteEntity : MPSiteEntity
-
-@property(nonatomic, retain) NSData *contentObject;
-
-@end

platform-darwin/Source/MPStoredSiteEntity.m

@@ -1,15 +0,0 @@
-//
-//  MPStoredSiteEntity.m
-//  MasterPassword-Mac
-//
-//  Created by Maarten Billemont on 2014-09-21.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import "MPStoredSiteEntity.h"
-
-@implementation MPStoredSiteEntity
-
-@dynamic contentObject;
-
-@end

platform-darwin/Source/MPTypes.h

@@ -6,8 +6,12 @@
 //  Copyright (c) 2012 Lyndir. All rights reserved.
 //
 
+#import <Crashlytics/Crashlytics.h>
+#import <Crashlytics/Answers.h>
+
 __BEGIN_DECLS
 extern NSString *const MPErrorDomain;
+extern NSInteger const MPErrorHangCode;
 
 extern NSString *const MPSignedInNotification;
 extern NSString *const MPSignedOutNotification;
@@ -19,4 +23,21 @@ extern NSString *const MPFoundInconsistenciesNotification;
 
 extern NSString *const MPSitesImportedNotificationUserKey;
 extern NSString *const MPInconsistenciesFixResultUserKey;
+
 __END_DECLS
+
+#ifdef CRASHLYTICS
+#define MPError(error_, message, ...) ({ \
+    err( message @"%@%@", ##__VA_ARGS__, error_? @"\n": @"", [error_ fullDescription]?: @"" ); \
+    \
+    if ([[MPConfig get].sendInfo boolValue]) { \
+        [[Crashlytics sharedInstance] recordError:error_ withAdditionalUserInfo:@{ \
+                @"location": strf( @"%@:%d %@", @(basename((char *)__FILE__)), __LINE__, NSStringFromSelector(_cmd) ), \
+        }]; \
+    } \
+})
+#else
+#define MPError(error_, ...) ({ \
+    err( message @"%@%@", ##__VA_ARGS__, error_? @"\n": @"", [error_ fullDescription]?: @"" ); \
+})
+#endif

platform-darwin/Source/MPTypes.m

@@ -9,6 +9,7 @@
 #import "MPTypes.h"
 
 NSString *const MPErrorDomain = @"MPErrorDomain";
+NSInteger const MPErrorHangCode = 1;
 
 NSString *const MPSignedInNotification = @"MPSignedInNotification";
 NSString *const MPSignedOutNotification = @"MPSignedOutNotification";

platform-darwin/Source/MPUserEntity+CoreDataClass.h

@@ -0,0 +1,22 @@
+//
+//  MPUserEntity+CoreDataClass.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+@class MPSiteEntity;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPUserEntity : NSManagedObject
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "MPUserEntity+CoreDataProperties.h"

platform-darwin/Source/MPUserEntity+CoreDataClass.m

@@ -0,0 +1,14 @@
+//
+//  MPUserEntity+CoreDataClass.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPUserEntity+CoreDataClass.h"
+#import "MPSiteEntity+CoreDataClass.h"
+
+@implementation MPUserEntity
+
+@end

platform-darwin/Source/MPUserEntity+CoreDataProperties.h

@@ -0,0 +1,39 @@
+//
+//  MPUserEntity+CoreDataProperties.h
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPUserEntity+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MPUserEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPUserEntity *> *)fetchRequest;
+
+@property (nullable, nonatomic, copy) NSNumber *avatar_;
+@property (nullable, nonatomic, copy) NSNumber *defaultType_;
+@property (nullable, nonatomic, retain) NSData *keyID;
+@property (nullable, nonatomic, copy) NSDate *lastUsed;
+@property (nullable, nonatomic, copy) NSString *name;
+@property (nullable, nonatomic, copy) NSNumber *saveKey_;
+@property (nullable, nonatomic, copy) NSNumber *touchID_;
+@property (nullable, nonatomic, copy) NSNumber *version_;
+@property (nullable, nonatomic, retain) NSSet<MPSiteEntity *> *sites;
+
+@end
+
+@interface MPUserEntity (CoreDataGeneratedAccessors)
+
+- (void)addSitesObject:(MPSiteEntity *)value;
+- (void)removeSitesObject:(MPSiteEntity *)value;
+- (void)addSites:(NSSet<MPSiteEntity *> *)values;
+- (void)removeSites:(NSSet<MPSiteEntity *> *)values;
+
+@end
+
+NS_ASSUME_NONNULL_END

platform-darwin/Source/MPUserEntity+CoreDataProperties.m

@@ -0,0 +1,27 @@
+//
+//  MPUserEntity+CoreDataProperties.m
+//  MasterPassword-iOS
+//
+//  Created by Maarten Billemont on 2017-04-30.
+//  Copyright © 2017 Lyndir. All rights reserved.
+//
+
+#import "MPUserEntity+CoreDataProperties.h"
+
+@implementation MPUserEntity (CoreDataProperties)
+
++ (NSFetchRequest<MPUserEntity *> *)fetchRequest {
+	return [[NSFetchRequest alloc] initWithEntityName:@"MPUserEntity"];
+}
+
+@dynamic avatar_;
+@dynamic defaultType_;
+@dynamic keyID;
+@dynamic lastUsed;
+@dynamic name;
+@dynamic saveKey_;
+@dynamic touchID_;
+@dynamic version_;
+@dynamic sites;
+
+@end

platform-darwin/Source/MPUserEntity.h

@@ -1,34 +0,0 @@
-//
-//  MPUserEntity.h
-//  MasterPassword-Mac
-//
-//  Created by Maarten Billemont on 2014-09-21.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-@class MPSiteEntity;
-
-@interface MPUserEntity : NSManagedObject
-
-@property(nonatomic, retain) NSNumber *avatar_;
-@property(nonatomic, retain) NSNumber *defaultType_;
-@property(nonatomic, retain) NSData *keyID;
-@property(nonatomic, retain) NSDate *lastUsed;
-@property(nonatomic, retain) NSString *name;
-@property(nonatomic, retain) NSNumber *saveKey_;
-@property(nonatomic, retain) NSNumber *touchID_;
-@property(nonatomic, retain) NSNumber *version_;
-@property(nonatomic, retain) NSSet *sites;
-@end
-
-@interface MPUserEntity(CoreDataGeneratedAccessors)
-
-- (void)addSitesObject:(MPSiteEntity *)value;
-- (void)removeSitesObject:(MPSiteEntity *)value;
-- (void)addSites:(NSSet *)values;
-- (void)removeSites:(NSSet *)values;
-
-@end

platform-darwin/Source/MPUserEntity.m

@@ -1,24 +0,0 @@
-//
-//  MPUserEntity.m
-//  MasterPassword-Mac
-//
-//  Created by Maarten Billemont on 2014-09-21.
-//  Copyright (c) 2014 Lyndir. All rights reserved.
-//
-
-#import "MPUserEntity.h"
-#import "MPSiteEntity.h"
-
-@implementation MPUserEntity
-
-@dynamic avatar_;
-@dynamic defaultType_;
-@dynamic keyID;
-@dynamic lastUsed;
-@dynamic name;
-@dynamic saveKey_;
-@dynamic touchID_;
-@dynamic version_;
-@dynamic sites;
-
-@end

platform-darwin/Source/Mac/MPMacAppDelegate.m

@@ -78,7 +78,6 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
         [[Crashlytics sharedInstance] setUserIdentifier:[PearlKeyChain deviceIdentifier]];
         [[Crashlytics sharedInstance] setObjectValue:[PearlKeyChain deviceIdentifier] forKey:@"deviceIdentifier"];
         [[Crashlytics sharedInstance] setUserName:@"Anonymous"];
-        [[Crashlytics sharedInstance] setObjectValue:@"Anonymous" forKey:@"username"];
         [Crashlytics startWithAPIKey:crashlyticsAPIKey];
         [[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) {
             PearlLogLevel level = PearlLogLevelInfo;
@@ -172,17 +171,17 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
     // Save changes in the application's managed object context before the application terminates.
 
-    NSManagedObjectContext *context = [MPMacAppDelegate managedObjectContextForMainThreadIfReady];
+    NSManagedObjectContext *mainContext = [MPMacAppDelegate managedObjectContextForMainThreadIfReady];
-    if (!context)
+    if (!mainContext)
         return NSTerminateNow;
 
-    if (![context commitEditing])
+    if (![mainContext commitEditing])
         return NSTerminateCancel;
 
-    if (![context hasChanges])
+    if (![mainContext hasChanges])
         return NSTerminateNow;
 
-    [context saveToStore];
+    [mainContext saveToStore];
     return NSTerminateNow;
 }
 
@@ -272,7 +271,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     [[[NSURLSession sharedSession] dataTaskWithURL:url completionHandler:
             ^(NSData *importedSitesData, NSURLResponse *response, NSError *error) {
                 if (error)
-                    err( @"While reading imported sites from %@: %@", url, [error fullDescription] );
+                    MPError( error, @"While reading imported sites from %@.", url );
                 if (!importedSitesData)
                     return;
 
@@ -389,20 +388,16 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
         return;
 
     NSString *name = [(NSSecureTextField *)alert.accessoryView stringValue];
-    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
+    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
         MPUserEntity *newUser = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass( [MPUserEntity class] )
-                                                              inManagedObjectContext:moc];
+                                                              inManagedObjectContext:context];
         newUser.name = name;
-        [moc saveToStore];
+        [context saveToStore];
-        NSError *error = nil;
+        [self setActiveUser:newUser];
-        if (![moc obtainPermanentIDsForObjects:@[ newUser ] error:&error])
-            err( @"Failed to obtain permanent object ID for new user: %@", [error fullDescription] );
 
-        [[NSOperationQueue mainQueue] addOperationWithBlock:^{
+        PearlMainQueue( ^{
-            [self updateUsers];
-            [self setActiveUser:newUser];
             [self showPasswordWindow:nil];
-        }];
+        } );
     }];
 }
 
@@ -416,10 +411,10 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     if ([alert runModal] != NSAlertFirstButtonReturn)
         return;
 
-    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
+    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-        [moc deleteObject:[self activeUserInContext:moc]];
+        [context deleteObject:[self activeUserInContext:context]];
         [self setActiveUser:nil];
-        [moc saveToStore];
+        [context saveToStore];
 
         [[NSOperationQueue mainQueue] addOperationWithBlock:^{
             [self updateUsers];
@@ -516,20 +511,23 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
 
     NSError *coordinateError = nil;
     NSString *exportedSites = [self exportSitesRevealPasswords:revealPasswords];
-    [[[NSFileCoordinator alloc] initWithFilePresenter:nil] coordinateWritingItemAtURL:savePanel.URL options:0 error:&coordinateError
+    [[[NSFileCoordinator alloc] initWithFilePresenter:nil] coordinateWritingItemAtURL:savePanel.URL options:0
-                                                                           byAccessor:^(NSURL *newURL) {
+                                                                                error:&coordinateError byAccessor:
-                                                                               NSError *writeError = nil;
+                    ^(NSURL *newURL) {
-                                                                               if (![exportedSites writeToURL:newURL atomically:NO
+                        NSError *writeError = nil;
-                                                                                                     encoding:NSUTF8StringEncoding
+                        if (![exportedSites writeToURL:newURL atomically:NO encoding:NSUTF8StringEncoding error:&writeError])
-                                                                                                        error:&writeError])
+                            MPError( writeError, @"Could not write to the export file." );
-                                                                                   PearlMainQueue( ^{
+
-                                                                                       [[NSAlert alertWithError:writeError] runModal];
+                        PearlMainQueue( ^{
-                                                                                   } );
+                            [[NSAlert alertWithError:writeError] runModal];
-                                                                           }];
+                        } );
-    if (coordinateError)
+                    }];
+    if (coordinateError) {
+        MPError( coordinateError, @"Write access to the export file could not be obtained." );
         PearlMainQueue( ^{
             [[NSAlert alertWithError:coordinateError] runModal];
         } );
+    }
 }
 
 - (void)updateUsers {
@@ -567,7 +565,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     fetchRequest.sortDescriptors = @[ [NSSortDescriptor sortDescriptorWithKey:@"lastUsed" ascending:NO] ];
     NSArray *users = [mainContext executeFetchRequest:fetchRequest error:&error];
     if (!users)
-        err( @"Failed to load users: %@", [error fullDescription] );
+        MPError( error, @"Failed to load users." );
 
     if (![users count]) {
         NSMenuItem *noUsersItem = [self.usersItem.submenu addItemWithTitle:@"No users" action:NULL keyEquivalent:@""];
@@ -579,7 +577,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
     for (MPUserEntity *user in users) {
         NSMenuItem *userItem = [[NSMenuItem alloc] initWithTitle:user.name action:@selector( selectUser: ) keyEquivalent:@""];
         [userItem setTarget:self];
-        [userItem setRepresentedObject:[user objectID]];
+        [userItem setRepresentedObject:user.permanentObjectID];
         [[self.usersItem submenu] addItem:userItem];
 
         if (!mainActiveUser && [user.name isEqualToString:[MPMacConfig get].usedUserName])

platform-darwin/Source/Mac/MPPasswordWindowController.m

@@ -160,10 +160,10 @@
 - (IBAction)doUnlockUser:(id)sender {
 
     [self.progressView startAnimation:self];
-    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
+    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-        MPUserEntity *activeUser = [[MPMacAppDelegate get] activeUserInContext:moc];
+        MPUserEntity *activeUser = [[MPMacAppDelegate get] activeUserInContext:context];
         NSString *userName = activeUser.name;
-        BOOL success = [[MPMacAppDelegate get] signInAsUser:activeUser saveInContext:moc usingMasterPassword:self.masterPassword];
+        BOOL success = [[MPMacAppDelegate get] signInAsUser:activeUser saveInContext:context usingMasterPassword:self.masterPassword];
 
         PearlMainQueue( ^{
             self.masterPassword = nil;
@@ -555,7 +555,7 @@
         NSArray *siteResults = [context executeFetchRequest:fetchRequest error:&error];
         if (!siteResults) {
             prof_finish( @"executeFetchRequest: %@ // %@", fetchRequest.predicate, [error fullDescription] );
-            err( @"While fetching sites for completion: %@", [error fullDescription] );
+            MPError( error, @"While fetching sites for completion." );
             return;
         }
         prof_rewind( @"executeFetchRequest: %@", fetchRequest.predicate );
@@ -633,9 +633,9 @@
         return;
     }
 
-    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
+    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-        [[self.selectedSite entityInContext:moc] use];
+        [[self.selectedSite entityInContext:context] use];
-        [moc saveToStore];
+        [context saveToStore];
     }];
 }
 

platform-darwin/Source/Mac/MPSiteModel.m

@@ -52,9 +52,9 @@
 
 - (void)setEntity:(MPSiteEntity *)entity fuzzyGroups:(NSArray *)fuzzyGroups {
 
-    if ([_entityOID isEqual:entity.objectID])
+    if ([_entityOID isEqual:entity.permanentObjectID])
         return;
-    _entityOID = entity.objectID;
+    _entityOID = entity.permanentObjectID;
 
     NSString *siteName = entity.name;
     NSMutableAttributedString *attributedSiteName = [[NSMutableAttributedString alloc] initWithString:siteName];
@@ -115,7 +115,7 @@
     NSError *error;
     MPSiteEntity *entity = (MPSiteEntity *)[moc existingObjectWithID:_entityOID error:&error];
     if (!entity)
-        err( @"Couldn't retrieve active site: %@", [error fullDescription] );
+        MPError( error, @"Couldn't retrieve active site." );
 
     return entity;
 }

platform-darwin/Source/MasterPassword.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>MasterPassword 8.xcdatamodel</string>
+	<string>MasterPassword 9.xcdatamodel</string>
 </dict>
 </plist>

platform-darwin/Source/MasterPassword.xcdatamodeld/MasterPassword 9.xcdatamodel/contents

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="12141" systemVersion="16E195" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="MPGeneratedSiteEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPSiteEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
+    </entity>
+    <entity name="MPSiteEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="lastUsed" attributeType="Date" usesScalarValueType="NO" indexed="YES" syncable="YES"/>
+        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51" syncable="YES"/>
+        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO">
+            <userInfo/>
+        </attribute>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="url" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" indexed="YES" syncable="YES"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity" syncable="YES"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+        <compoundIndexes>
+            <compoundIndex>
+                <index value="name"/>
+                <index value="user"/>
+            </compoundIndex>
+        </compoundIndexes>
+    </entity>
+    <entity name="MPSiteQuestionEntity" representedClassName="MPSiteQuestionEntity" syncable="YES">
+        <attribute name="keyword" attributeType="String" syncable="YES"/>
+        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity" syncable="YES"/>
+    </entity>
+    <entity name="MPStoredSiteEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPSiteEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" customClassName="NSData" storedInTruthFile="YES" syncable="YES"/>
+    </entity>
+    <entity name="MPUserEntity" representedClassName="MPUserEntity" syncable="YES">
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO">
+            <userInfo/>
+        </attribute>
+        <attribute name="touchID_" attributeType="Boolean" defaultValueString="0" usesScalarValueType="NO">
+            <userInfo/>
+        </attribute>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="MPGeneratedSiteEntity" positionX="216" positionY="-288" width="128" height="58"/>
+        <element name="MPSiteEntity" positionX="-0" positionY="-286" width="128" height="225"/>
+        <element name="MPSiteQuestionEntity" positionX="-2" positionY="-9" width="128" height="73"/>
+        <element name="MPStoredSiteEntity" positionX="214" positionY="-171" width="128" height="60"/>
+        <element name="MPUserEntity" positionX="-218" positionY="-288" width="128" height="178"/>
+    </elements>
+</model>

platform-darwin/Source/iOS/MPAnswersViewController.h

@@ -18,7 +18,7 @@
 
 #import <UIKit/UIKit.h>
 #import "MPTypeViewController.h"
-#import "MPSiteQuestionEntity.h"
+#import "MPSiteQuestionEntity+CoreDataClass.h"
 
 @interface MPAnswersViewController : UIViewController
 

platform-darwin/Source/iOS/MPAnswersViewController.m

@@ -80,7 +80,7 @@
 
 - (void)setSite:(MPSiteEntity *)site {
 
-    _siteOID = [site objectID];
+    _siteOID = site.permanentObjectID;
     _multiple = [site.questions count] > 0;
     [self.tableView reloadData];
     [self updateAnimated:NO];
@@ -301,8 +301,8 @@
 
 - (void)setQuestion:(MPSiteQuestionEntity *)question forSite:(MPSiteEntity *)site inVC:(MPAnswersViewController *)answersVC {
 
-    _siteOID = site.objectID;
+    _siteOID = site.permanentObjectID;
-    _questionOID = question.objectID;
+    _questionOID = question.permanentObjectID;
     _answersVC = answersVC;
 
     [self updateAnswerForQuestion:question ofSite:site];
@@ -333,14 +333,7 @@
         question.keyword = keyword;
 
         if ([context saveToStore]) {
-            if ([question.objectID isTemporaryID]) {
+            _questionOID = question.permanentObjectID;
-                NSError *error = nil;
-                [context obtainPermanentIDsForObjects:@[ question ] error:&error];
-                if (error)
-                    err( @"Failed to obtain permanent object ID: %@", [error fullDescription] );
-            }
-
-            _questionOID = question.objectID;
             [self updateAnswerForQuestion:question ofSite:site];
 
             if (didAddQuestionObject)

platform-darwin/Source/iOS/MPPasswordCell.m

@@ -171,7 +171,7 @@
 
 - (void)setSite:(MPSiteEntity *)site animated:(BOOL)animated {
 
-    _siteOID = [site objectID];
+    _siteOID = site.permanentObjectID;
     [self updateAnimated:animated];
 }
 
@@ -367,6 +367,31 @@
     }];
 }
 
+- (IBAction)doAction:(UIButton *)sender {
+    
+    [MPiOSAppDelegate managedObjectContextForMainThreadPerformBlock:^(NSManagedObjectContext *mainContext) {
+        MPSiteEntity *mainSite = [self siteInContext:mainContext];
+        [PearlAlert showAlertWithTitle:@"Login Page" message:nil
+                             viewStyle:UIAlertViewStylePlainTextInput
+                             initAlert:^(UIAlertView *alert, UITextField *firstField) {
+                                 firstField.placeholder = strf( @"Login URL for %@", mainSite.name );
+                                 firstField.text = mainSite.url;
+                             }
+                     tappedButtonBlock:^(UIAlertView *alert, NSInteger buttonIndex) {
+                         if (buttonIndex == alert.cancelButtonIndex)
+                             return;
+
+                         [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+                             MPSiteEntity *site = [self siteInContext:context];
+                             NSURL *url = [NSURL URLWithString:[alert textFieldAtIndex:0].text];
+                             site.url = [url.host? url: nil absoluteString];
+                             [context saveToStore];
+                         }];
+                     }
+                           cancelTitle:@"Cancel" otherTitles:@"Save", nil];
+    }];
+}
+
 - (IBAction)doIncrementCounter:(UIButton *)sender {
 
     [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
@@ -506,6 +531,7 @@
         MPSiteEntity *mainSite = [self siteInContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]];
 
         // UI
+        self.backgroundColor = mainSite.url? [UIColor greenColor]: [UIColor redColor];
         self.upgradeButton.gone = !mainSite.requiresExplicitMigration && ![[MPiOSConfig get].allowDowngrade boolValue];
         self.answersButton.gone = ![[MPiOSAppDelegate get] isFeatureUnlocked:MPProductGenerateAnswers];
         BOOL settingsMode = self.mode == MPPasswordCellModeSettings;

platform-darwin/Source/iOS/MPPasswordsViewController.m

@@ -161,6 +161,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     UICollectionViewFlowLayout *layout = (UICollectionViewFlowLayout *)collectionViewLayout;
     UIEdgeInsets occludedInsets = [self.passwordCollectionView occludedInsets];
     UIEdgeInsets insets = layout.sectionInset;
+    insets.top = insets.bottom; // Undo storyboard hack for manual top-occluded insets.
 
     if (section == 0)
         insets.top += occludedInsets.top;
@@ -321,6 +322,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
     PearlRemoveNotificationObservers();
     PearlAddNotificationObserver( UIApplicationWillResignActiveNotification, nil, [NSOperationQueue mainQueue],
             ^(MPPasswordsViewController *self, NSNotification *note) {
+                [self.view endEditing:YES];
                 self.passwordSelectionContainer.visible = NO;
             } );
     PearlAddNotificationObserver( UIApplicationDidBecomeActiveNotification, nil, [NSOperationQueue mainQueue],
@@ -399,7 +401,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) {
         self.fetchedResultsController.fetchRequest.predicate =
                 [NSPredicate predicateWithFormat:@"name LIKE[cd] %@ AND user == %@", queryPattern, [MPiOSAppDelegate get].activeUserOID];
         if (![self.fetchedResultsController performFetch:&error])
-            err( @"Couldn't fetch sites: %@", [error fullDescription] );
+            MPError( error, @"Couldn't fetch sites." );
 
         PearlMainQueue( ^{
             [self.passwordCollectionView updateDataSource:_passwordCollectionSections

platform-darwin/Source/iOS/MPPopdownSegue.m

@@ -38,6 +38,7 @@
                                                               metrics:nil views:NSDictionaryOfVariableBindings( popdownView )];
 
         [passwordsVC.popdownToTopConstraint layoutIfNeeded];
+        [passwordsVC.view endEditing:YES];
 
         [UIView animateWithDuration:0.6f delay:0 usingSpringWithDamping:0.75f initialSpringVelocity:1
                             options:UIViewAnimationOptionCurveEaseOut animations:^{

platform-darwin/Source/iOS/MPPreferencesViewController.m

@@ -207,13 +207,13 @@
 - (IBAction)homePageButton:(id)sender {
 
     [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender:
-            [NSURL URLWithString:@"http://masterpasswordapp.com"]];
+            [NSURL URLWithString:@"https://ssl.masterpasswordapp.com"]];
 }
 
 - (IBAction)securityButton:(id)sender {
 
     [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender:
-            [NSURL URLWithString:@"http://masterpasswordapp.com/security.html"]];
+            [NSURL URLWithString:@"https://ssl.masterpasswordapp.com/security.html"]];
 }
 
 - (IBAction)sourceButton:(id)sender {
@@ -225,7 +225,7 @@
 - (IBAction)thanksButton:(id)sender {
 
     [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender:
-            [NSURL URLWithString:@"http://thanks.lhunath.com"]];
+            [NSURL URLWithString:@"https://thanks.lhunath.com"]];
 }
 
 #pragma mark - Private

platform-darwin/Source/iOS/MPStoreViewController.h

@@ -17,20 +17,11 @@
 //==============================================================================
 
 #import <UIKit/UIKit.h>
+#import <StoreKit/StoreKit.h>
 
 @class MPStoreProductCell;
 
-@interface MPStoreViewController : PearlMutableStaticTableViewController
+@interface MPStoreViewController : UITableViewController
-
-@property(weak, nonatomic) IBOutlet MPStoreProductCell *generateLoginCell;
-@property(weak, nonatomic) IBOutlet MPStoreProductCell *generateAnswersCell;
-@property(weak, nonatomic) IBOutlet MPStoreProductCell *iOSIntegrationCell;
-@property(weak, nonatomic) IBOutlet MPStoreProductCell *touchIDCell;
-@property(weak, nonatomic) IBOutlet MPStoreProductCell *fuelCell;
-@property(weak, nonatomic) IBOutlet UITableViewCell *loadingCell;
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint *fuelMeterConstraint;
-@property(weak, nonatomic) IBOutlet UIButton *fuelSpeedButton;
-@property(weak, nonatomic) IBOutlet UILabel *fuelStatusLabel;
 
 + (NSString *)latestStoreFeatures;
 
@@ -39,7 +30,23 @@
 @interface MPStoreProductCell : UITableViewCell
 
 @property(nonatomic) IBOutlet UILabel *priceLabel;
+@property(nonatomic) IBOutlet UILabel *titleLabel;
+@property(nonatomic) IBOutlet UILabel *descriptionLabel;
+@property(nonatomic) IBOutlet UIImageView *thumbnailView;
 @property(nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
 @property(nonatomic) IBOutlet UIView *purchasedIndicator;
 
+@property(nonatomic, readonly) SKProduct *product;
+@property(nonatomic, readonly) NSInteger quantity;
+
+- (void)updateWithProduct:(SKProduct *)product transaction:(SKPaymentTransaction *)transaction;
+
+@end
+
+@interface MPStoreFuelProductCell : MPStoreProductCell
+
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint *fuelMeterConstraint;
+@property(weak, nonatomic) IBOutlet UIButton *fuelSpeedButton;
+@property(weak, nonatomic) IBOutlet UILabel *fuelStatusLabel;
+
 @end

platform-darwin/Source/iOS/MPStoreViewController.m

@@ -27,8 +27,9 @@ PearlEnum( MPDevelopmentFuelConsumption,
 
 @interface MPStoreViewController()<MPInAppDelegate>
 
-@property(nonatomic, strong) NSNumberFormatter *currencyFormatter;
+@property(nonatomic, strong) NSDictionary<NSString *, SKProduct *> *products;
-@property(nonatomic, strong) NSArray *products;
+@property(nonatomic, strong) NSDictionary<NSString *, SKPaymentTransaction *> *transactions;
+@property(nonatomic, strong) NSMutableArray<NSArray *> *dataSource;
 
 @end
 
@@ -43,7 +44,7 @@ PearlEnum( MPDevelopmentFuelConsumption,
     ];
     NSInteger storeVersion = [[NSUserDefaults standardUserDefaults] integerForKey:@"storeVersion"];
     for (; storeVersion < [storeVersions count]; ++storeVersion)
-        [features appendFormat:@"%@\n", storeVersions[storeVersion]];
+        [features appendFormat:@"%@\n", storeVersions[(NSUInteger)storeVersion]];
     if (![features length])
         return nil;
 
@@ -57,14 +58,13 @@ PearlEnum( MPDevelopmentFuelConsumption,
 
     [super viewDidLoad];
 
-    self.currencyFormatter = [NSNumberFormatter new];
-    self.currencyFormatter.numberStyle = NSNumberFormatterCurrencyStyle;
-
     self.tableView.tableHeaderView = [UIView new];
     self.tableView.tableFooterView = [UIView new];
     self.tableView.rowHeight = UITableViewAutomaticDimension;
     self.tableView.estimatedRowHeight = 400;
     self.view.backgroundColor = [UIColor clearColor];
+
+    self.dataSource = [@[ @[], @[ @"MPStoreCellSpinner", @"MPStoreCellFooter" ] ] mutableCopy];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -73,50 +73,44 @@ PearlEnum( MPDevelopmentFuelConsumption,
 
     self.tableView.contentInset = UIEdgeInsetsMake( 64, 0, 49, 0 );
 
-    [self updateCellsHiding:self.allCellsBySection[0] showing:@[ self.loadingCell ]];
-    [self.allCellsBySection[0] enumerateObjectsUsingBlock:^(MPStoreProductCell *cell, NSUInteger idx, BOOL *stop) {
-        if ([cell isKindOfClass:[MPStoreProductCell class]]) {
-            cell.purchasedIndicator.visible = NO;
-            [cell.activityIndicator stopAnimating];
-        }
-    }];
-
-    PearlAddNotificationObserver( NSUserDefaultsDidChangeNotification, nil, [NSOperationQueue mainQueue],
-            ^(MPStoreViewController *self, NSNotification *note) {
-                [self updateProducts];
-                [self updateFuel];
-            } );
     [[MPiOSAppDelegate get] registerProductsObserver:self];
-    [self updateFuel];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
 
     [super viewWillDisappear:animated];
 
-    PearlRemoveNotificationObservers();
+    [[MPiOSAppDelegate get] removeProductsObserver:self];
 }
 
 #pragma mark - UITableViewDataSource
 
-- (MPStoreProductCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
 
-    MPStoreProductCell *cell = (MPStoreProductCell *)[super tableView:tableView cellForRowAtIndexPath:indexPath];
+    return [self.dataSource count];
-    if (indexPath.section == 0)
-        cell.selectionStyle = [[MPiOSAppDelegate get] isFeatureUnlocked:[self productForCell:cell].productIdentifier]?
-                              UITableViewCellSelectionStyleNone: UITableViewCellSelectionStyleDefault;
-
-    if (cell.selectionStyle != UITableViewCellSelectionStyleNone) {
-        cell.selectedBackgroundView = [[UIView alloc] initWithFrame:cell.bounds];
-        cell.selectedBackgroundView.backgroundColor = [UIColor colorWithRGBAHex:0x78DDFB33];
-    }
-
-    return cell;
 }
 
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
 
-    return NO;
+    return [self.dataSource[(NSUInteger)section] count];
+}
+
+- (MPStoreProductCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+    id content = self.dataSource[(NSUInteger)indexPath.section][(NSUInteger)indexPath.row];
+    if ([content isKindOfClass:[SKProduct class]]) {
+        SKProduct *product = content;
+        MPStoreProductCell *cell;
+        if ([product.productIdentifier isEqualToString:MPProductFuel])
+            cell = [MPStoreFuelProductCell dequeueCellFromTableView:tableView indexPath:indexPath];
+        else
+            cell = [MPStoreProductCell dequeueCellFromTableView:tableView indexPath:indexPath];
+        [cell updateWithProduct:product transaction:self.transactions[product.productIdentifier]];
+
+        return cell;
+    }
+
+    return [tableView dequeueReusableCellWithIdentifier:content forIndexPath:indexPath];
 }
 
 #pragma mark - UITableViewDelegate
@@ -128,14 +122,13 @@ PearlEnum( MPDevelopmentFuelConsumption,
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
 
-    MPStoreProductCell *cell = (MPStoreProductCell *)[self tableView:tableView cellForRowAtIndexPath:indexPath];
+    UITableViewCell *cell = [self tableView:tableView cellForRowAtIndexPath:indexPath];
-    if (cell.selectionStyle == UITableViewCellSelectionStyleNone)
+    if (cell.selectionStyle != UITableViewCellSelectionStyleNone && [cell isKindOfClass:[MPStoreProductCell class]]) {
-        return;
+        MPStoreProductCell *productCell = (MPStoreProductCell *)cell;
 
-    SKProduct *product = [self productForCell:cell];
+        if (productCell.product && ![[MPAppDelegate_Shared get] isFeatureUnlocked:productCell.product.productIdentifier])
-    if (product && ![[MPAppDelegate_Shared get] isFeatureUnlocked:product.productIdentifier])
+            [[MPAppDelegate_Shared get] purchaseProductWithIdentifier:productCell.product.productIdentifier quantity:productCell.quantity];
-        [[MPAppDelegate_Shared get] purchaseProductWithIdentifier:product.productIdentifier
+    }
-                                                         quantity:[self quantityForProductIdentifier:product.productIdentifier]];
 
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
 }
@@ -146,7 +139,9 @@ PearlEnum( MPDevelopmentFuelConsumption,
 
     NSUInteger fuelConsumption = [[MPiOSConfig get].developmentFuelConsumption unsignedIntegerValue];
     [MPiOSConfig get].developmentFuelConsumption = @((fuelConsumption + 1) % MPDevelopmentFuelConsumptionCount);
-    [self updateProducts];
+
+    [self.tableView updateDataSource:self.dataSource toSections:nil reloadItems:@[ self.products[MPProductFuel] ]
+                    withRowAnimation:UITableViewRowAnimationAutomatic];
 }
 
 - (IBAction)restorePurchases:(id)sender {
@@ -165,41 +160,33 @@ PearlEnum( MPDevelopmentFuelConsumption,
 - (IBAction)sendThanks:(id)sender {
 
     [[self dismissPopup].navigationController performSegueWithIdentifier:@"web" sender:
-            [NSURL URLWithString:@"http://thanks.lhunath.com"]];
+            [NSURL URLWithString:@"https://thanks.lhunath.com"]];
 }
 
 #pragma mark - MPInAppDelegate
 
-- (void)updateWithProducts:(NSArray *)products {
+- (void)updateWithProducts:(NSDictionary<NSString *, SKProduct *> *)products
+              transactions:(NSDictionary<NSString *, SKPaymentTransaction *> *)transactions {
 
     self.products = products;
+    self.transactions = transactions;
+    NSMutableArray *newDataSource = [NSMutableArray arrayWithCapacity:2];
 
-    [self updateProducts];
+    // Section 0: products
-}
+    [newDataSource addObject:[[products allValues] sortedArrayUsingComparator:
+            ^NSComparisonResult(SKProduct *p1, SKProduct *p2) {
+                return [p1.productIdentifier compare:p2.productIdentifier];
+            }]];
+    NSArray *reloadProducts = [newDataSource[0] filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:
+            ^BOOL(SKProduct *product, NSDictionary *bindings) {
+                return self.transactions[product.productIdentifier] != nil;
+            }]];
 
-- (void)updateWithTransaction:(SKPaymentTransaction *)transaction {
+    // Section 1: information cells
+    [newDataSource addObject:@[ @"MPStoreCellFooter" ]];
 
-    MPStoreProductCell *cell = [self cellForProductIdentifier:transaction.payment.productIdentifier];
+    [self.tableView updateDataSource:self.dataSource toSections:newDataSource
-    if (!cell)
+                         reloadItems:reloadProducts withRowAnimation:UITableViewRowAnimationAutomatic];
-        return;
-
-    switch (transaction.transactionState) {
-        case SKPaymentTransactionStatePurchasing:
-            [cell.activityIndicator startAnimating];
-            break;
-        case SKPaymentTransactionStatePurchased:
-            [cell.activityIndicator stopAnimating];
-            break;
-        case SKPaymentTransactionStateFailed:
-            [cell.activityIndicator stopAnimating];
-            break;
-        case SKPaymentTransactionStateRestored:
-            [cell.activityIndicator stopAnimating];
-            break;
-        case SKPaymentTransactionStateDeferred:
-            [cell.activityIndicator startAnimating];
-            break;
-    }
 }
 
 #pragma mark - Private
@@ -216,60 +203,80 @@ PearlEnum( MPDevelopmentFuelConsumption,
     return nil;
 }
 
-- (SKProduct *)productForCell:(MPStoreProductCell *)cell {
+@end
 
-    for (SKProduct *product in self.products)
+@implementation MPStoreProductCell
-        if ([self cellForProductIdentifier:product.productIdentifier] == cell)
+
-            return product;
+- (void)updateWithProduct:(SKProduct *)product transaction:(SKPaymentTransaction *)transaction {
+
+    _product = product;
+
+    BOOL purchased = [[MPiOSAppDelegate get] isFeatureUnlocked:self.product.productIdentifier];
+    self.selectionStyle = purchased? UITableViewCellSelectionStyleNone: UITableViewCellSelectionStyleDefault;
+    self.selectedBackgroundView = self.selectionStyle == UITableViewCellSelectionStyleNone? nil: [[UIView alloc] initWithFrame:self.bounds];
+    self.selectedBackgroundView.backgroundColor = [UIColor colorWithRGBAHex:0x78DDFB33];
+
+    self.purchasedIndicator.visible = purchased;
+    self.priceLabel.text = purchased? @"": [self price];
+    self.titleLabel.text = product.localizedTitle;
+    self.descriptionLabel.text = product.localizedDescription;
+    self.thumbnailView.image = [self productImage];
+
+    if (transaction && (transaction.transactionState == SKPaymentTransactionStateDeferred ||
+                        transaction.transactionState == SKPaymentTransactionStatePurchasing))
+        [self.activityIndicator startAnimating];
+    else
+        [self.activityIndicator stopAnimating];
+}
+
+- (UIImage *)productImage {
+
+    if ([MPProductGenerateLogins isEqualToString:self.product.productIdentifier])
+        return [UIImage imageNamed:@"thumb_generated_login"];
+    if ([MPProductGenerateAnswers isEqualToString:self.product.productIdentifier])
+        return [UIImage imageNamed:@"thumb_generated_answers"];
+    if ([MPProductOSIntegration isEqualToString:self.product.productIdentifier])
+        return [UIImage imageNamed:@"thumb_ios_integration"];
+    if ([MPProductTouchID isEqualToString:self.product.productIdentifier])
+        return [UIImage imageNamed:@"thumb_touch_id"];
+    if ([MPProductFuel isEqualToString:self.product.productIdentifier])
+        return [UIImage imageNamed:@"thumb_fuel"];
 
     return nil;
 }
 
-- (MPStoreProductCell *)cellForProductIdentifier:(NSString *)productIdentifier {
+- (NSString *)price {
 
-    if ([productIdentifier isEqualToString:MPProductGenerateLogins])
+    NSNumberFormatter *currencyFormatter = [NSNumberFormatter new];
-        return self.generateLoginCell;
+    currencyFormatter.numberStyle = NSNumberFormatterCurrencyStyle;
-    if ([productIdentifier isEqualToString:MPProductGenerateAnswers])
+    currencyFormatter.locale = self.product.priceLocale;
-        return self.generateAnswersCell;
-    if ([productIdentifier isEqualToString:MPProductOSIntegration])
-        return self.iOSIntegrationCell;
-    if ([productIdentifier isEqualToString:MPProductTouchID])
-        return self.touchIDCell;
-    if ([productIdentifier isEqualToString:MPProductFuel])
-        return self.fuelCell;
 
-    return nil;
+    return [currencyFormatter stringFromNumber:@([self.product.price floatValue] * self.quantity)];
 }
 
-- (void)updateProducts {
+- (NSInteger)quantity {
 
-    NSMutableArray *showCells = [NSMutableArray array];
+    return 1;
-    NSMutableArray *hideCells = [NSMutableArray array];
-    [hideCells addObjectsFromArray:[self.allCellsBySection[0] array]];
-    [hideCells addObject:self.loadingCell];
-
-    for (SKProduct *product in self.products) {
-        [self showCellForProductWithIdentifier:MPProductGenerateLogins ifProduct:product showingCells:showCells];
-        [self showCellForProductWithIdentifier:MPProductGenerateAnswers ifProduct:product showingCells:showCells];
-        [self showCellForProductWithIdentifier:MPProductOSIntegration ifProduct:product showingCells:showCells];
-        [self showCellForProductWithIdentifier:MPProductTouchID ifProduct:product showingCells:showCells];
-        [self showCellForProductWithIdentifier:MPProductFuel ifProduct:product showingCells:showCells];
-    }
-
-    [hideCells removeObjectsInArray:showCells];
-    [self updateCellsHiding:hideCells showing:showCells];
 }
 
-- (void)updateFuel {
+@end
+
+@implementation MPStoreFuelProductCell
+
+- (void)updateWithProduct:(SKProduct *)product transaction:(SKPaymentTransaction *)transaction {
+
+    [super updateWithProduct:product transaction:transaction];
 
     CGFloat weeklyFuelConsumption = [self weeklyFuelConsumption]; /* consume x fuel / week */
+    [self.fuelSpeedButton setTitle:[self weeklyFuelConsumptionTitle] forState:UIControlStateNormal];
+
+    NSTimeInterval fuelSecondsElapsed = 0;
     CGFloat fuelRemaining = [[MPiOSConfig get].developmentFuelRemaining floatValue]; /* x fuel left */
     CGFloat fuelInvested = [[MPiOSConfig get].developmentFuelInvested floatValue]; /* x fuel left */
-    NSDate *now = [NSDate date];
+    NSDate *now = [NSDate date], *checked = [MPiOSConfig get].developmentFuelChecked;
-    NSTimeInterval fuelSecondsElapsed = -[[MPiOSConfig get].developmentFuelChecked timeIntervalSinceDate:now];
+    if (!checked || 3600 < (fuelSecondsElapsed = [now timeIntervalSinceDate:checked])) {
-    if (fuelSecondsElapsed > 3600 || ![MPiOSConfig get].developmentFuelChecked) {
         NSTimeInterval weeksElapsed = fuelSecondsElapsed / (3600 * 24 * 7 /* 1 week */); /* x weeks elapsed */
-        NSTimeInterval fuelConsumed = weeklyFuelConsumption * weeksElapsed;
+        NSTimeInterval fuelConsumed = MIN( fuelRemaining, weeklyFuelConsumption * weeksElapsed );
         fuelRemaining -= fuelConsumed;
         fuelInvested += fuelConsumed;
         [MPiOSConfig get].developmentFuelChecked = now;
@@ -277,54 +284,43 @@ PearlEnum( MPDevelopmentFuelConsumption,
         [MPiOSConfig get].developmentFuelInvested = @(fuelInvested);
     }
 
-    CGFloat fuelRatio = weeklyFuelConsumption == 0? 0: fuelRemaining / weeklyFuelConsumption; /* x weeks worth of fuel left */
+    CGFloat fuelRatio = weeklyFuelConsumption? fuelRemaining / weeklyFuelConsumption: 0; /* x weeks worth of fuel left */
-    [self.fuelMeterConstraint updateConstant:MIN( 0.5f, fuelRatio - 0.5f ) * 160]; /* -80pt = 0 weeks left, 80pt = >=1 week left */
+    [self.fuelMeterConstraint updateConstant:MIN( 0.5f, fuelRatio - 0.5f ) * 160]; /* -80pt = 0 weeks left, +80pt = >=1 week left */
-    self.fuelStatusLabel.text = strf( @"fuel left: %0.1f work hours\ninvested: %0.1f work hours", fuelRemaining, fuelInvested );
+    self.fuelStatusLabel.text = strf( @"Fuel left: %0.1f work hours\nFunded: %0.1f work hours", fuelRemaining, fuelInvested );
     self.fuelStatusLabel.hidden = (fuelRemaining + fuelInvested) == 0;
 }
 
+- (NSInteger)quantity {
+
+    return MAX( 1, (NSInteger)ceil( MP_FUEL_HOURLY_RATE * [self weeklyFuelConsumption] ) );
+}
+
 - (CGFloat)weeklyFuelConsumption {
 
     switch ((MPDevelopmentFuelConsumption)[[MPiOSConfig get].developmentFuelConsumption unsignedIntegerValue]) {
         case MPDevelopmentFuelConsumptionQuarterly:
-            [self.fuelSpeedButton setTitle:@"1h / quarter" forState:UIControlStateNormal];
             return 1.f / 12 /* 12 weeks */;
         case MPDevelopmentFuelConsumptionMonthly:
-            [self.fuelSpeedButton setTitle:@"1h / month" forState:UIControlStateNormal];
             return 1.f / 4 /* 4 weeks */;
         case MPDevelopmentFuelWeekly:
-            [self.fuelSpeedButton setTitle:@"1h / week" forState:UIControlStateNormal];
+            return 1.f /* 1 week */;
-            return 1.f;
     }
 
     return 0;
 }
 
-- (void)showCellForProductWithIdentifier:(NSString *)productIdentifier ifProduct:(SKProduct *)product
+- (NSString *)weeklyFuelConsumptionTitle {
-                            showingCells:(NSMutableArray *)showCells {
 
-    if (![product.productIdentifier isEqualToString:productIdentifier])
+    switch ((MPDevelopmentFuelConsumption)[[MPiOSConfig get].developmentFuelConsumption unsignedIntegerValue]) {
-        return;
+        case MPDevelopmentFuelConsumptionQuarterly:
+            return @"1h / quarter";
+        case MPDevelopmentFuelConsumptionMonthly:
+            return @"1h / month";
+        case MPDevelopmentFuelWeekly:
+            return @"1h / week";
+    }
 
-    MPStoreProductCell *cell = [self cellForProductIdentifier:productIdentifier];
+    return nil;
-    [showCells addObject:cell];
-
-    self.currencyFormatter.locale = product.priceLocale;
-    BOOL purchased = [[MPiOSAppDelegate get] isFeatureUnlocked:productIdentifier];
-    NSInteger quantity = [self quantityForProductIdentifier:productIdentifier];
-    cell.priceLabel.text = purchased? @"": [self.currencyFormatter stringFromNumber:@([product.price floatValue] * quantity)];
-    cell.purchasedIndicator.visible = purchased;
-}
-
-- (NSInteger)quantityForProductIdentifier:(NSString *)productIdentifier {
-
-    if ([productIdentifier isEqualToString:MPProductFuel])
-        return (NSInteger)(MP_FUEL_HOURLY_RATE * [self weeklyFuelConsumption] + .5f);
-
-    return 1;
 }
 
 @end
-
-@implementation MPStoreProductCell
-@end

platform-darwin/Source/iOS/MPUsersViewController.m

@@ -16,6 +16,7 @@
 // LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
+#import <Crashlytics/Answers.h>
 #import "MPUsersViewController.h"
 #import "MPEntities.h"
 #import "MPAvatarCell.h"
@@ -118,8 +119,9 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
 
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
 
-    if ([segue.identifier isEqualToString:@"web"])
+    if ([segue.identifier isEqualToString:@"thanks"])
-        ((MPWebViewController *)segue.destinationViewController).initialURL = [NSURL URLWithString:@"http://thanks.lhunath.com"];
+        ((MPWebViewController *)segue.destinationViewController).initialURL =
+                [NSURL URLWithString:@"https://thanks.lhunath.com"];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -224,6 +226,17 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
                         user.defaultType = user.algorithm.defaultType;
                         user.avatar = newUserAvatar;
                         user.name = newUserName;
+
+                        if ([[MPConfig get].sendInfo boolValue]) {
+#ifdef CRASHLYTICS
+                            [Answers logSignUpWithMethod:@"Manual"
+                                                 success:@YES
+                                        customAttributes:@{
+                                                @"algorithm": @(user.algorithm.version),
+                                                @"avatar"   : @(user.avatar),
+                                        }];
+#endif
+                        }
                     }
 
                     BOOL signedIn = [[MPiOSAppDelegate get] signInAsUser:user saveInContext:context
@@ -260,6 +273,9 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
 // This isn't really in UITextFieldDelegate.  We fake it from UITextFieldTextDidChangeNotification.
 - (void)textFieldEditingChanged:(UITextField *)textField {
 
+    if ([[textField.text lowercaseString] isEqualToString:@"hangtest"])
+        [NSThread sleepForTimeInterval:10];
+
     if (textField == self.entryField) {
         switch (self.activeUserState) {
             case MPActiveUserStateNone:
@@ -369,7 +385,7 @@ referenceSizeForFooterInSection:(NSInteger)section {
             MPAvatarCell *userAvatar = [self selectedAvatar];
             userAvatar.spinnerActive = YES;
             if (!isNew && mainUser && [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-                MPUserEntity *user = [MPUserEntity existingObjectWithID:mainUser.objectID inContext:context];
+                MPUserEntity *user = [MPUserEntity existingObjectWithID:mainUser.permanentObjectID inContext:context];
                 BOOL signedIn = [[MPiOSAppDelegate get] signInAsUser:user saveInContext:context usingMasterPassword:nil];
 
                 PearlMainQueue( ^{
@@ -412,10 +428,10 @@ referenceSizeForFooterInSection:(NSInteger)section {
 
         BOOL isNew = NO;
         MPUserEntity *user = [self userForAvatar:avatarCell inContext:mainContext isNew:&isNew];
-        NSManagedObjectID *userID = user.objectID;
         if (isNew || !user)
             return;
 
+        NSManagedObjectID *userID = user.permanentObjectID;
         [PearlSheet showSheetWithTitle:user.name
                              viewStyle:UIActionSheetStyleBlackTranslucent
                              initSheet:nil tappedButtonBlock:^(UIActionSheet *sheet, NSInteger buttonIndex) {
@@ -719,13 +735,13 @@ referenceSizeForFooterInSection:(NSInteger)section {
             ];
             NSArray *users = [mainContext executeFetchRequest:fetchRequest error:&error];
             if (!users) {
-                err( @"Failed to load users: %@", [error fullDescription] );
+                MPError( error, @"Failed to load users." );
                 self.userIDs = nil;
             }
 
             NSMutableArray *userIDs = [NSMutableArray arrayWithCapacity:[users count]];
             for (MPUserEntity *user in users)
-                [userIDs addObject:user.objectID];
+                [userIDs addObject:user.permanentObjectID];
             self.userIDs = userIDs;
         }])
             self.userIDs = nil;
@@ -753,7 +769,7 @@ referenceSizeForFooterInSection:(NSInteger)section {
         NSManagedObjectID *selectUserID = [MPiOSAppDelegate get].activeUserOID;
         if (!selectUserID)
             selectUserID = [self selectedUserInContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]
-                                                 isNew:&isNew].objectID;
+                                                 isNew:&isNew].permanentObjectID;
         [self.avatarCollectionView reloadData];
 
         NSUInteger selectedAvatarItem = isNew? [_userIDs count]: selectUserID? [_userIDs indexOfObject:selectUserID]: NSNotFound;

platform-darwin/Source/iOS/MPWebViewController.m

@@ -32,7 +32,7 @@
     [super viewWillAppear:animated];
 
     if (!self.initialURL)
-        self.initialURL = [NSURL URLWithString:@"http://masterpasswordapp.com"];
+        self.initialURL = [NSURL URLWithString:@"https://ssl.masterpasswordapp.com"];
 
     self.webNavigationItem.title = self.initialURL.host;
 

platform-darwin/Source/iOS/MPiOSAppDelegate.m

@@ -21,11 +21,12 @@
 #import "MPAppDelegate_Store.h"
 #import "MPStoreViewController.h"
 
+#define MP_HANG_TIME_MAIN 3 // s
+
 @interface MPiOSAppDelegate()<UIDocumentInteractionControllerDelegate>
 
 @property(nonatomic, strong) UIDocumentInteractionController *interactionController;
 
-@property(nonatomic) UIBackgroundTaskIdentifier task;
 @end
 
 @implementation MPiOSAppDelegate
@@ -59,10 +60,9 @@
             [[Crashlytics sharedInstance] setUserIdentifier:[PearlKeyChain deviceIdentifier]];
             [[Crashlytics sharedInstance] setObjectValue:[PearlKeyChain deviceIdentifier] forKey:@"deviceIdentifier"];
             [[Crashlytics sharedInstance] setUserName:@"Anonymous"];
-            [[Crashlytics sharedInstance] setObjectValue:@"Anonymous" forKey:@"username"];
             [Crashlytics startWithAPIKey:crashlyticsAPIKey];
             [[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) {
-                PearlLogLevel level = PearlLogLevelInfo;
+                PearlLogLevel level = PearlLogLevelWarn;
                 if ([[MPConfig get].sendInfo boolValue])
                     level = PearlLogLevelDebug;
 
@@ -75,6 +75,8 @@
                     [Crashlytics sharedInstance].version, [PearlInfoPlist get].CFBundleName, [PearlInfoPlist get].CFBundleVersion );
         }
 #endif
+
+        [self installHangDetector];
     }
     @catch (id exception) {
         err( @"During Analytics Setup: %@", exception );
@@ -83,9 +85,6 @@
         PearlAddNotificationObserver( MPCheckConfigNotification, nil, [NSOperationQueue mainQueue], ^(id self, NSNotification *note) {
             [self updateConfigKey:note.object];
         } );
-//      PearlAddNotificationObserver( kIASKAppSettingChanged, nil, nil, ^(id self, NSNotification *note) {
-//          [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:note.object];
-//      } );
         PearlAddNotificationObserver( NSUserDefaultsDidChangeNotification, nil, nil, ^(id self, NSNotification *note) {
             [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:nil];
         } );
@@ -144,6 +143,31 @@
     return YES;
 }
 
+- (void)installHangDetector {
+
+    __block NSDate *latestPing = [NSDate date];
+    __block __weak VoidBlock wPingOp, wPongOp;
+
+    VoidBlock pingOp = ^{
+        latestPing = [NSDate date];
+        dispatch_after( dispatch_time( DISPATCH_TIME_NOW, 100 * NSEC_PER_MSEC ), dispatch_get_main_queue(), wPingOp );
+    }, pongOp = ^{
+        NSTimeInterval hangTime = -[latestPing timeIntervalSinceNow];
+        if (hangTime > MP_HANG_TIME_MAIN) {
+            MPError( [NSError errorWithDomain:MPErrorDomain code:MPErrorHangCode userInfo:@{
+                    @"time": @(hangTime)
+            }], @"Timeout waiting for main thread after %fs.", hangTime );
+        }
+        else
+            dbg( @"hangTime=%f", hangTime );
+
+        dispatch_after( dispatch_time( DISPATCH_TIME_NOW, NSEC_PER_SEC ), dispatch_get_global_queue( QOS_CLASS_BACKGROUND, 0 ), wPongOp );
+    };
+
+    (wPingOp = pingOp)();
+    (wPongOp = pongOp)();
+}
+
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url
   sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
 
@@ -155,7 +179,8 @@
     [[[NSURLSession sharedSession] dataTaskWithURL:url completionHandler:
             ^(NSData *importedSitesData, NSURLResponse *response, NSError *error) {
                 if (error)
-                    err( @"While reading imported sites from %@: %@", url, [error fullDescription] );
+                    MPError( error, @"While reading imported sites from %@.", url );
+
                 if (!importedSitesData) {
                     [PearlAlert showError:strf( @"Master Password couldn't read the import sites.\n\n%@",
                             [error localizedDescription]?: error )];
@@ -483,7 +508,7 @@
                      NSError *error = nil;
                      if (![[exportedSites dataUsingEncoding:NSUTF8StringEncoding]
                              writeToURL:exportURL options:NSDataWritingFileProtectionComplete error:&error])
-                         err( @"Failed to write export data to URL %@: %@", exportURL, [error fullDescription] );
+                         MPError( error, @"Failed to write export data to URL %@.", exportURL );
                      else {
                          self.interactionController = [UIDocumentInteractionController interactionControllerWithURL:exportURL];
                          self.interactionController.UTI = @"com.lyndir.masterpassword.sites";
@@ -574,7 +599,7 @@
     static NSDictionary *crashlyticsInfo = nil;
     if (crashlyticsInfo == nil)
         crashlyticsInfo = [[NSDictionary alloc] initWithContentsOfURL:
-                [[NSBundle mainBundle] URLForResource:@"Crashlytics" withExtension:@"plist"]];
+                [[NSBundle mainBundle] URLForResource:@"Fabric" withExtension:@"plist"]];
 
     return crashlyticsInfo;
 }

platform-darwin/Source/iOS/MasterPassword-Info.plist

@@ -60,7 +60,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>© 2011-2016 Lyndir</string>
+	<string>© 2011-2017</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Exo2.0-Bold.otf</string>

platform-darwin/Source/iOS/Settings.bundle/Root.plist

@@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>FooterText</key>
-			<string>Enable this setting to send us carefully anonymized information to help us diagnose and resolve issues you might experience in the future.</string>
+			<string>Enable this setting to send carefully anonymized information to help us diagnose and resolve any issues you encounter in a future update.</string>
 			<key>Title</key>
 			<string></string>
 			<key>Type</key>
@@ -50,7 +50,7 @@
 			<key>Key</key>
 			<string>sendInfo</string>
 			<key>DefaultValue</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>FooterText</key>