Fixed CoreData → Yap account migration

ChatSecure/Classes/Controllers/OTRDatabaseManager.m

@@ -25,7 +25,6 @@
 #import "OTRManagedFacebookAccount.h"
 #import "OTRGoogleOAuthXMPPAccount.h"
 #import "OTRFacebookOAuthXMPPAccount.h"
-#import "OTRManagedXMPPTorAccount.h"
 #import "OTRAccount.h"
 #import "CoreData+MagicalRecord.h"
 #import "OTRMessage.h"
@@ -75,29 +74,18 @@ - (void)migrateCoreDataToYapDatabase
     {
         NSURL *mom2 = [[NSBundle mainBundle] URLForResource:@"ChatSecure 2" withExtension:@"mom" subdirectory:@"ChatSecure.momd"];
         NSURL *mom3 = [[NSBundle mainBundle] URLForResource:@"ChatSecure 3" withExtension:@"mom" subdirectory:@"ChatSecure.momd"];
-        NSURL *mom4 = [[NSBundle mainBundle] URLForResource:@"ChatSecure 4" withExtension:@"mom" subdirectory:@"ChatSecure.momd"];
         NSManagedObjectModel *version2Model = [[NSManagedObjectModel alloc] initWithContentsOfURL:mom2];
         NSManagedObjectModel *version3Model = [[NSManagedObjectModel alloc] initWithContentsOfURL:mom3];
-        NSManagedObjectModel *version4Model = [[NSManagedObjectModel alloc] initWithContentsOfURL:mom4];
 
         if ([OTRDatabaseManager isManagedObjectModel:version2Model compatibleWithStoreAtUrl:databaseURL]) {
-
-        }
-        else if ([OTRDatabaseManager isManagedObjectModel:version3Model compatibleWithStoreAtUrl:databaseURL]) {
-
-        }
-        else if ([OTRDatabaseManager isManagedObjectModel:version4Model compatibleWithStoreAtUrl:databaseURL]) {
-
+            [OTRDatabaseManager migrateLegacyStore:databaseURL destinationStore:databaseURL sourceModel:version2Model destinationModel:version3Model error:nil];
         }
 
 
         [MagicalRecord setShouldAutoCreateManagedObjectModel:NO];
         [MagicalRecord setDefaultModelNamed:@"ChatSecure.momd"];
         [MagicalRecord setupCoreDataStackWithAutoMigratingSqliteStoreNamed:@"ChatSecure.sqlite"];
 
-        //[OTREncryptionManager setFileProtection:NSFileProtectionCompleteUntilFirstUserAuthentication path:databaseURL.path];
-        //[OTREncryptionManager addSkipBackupAttributeToItemAtURL:databaseURL];
-
          ////// Migrate core data to yapdatabase //////
 
         NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
@@ -118,7 +106,7 @@ - (void)migrateCoreDataToYapDatabase
             }];
         }];
 
-
+        [[NSFileManager defaultManager] removeItemAtURL:databaseURL error:nil];
     }
 
     [OTRDatabaseManager deleteLegacyXMPPFiles];
@@ -140,7 +128,6 @@ - (OTRAccount *)accountWithCoreDataAccount:(OTRManagedAccount *)managedAccount
     account.displayName = accountDictionary[OTRManagedAccountAttributes.displayName];
     account.domain = accountDictionary[OTRManagedXMPPAccountAttributes.domain];
     account.port = [accountDictionary[OTRManagedXMPPAccountAttributes.port] intValue];
-    account.resource = accountDictionary[OTRManagedXMPPAccountAttributes.resource];
 
     ////// transfer saved passwords //////
 
@@ -169,9 +156,6 @@ - (OTRAccountType)accountTypeWithCoreDataClass:(NSString *)coreDataClass
     if ([coreDataClass isEqualToString:NSStringFromClass([OTRManagedXMPPAccount class])]) {
         return OTRAccountTypeJabber;
     }
-    else if ([coreDataClass isEqualToString:NSStringFromClass([OTRManagedXMPPTorAccount class])]) {
-        return OTRAccountTypeXMPPTor;
-    }
     else if ([coreDataClass isEqualToString:NSStringFromClass([OTRManagedGoogleAccount class])]) {
         return OTRAccountTypeGoogleTalk;
     }

ChatSecure/Classes/Model/Core Data/ChatSecure.xcdatamodeld/.xccurrentversion

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

ChatSecure/Classes/Model/Core Data/Human/OTRManagedBuddy.h

@@ -1,29 +1,5 @@
-//
-//  OTRManagedBuddy.h
-//  Off the Record
-//
-//  Created by Christopher Ballinger on 1/10/13.
-//  Copyright (c) 2013 Chris Ballinger. All rights reserved.
-//
-//  This file is part of ChatSecure.
-//
-//  ChatSecure is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  ChatSecure is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with ChatSecure.  If not, see <http://www.gnu.org/licenses/>.
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
 #import "_OTRManagedBuddy.h"
 
-@interface OTRManagedBuddy : _OTRManagedBuddy
-
+@interface OTRManagedBuddy : _OTRManagedBuddy {}
+// Custom logic goes here.
 @end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedBuddy.m

@@ -1,28 +1,13 @@
-//
-//  OTRManagedBuddy.m
-//  Off the Record
-//
-//  Created by Christopher Ballinger on 1/10/13.
-//  Copyright (c) 2013 Chris Ballinger. All rights reserved.
-//
-//  This file is part of ChatSecure.
-//
-//  ChatSecure is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  ChatSecure is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with ChatSecure.  If not, see <http://www.gnu.org/licenses/>.
-
 #import "OTRManagedBuddy.h"
 
+@interface OTRManagedBuddy ()
+
+// Private interface goes here.
+
+@end
+
 @implementation OTRManagedBuddy
 
+// Custom logic goes here.
 
 @end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedEncryptionStatusMessage.h

@@ -0,0 +1,5 @@
+#import "_OTRManagedEncryptionStatusMessage.h"
+
+@interface OTRManagedEncryptionStatusMessage : _OTRManagedEncryptionStatusMessage {}
+// Custom logic goes here.
+@end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedEncryptionStatusMessage.m

@@ -0,0 +1,13 @@
+#import "OTRManagedEncryptionStatusMessage.h"
+
+@interface OTRManagedEncryptionStatusMessage ()
+
+// Private interface goes here.
+
+@end
+
+@implementation OTRManagedEncryptionStatusMessage
+
+// Custom logic goes here.
+
+@end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedFacebookAccount.h

@@ -1,5 +1,5 @@
-#import "_OTRmanagedFacebookAccount.h"
+#import "_OTRManagedFacebookAccount.h"
 
-@interface OTRManagedFacebookAccount : _OTRManagedFacebookAccount
+@interface OTRManagedFacebookAccount : _OTRManagedFacebookAccount {}
 // Custom logic goes here.
 @end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedFacebookAccount.m

@@ -1,14 +1,13 @@
-#import "OTRmanagedFacebookAccount.h"
-
+#import "OTRManagedFacebookAccount.h"
 
 @interface OTRManagedFacebookAccount ()
 
 // Private interface goes here.
 
 @end
 
-
 @implementation OTRManagedFacebookAccount
 
+// Custom logic goes here.
 
 @end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedGoogleAccount.h

@@ -1,5 +1,5 @@
 #import "_OTRManagedGoogleAccount.h"
 
-@interface OTRManagedGoogleAccount : _OTRManagedGoogleAccount
+@interface OTRManagedGoogleAccount : _OTRManagedGoogleAccount {}
 // Custom logic goes here.
 @end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedGoogleAccount.m

@@ -6,8 +6,8 @@ @interface OTRManagedGoogleAccount ()
 
 @end
 
-
 @implementation OTRManagedGoogleAccount
 
+// Custom logic goes here.
 
 @end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedGroup.h

@@ -1,6 +1,5 @@
 #import "_OTRManagedGroup.h"
 
 @interface OTRManagedGroup : _OTRManagedGroup {}
-
-
+// Custom logic goes here.
 @end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedGroup.m

@@ -1,11 +1,13 @@
 #import "OTRManagedGroup.h"
-#import "OTRLog.h"
 
 @interface OTRManagedGroup ()
 
-@end
+// Private interface goes here.
 
+@end
 
 @implementation OTRManagedGroup
 
+// Custom logic goes here.
+
 @end

ChatSecure/Classes/Model/Core Data/Human/OTRManagedMessage.h

@@ -1,29 +1,5 @@
-//
-//  OTRManagedMessage.h
-//  Off the Record
-//
-//  Created by Christopher Ballinger on 1/10/13.
-//  Copyright (c) 2013 Chris Ballinger. All rights reserved.
-//
-//  This file is part of ChatSecure.
-//
-//  ChatSecure is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  ChatSecure is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with ChatSecure.  If not, see <http://www.gnu.org/licenses/>.
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
 #import "_OTRManagedMessage.h"
 
-@interface OTRManagedMessage : _OTRManagedMessage
-
+@interface OTRManagedMessage : _OTRManagedMessage {}
+// Custom logic goes here.
 @end