diff --git a/External/Pearl b/External/Pearl
index da89089f..6f399ecc 160000
--- a/External/Pearl
+++ b/External/Pearl
@@ -1 +1 @@
-Subproject commit da89089f2900ab8990a61f549d061f36325a4e41
+Subproject commit 6f399eccdc5cc016cdc898778845675bbe624cd3
diff --git a/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout b/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout
index 27ca984b..9c5c4d58 100644
--- a/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout
+++ b/MasterPassword.xcworkspace/xcshareddata/MasterPassword.xccheckout
@@ -10,57 +10,69 @@
MasterPassword
IDESourceControlProjectOriginsDictionary
+ 1712FC0BC3C9AABD8B7B5376E310E93FBDB3BCFA
+ git://github.com/lhunath/InAppSettingsKit.git
1AA8C0BE-EEC3-4FBC-A801-8939A1AC093A
git://github.com/Lyndir/love-lyndir.client.git
- 42C94803-87A2-403E-896C-D9AC3A807E1B
- git://github.com/lhunath/UbiquityStoreManager.git
- 6A449EC2-A2A3-4635-9C5F-A811E011EAC3
- ssh://github.com/Lyndir/MasterPassword.git
- ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC
- ssh://github.com/Lyndir/Pearl.git
- AE3786C7-912B-4651-A73F-2E1DACBFB604
+ 2A70319CE0F91B35406CA7D970AE7CB4957B0A75
+ github.com:Lyndir/Lyndir.git
+ 2FE140B36B7D26140DC8D5E5C639DC5900EFCF35
git://github.com/lhunath/uicolor-utilities.git
- B0F634DD-AEE1-4F0D-AE35-4FAF51AD1B5A
+ 3E67FB08419C920516AAC3B00DAAF23073B8CF77
git://github.com/lhunath/RHStatusItemView.git
- CDDE92CF-0136-4DE0-8318-80EDB5C8CAF9
- git://github.com/lhunath/InAppSettingsKit.git
- E4C8E206-229C-4DA8-A130-0C544DEC7E07
+ 4DDCFFD91B41F00326AD14553BD66CFD366ABD91
+ ssh://github.com/Lyndir/Pearl.git
+ 8A15A8EA0B3D0B497C4883425BC74DF995224BB3
git://github.com/jonmarimba/jrswizzle.git
+ E47DEC29CB0D0FDE3560EF46E1808FA1C723D657
+ git://github.com/lhunath/UbiquityStoreManager.git
+ F788B28042EDBEF29EFE34687DA79A778C2CC260
+ ssh://github.com/Lyndir/MasterPassword.git
IDESourceControlProjectPath
MasterPassword.xcworkspace
IDESourceControlProjectRelativeInstallPathDictionary
+ 1712FC0BC3C9AABD8B7B5376E310E93FBDB3BCFA
+ ../External/InAppSettingsKit
1AA8C0BE-EEC3-4FBC-A801-8939A1AC093A
../External/LoveLyndir
- 42C94803-87A2-403E-896C-D9AC3A807E1B
- ../External/UbiquityStoreManager
- 6A449EC2-A2A3-4635-9C5F-A811E011EAC3
- ..
- ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC
- ../External/Pearl
- AE3786C7-912B-4651-A73F-2E1DACBFB604
+ 2A70319CE0F91B35406CA7D970AE7CB4957B0A75
+ ../..
+ 2FE140B36B7D26140DC8D5E5C639DC5900EFCF35
../External/Pearl/External/uicolor-utilities
- B0F634DD-AEE1-4F0D-AE35-4FAF51AD1B5A
+ 3E67FB08419C920516AAC3B00DAAF23073B8CF77
../External/RHStatusItemView
- CDDE92CF-0136-4DE0-8318-80EDB5C8CAF9
- ../External/InAppSettingsKit
- E4C8E206-229C-4DA8-A130-0C544DEC7E07
+ 4DDCFFD91B41F00326AD14553BD66CFD366ABD91
+ ../External/Pearl
+ 8A15A8EA0B3D0B497C4883425BC74DF995224BB3
../External/Pearl/External/jrswizzle
+ E47DEC29CB0D0FDE3560EF46E1808FA1C723D657
+ ../External/UbiquityStoreManager
+ F788B28042EDBEF29EFE34687DA79A778C2CC260
+ ..
IDESourceControlProjectURL
ssh://github.com/Lyndir/MasterPassword.git
IDESourceControlProjectVersion
- 110
+ 111
IDESourceControlProjectWCCIdentifier
- 6A449EC2-A2A3-4635-9C5F-A811E011EAC3
+ F788B28042EDBEF29EFE34687DA79A778C2CC260
IDESourceControlProjectWCConfigurations
IDESourceControlRepositoryExtensionIdentifierKey
public.vcs.git
IDESourceControlWCCIdentifierKey
- CDDE92CF-0136-4DE0-8318-80EDB5C8CAF9
+ 2A70319CE0F91B35406CA7D970AE7CB4957B0A75
+ IDESourceControlWCCName
+
+
+
+ IDESourceControlRepositoryExtensionIdentifierKey
+ public.vcs.git
+ IDESourceControlWCCIdentifierKey
+ 1712FC0BC3C9AABD8B7B5376E310E93FBDB3BCFA
IDESourceControlWCCName
InAppSettingsKit
@@ -68,7 +80,7 @@
IDESourceControlRepositoryExtensionIdentifierKey
public.vcs.git
IDESourceControlWCCIdentifierKey
- E4C8E206-229C-4DA8-A130-0C544DEC7E07
+ 8A15A8EA0B3D0B497C4883425BC74DF995224BB3
IDESourceControlWCCName
jrswizzle
@@ -84,7 +96,7 @@
IDESourceControlRepositoryExtensionIdentifierKey
public.vcs.git
IDESourceControlWCCIdentifierKey
- 6A449EC2-A2A3-4635-9C5F-A811E011EAC3
+ F788B28042EDBEF29EFE34687DA79A778C2CC260
IDESourceControlWCCName
MasterPassword
@@ -92,7 +104,7 @@
IDESourceControlRepositoryExtensionIdentifierKey
public.vcs.git
IDESourceControlWCCIdentifierKey
- ADA0D7F9-4871-4128-8FEE-FD1021EEF3AC
+ 4DDCFFD91B41F00326AD14553BD66CFD366ABD91
IDESourceControlWCCName
Pearl
@@ -100,7 +112,7 @@
IDESourceControlRepositoryExtensionIdentifierKey
public.vcs.git
IDESourceControlWCCIdentifierKey
- B0F634DD-AEE1-4F0D-AE35-4FAF51AD1B5A
+ 3E67FB08419C920516AAC3B00DAAF23073B8CF77
IDESourceControlWCCName
RHStatusItemView
@@ -108,7 +120,7 @@
IDESourceControlRepositoryExtensionIdentifierKey
public.vcs.git
IDESourceControlWCCIdentifierKey
- 42C94803-87A2-403E-896C-D9AC3A807E1B
+ E47DEC29CB0D0FDE3560EF46E1808FA1C723D657
IDESourceControlWCCName
UbiquityStoreManager
@@ -116,7 +128,7 @@
IDESourceControlRepositoryExtensionIdentifierKey
public.vcs.git
IDESourceControlWCCIdentifierKey
- AE3786C7-912B-4651-A73F-2E1DACBFB604
+ 2FE140B36B7D26140DC8D5E5C639DC5900EFCF35
IDESourceControlWCCName
uicolor-utilities
diff --git a/MasterPassword/ObjC/MPAlgorithmV0.m b/MasterPassword/ObjC/MPAlgorithmV0.m
index 749d08e0..7b5d7e74 100644
--- a/MasterPassword/ObjC/MPAlgorithmV0.m
+++ b/MasterPassword/ObjC/MPAlgorithmV0.m
@@ -422,7 +422,7 @@
}
}
- Throw( @"Unsupported type: %d", element.type );
+ Throw( @"Unsupported type: %ld", (long)element.type );
}
- (NSString *)resolveContentForElement:(MPElementEntity *)element usingKey:(MPKey *)elementKey {
diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
index 56ae2e27..01110c7a 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -119,7 +119,6 @@
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 */; };
- DA48856119A5AC1E000C2D79 /* libopensslcrypto-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAE8E65119867AB500416A0F /* libopensslcrypto-ios.a */; };
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 */; };
@@ -141,6 +140,8 @@
DA67461018DE7F0C00DFE240 /* Exo2.0-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DA67460C18DE7F0C00DFE240 /* Exo2.0-Bold.otf */; };
DA69540617D975D900BF294E /* icon_gears.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37841711E29500CF925C /* icon_gears.png */; };
DA69540717D975D900BF294E /* icon_gears@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37851711E29500CF925C /* icon_gears@2x.png */; };
+ DA72BD7519C133BF00E6ACFE /* libscryptenc-ios-dev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA72BD7419C133BF00E6ACFE /* libscryptenc-ios-dev.a */; };
+ DA72BD7919C137DE00E6ACFE /* libopensslcrypto-ios-dev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA72BD7719C137D500E6ACFE /* libopensslcrypto-ios-dev.a */; };
DA73049D194E022700E72520 /* ui_spinner.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36511711E29400CF925C /* ui_spinner.png */; };
DA73049E194E022700E72520 /* ui_spinner@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD36521711E29400CF925C /* ui_spinner@2x.png */; };
DA73049F194E022B00E72520 /* ui_textfield.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD365B1711E29400CF925C /* ui_textfield.png */; };
@@ -384,7 +385,6 @@
DAFE4A63150399FF003ABA90 /* UIScrollView+PearlFlashingIndicators.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE4A63150399FF003ABA8F /* UIScrollView+PearlFlashingIndicators.h */; };
DAFE4A63150399FF003ABA92 /* NSDateFormatter+RFC3339.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE4A63150399FF003ABA91 /* NSDateFormatter+RFC3339.m */; };
DAFE4A63150399FF003ABA94 /* NSDateFormatter+RFC3339.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE4A63150399FF003ABA93 /* NSDateFormatter+RFC3339.h */; };
- DAFFC63F17EDDA7C007BB020 /* libscryptenc-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAFFC63E17EDDA7C007BB020 /* libscryptenc-ios.a */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -516,6 +516,8 @@
DA67460B18DE7F0C00DFE240 /* Exo2.0-ExtraBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Exo2.0-ExtraBold.otf"; sourceTree = ""; };
DA67460C18DE7F0C00DFE240 /* Exo2.0-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Exo2.0-Bold.otf"; sourceTree = ""; };
DA70EC7F1811B13C00F65DB2 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
+ DA72BD7419C133BF00E6ACFE /* libscryptenc-ios-dev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-ios-dev.a"; sourceTree = ""; };
+ DA72BD7719C137D500E6ACFE /* libopensslcrypto-ios-dev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libopensslcrypto-ios-dev.a"; sourceTree = ""; };
DA854C8118D4CFBF00106317 /* avatar-add@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-add@2x.png"; sourceTree = ""; };
DA854C8218D4CFBF00106317 /* avatar-add.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-add.png"; sourceTree = ""; };
DA945C8617E3F3FD0053236B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; };
@@ -1367,7 +1369,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- DA48856119A5AC1E000C2D79 /* libopensslcrypto-ios.a in Frameworks */,
DAFC5691172C582A00CB5CC5 /* libInAppSettingsKit.a in Frameworks */,
DA6701E016406BB400B61001 /* AdSupport.framework in Frameworks */,
DA6701DE16406B7300B61001 /* Social.framework in Frameworks */,
@@ -1382,6 +1383,7 @@
DA04E33E14B1E70400ECA4F3 /* MobileCoreServices.framework in Frameworks */,
DA48856019A5A82E000C2D79 /* Crashlytics.framework in Frameworks */,
DAC632891486D9690075AEA5 /* Security.framework in Frameworks */,
+ DA72BD7919C137DE00E6ACFE /* libopensslcrypto-ios-dev.a in Frameworks */,
DA5BFA49147E415C00F98B1E /* UIKit.framework in Frameworks */,
DA5BFA4B147E415C00F98B1E /* Foundation.framework in Frameworks */,
DA5BFA4D147E415C00F98B1E /* CoreGraphics.framework in Frameworks */,
@@ -1411,8 +1413,8 @@
buildActionMask = 2147483647;
files = (
DA4DA1DA1564471F00F6F596 /* libuicolor-utilities.a in Frameworks */,
- DAFFC63F17EDDA7C007BB020 /* libscryptenc-ios.a in Frameworks */,
DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */,
+ DA72BD7519C133BF00E6ACFE /* libscryptenc-ios-dev.a in Frameworks */,
DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1509,6 +1511,8 @@
DA5E5C6317248959003798D8 /* lib */ = {
isa = PBXGroup;
children = (
+ DA72BD7719C137D500E6ACFE /* libopensslcrypto-ios-dev.a */,
+ DA72BD7419C133BF00E6ACFE /* libscryptenc-ios-dev.a */,
DAE8E65119867AB500416A0F /* libopensslcrypto-ios.a */,
DAFFC63E17EDDA7C007BB020 /* libscryptenc-ios.a */,
DA5E5C6417248959003798D8 /* include */,
@@ -3480,7 +3484,7 @@
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = YES;
+ GCC_WARN_UNKNOWN_PRAGMAS = NO;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -3559,7 +3563,7 @@
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
- GCC_WARN_UNKNOWN_PRAGMAS = YES;
+ GCC_WARN_UNKNOWN_PRAGMAS = NO;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -3592,7 +3596,6 @@
LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"",
"$(inherited)",
- "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib",
);
OTHER_LDFLAGS = (
"$(inherited)",
@@ -3625,7 +3628,6 @@
LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"",
"$(inherited)",
- "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib",
);
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "7142c408-252a-43c0-94c6-1ae1f43173f4";
@@ -3699,7 +3701,7 @@
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
- GCC_WARN_UNKNOWN_PRAGMAS = YES;
+ GCC_WARN_UNKNOWN_PRAGMAS = NO;
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -3734,7 +3736,6 @@
LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)/../../../External/Pearl/Pearl-Crypto/lib\"",
"$(inherited)",
- "/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib",
);
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "48f9bae8-b80e-41c7-8792-663102bed54f";
diff --git a/MasterPassword/ObjC/iOS/Storyboard.storyboard b/MasterPassword/ObjC/iOS/Storyboard.storyboard
index 4c8e604a..e61e7936 100644
--- a/MasterPassword/ObjC/iOS/Storyboard.storyboard
+++ b/MasterPassword/ObjC/iOS/Storyboard.storyboard
@@ -1,11 +1,80 @@
-
+
-
+
+
+
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+ Exo2.0-Bold
+
+
+ Exo2.0-ExtraBold
+
+
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+ Exo2.0-Regular
+
+
+ Exo2.0-Thin
+ Exo2.0-Thin
+ Exo2.0-Thin
+ Exo2.0-Thin
+ Exo2.0-Thin
+ Exo2.0-Thin
+ Exo2.0-Thin
+ Exo2.0-Thin
+ Exo2.0-Thin
+ Exo2.0-Thin
+
+
+ SourceCodePro-Black
+ SourceCodePro-Black
+ SourceCodePro-Black
+
+
+ SourceCodePro-ExtraLight
+ SourceCodePro-ExtraLight
+ SourceCodePro-ExtraLight
+ SourceCodePro-ExtraLight
+
+
+ SourceCodePro-Regular
+
+
@@ -21,15 +90,12 @@
-
-
-
@@ -50,11 +116,9 @@
-
-
@@ -63,11 +127,9 @@
-
-
-
-
@@ -178,23 +234,19 @@
-
-
-
-
-
-
+
@@ -514,14 +557,12 @@
-
+
@@ -1865,7 +1829,7 @@
-
+
@@ -1900,7 +1864,7 @@
-
+
@@ -1914,7 +1878,6 @@
-
@@ -1927,11 +1890,9 @@
-
-
-
+
@@ -1949,7 +1910,6 @@
-
@@ -1972,15 +1932,13 @@
-
-
+
-
-
+
CgoKCgoKCgoKCgoKCg
@@ -2047,7 +2005,7 @@ CgoKCgoKCgoKCgoKCg
-
+
@@ -2061,7 +2019,6 @@ CgoKCgoKCgoKCgoKCg
-
119-20:51:52 MPiOSAppDelegate.m:36 | INFO : Initializing TestFlight
@@ -2091,7 +2048,6 @@ CgoKCgoKCgoKCgoKCg
-
@@ -2170,7 +2126,7 @@ CgoKCgoKCgoKCgoKCg
-
+
@@ -2184,31 +2140,25 @@ CgoKCgoKCgoKCgoKCg
-
-
-
-
-
-
The right balance between security and convenience is often very personal.
To make getting to your passwords faster, you can remain logged in after you close Master Password. This allows you to skip having to log in the next time.
@@ -2264,7 +2214,7 @@ However, it means that anyone who finds your device unlocked can do the same.
-
+
@@ -2278,26 +2228,21 @@ However, it means that anyone who finds your device unlocked can do the same.
-
-
-
-
-
@@ -2486,7 +2431,6 @@ See
-
@@ -2496,4 +2440,5 @@ See
+