Skip to content

Commit 22dd6a9

Browse files
fix test
1 parent e3d6db6 commit 22dd6a9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ChatSecure/Classes/Controllers/OTRDatabaseManager.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,12 @@ + (BOOL)existsYapDatabase
301301

302302
- (BOOL) setDatabasePassphrase:(NSString *)passphrase remember:(BOOL)rememeber error:(NSError**)error
303303
{
304-
BOOL result = NO;
304+
BOOL result = YES;
305305
if (rememeber) {
306306
self.inMemoryPassphrase = nil;
307307
result = [SAMKeychain setPassword:passphrase forService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName error:error];
308308
} else {
309-
result = [SAMKeychain deletePasswordForService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName];
309+
[SAMKeychain deletePasswordForService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName];
310310
self.inMemoryPassphrase = passphrase;
311311
}
312312
return result;

ChatSecureTests/OTRTestDatabase.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import UIKit
1111

1212
extension OTRDatabaseManager {
1313
func setupTestDatabase(name: String) {
14-
setDatabasePassphrase("password", remember: false, error: nil)
14+
try! setDatabasePassphrase("password", remember: false)
1515
let uuid = UUID().uuidString
1616
let tmpDir = NSTemporaryDirectory() as NSString
1717
let databaseDir = tmpDir.appendingPathComponent(uuid)

0 commit comments

Comments
 (0)