Permalink
Browse files

Prepare for Travis-CI.

  • Loading branch information...
1 parent 1d20d81 commit 9808613c75505ff5e9e313f93bd2bde649cbc44d @lhunath lhunath committed Jan 26, 2014
Showing with 21 additions and 8 deletions.
  1. +5 −0 .travis.yml
  2. +1 −1 External/UbiquityStoreManager
  3. +9 −7 MasterPassword/ObjC/MPAppDelegate_Store.m
  4. +6 −0 README.md
View
@@ -0,0 +1,5 @@
+language: objective-c
+xcode_project: Pearl.xcodeproj
+xcode_scheme: Pearl
+xcode_sdk: iphonesimulator
+install: ./Scripts/updateDependencies
@@ -98,7 +98,7 @@ - (UbiquityStoreManager *)storeManager {
storeManager = [[UbiquityStoreManager alloc] initStoreNamed:nil withManagedObjectModel:nil localStoreURL:nil
containerIdentifier:MPCloudContainerIdentifier
- additionalStoreOptions:@{ STORE_OPTIONS }
+ storeConfiguration:nil storeOptions:@{ STORE_OPTIONS }
delegate:self];
#if TARGET_OS_IPHONE
@@ -197,7 +197,7 @@ - (BOOL)migrateV1CloudStore {
URLByAppendingPathComponent:@"Database.nosync" isDirectory:YES]
URLByAppendingPathComponent:uuid isDirectory:NO] URLByAppendingPathExtension:@"sqlite"];
- return [self migrateFromCloudStore:oldCloudStoreURL cloudContent:oldCloudContentURL contentName:uuid];
+ return [self migrateFromCloudStore:oldCloudStoreURL cloudContent:oldCloudContentURL];
}
- (BOOL)migrateV2CloudStore {
@@ -218,7 +218,7 @@ - (BOOL)migrateV2CloudStore {
URLByAppendingPathComponent:@"CloudStore.nosync" isDirectory:YES]
URLByAppendingPathComponent:uuid isDirectory:NO] URLByAppendingPathExtension:@"sqlite"];
- return [self migrateFromCloudStore:oldCloudStoreURL cloudContent:oldCloudContentURL contentName:uuid];
+ return [self migrateFromCloudStore:oldCloudStoreURL cloudContent:oldCloudContentURL];
}
- (BOOL)migrateV1LocalStore {
@@ -255,7 +255,7 @@ - (BOOL)migrateFromLocalStore:(NSURL *)oldLocalStoreURL {
return YES;
}
-- (BOOL)migrateFromCloudStore:(NSURL *)oldCloudStoreURL cloudContent:(NSURL *)oldCloudContentURL contentName:(NSString *)contentName {
+- (BOOL)migrateFromCloudStore:(NSURL *)oldCloudStoreURL cloudContent:(NSURL *)oldCloudContentURL {
if (![self.storeManager cloudSafeForSeeding]) {
inf(@"Can't migrate cloud store: A new cloud store already exists.");
@@ -274,7 +274,8 @@ - (BOOL)migrateFromCloudStore:(NSURL *)oldCloudStoreURL cloudContent:(NSURL *)ol
#pragma mark - UbiquityStoreManagerDelegate
-- (NSManagedObjectContext *)ubiquityStoreManager:(UbiquityStoreManager *)manager managedObjectContextForUbiquityChanges:(NSNotification *)note {
+- (NSManagedObjectContext *)ubiquityStoreManager:(UbiquityStoreManager *)manager
+ managedObjectContextForUbiquityChanges:(NSNotification *)note {
return [self mainManagedObjectContextIfReady];
}
@@ -578,7 +579,8 @@ - (MPImportResult)importSites:(NSString *)importedSitesString
// Ask for confirmation to import these sites and the master password of the user.
inf(@"Importing %lu sites, deleting %lu sites, for user: %@", (unsigned long)[importedSiteElements count], (unsigned long)[elementsToDelete count], [MPUserEntity idFor:importUserName]);
- NSString *userMasterPassword = askUserPassword( user? user.name: importUserName, [importedSiteElements count], [elementsToDelete count] );
+ NSString *userMasterPassword = askUserPassword( user? user.name: importUserName, [importedSiteElements count],
+ [elementsToDelete count] );
if (!userMasterPassword) {
inf(@"Import cancelled.");
return MPImportResultCancelled;
@@ -645,7 +647,7 @@ - (MPImportResult)importSites:(NSString *)importedSitesString
MPCheckpoint( MPCheckpointSitesImported, nil );
[[NSNotificationCenter defaultCenter] postNotificationName:MPSitesImportedNotification object:nil userInfo:@{
- MPSitesImportedNotificationUserKey: user
+ MPSitesImportedNotificationUserKey : user
}];
return MPImportResultSuccess;
View
@@ -0,0 +1,6 @@
+[![Gittip](http://img.shields.io/gittip/lhunath.png)](https://www.gittip.com/lhunath/)
+[![Travis CI](http://img.shields.io/travis-ci/Lyndir/MasterPassword.png)](https://travis-ci.org/Lyndir/MasterPassword)
+
+# Master Password
+
+Master Password is an algorithm and Java/iOS application to solve the real trouble with passwords.

0 comments on commit 9808613

Please sign in to comment.