Fix static analyzer warnings

chrisballinger · chrisballinger · commit c30e66ee2b99 · 2018-07-08T15:24:46.000-07:00
diff --git a/ChatSecure.xcodeproj/project.pbxproj b/ChatSecure.xcodeproj/project.pbxproj
@@ -3523,7 +3523,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 4T8JLQR6GR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
@@ -3561,7 +3561,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = 4T8JLQR6GR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
diff --git a/ChatSecure/Classes/Controllers/FileTransferManager.swift b/ChatSecure/Classes/Controllers/FileTransferManager.swift
@@ -360,7 +360,9 @@ public class FileTransferManager: NSObject, OTRServerCapabilitiesDelegate {
             }
             mediaItem.parentObjectKey = message.messageKey
             mediaItem.parentObjectCollection = message.messageCollection
-            let newPath = OTRMediaFileManager.path(for: mediaItem, buddyUniqueId: thread.threadIdentifier)
+            guard let newPath = OTRMediaFileManager.path(for: mediaItem, buddyUniqueId: thread.threadIdentifier) else {
+                return
+            }
             self.connection.readWrite { transaction in
                 message.save(with: transaction)
                 mediaItem.save(with: transaction)
diff --git a/ChatSecure/Classes/Controllers/OTRAttachmentPicker.m b/ChatSecure/Classes/Controllers/OTRAttachmentPicker.m
@@ -110,7 +110,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
             finalImage = originalImage;
         }
         
-        if ([self.delegate respondsToSelector:@selector(attachmentPicker:gotPhoto:withInfo:)]) {
+        if (finalImage && [self.delegate respondsToSelector:@selector(attachmentPicker:gotPhoto:withInfo:)]) {
             [self.delegate attachmentPicker:self gotPhoto:finalImage withInfo:info];
         }
         
diff --git a/ChatSecure/Classes/Controllers/OTRAudioPlaybackController.h b/ChatSecure/Classes/Controllers/OTRAudioPlaybackController.h
@@ -16,7 +16,7 @@
 @property (nonatomic, strong, readonly) OTRAudioItem *currentAudioItem;
 @property (nonatomic, weak, readonly) OTRAudioControlsView *currentAudioControlsView;
 
-- (void)playAudioItem:(OTRAudioItem *)audioItem buddyUniqueId:(NSString *)buddyUniqueId error:(NSError **)error;
+- (BOOL)playAudioItem:(OTRAudioItem *)audioItem buddyUniqueId:(NSString *)buddyUniqueId error:(NSError **)error;
 
 - (void)attachAudioControlsView:(OTRAudioControlsView *)audioControlsView;
 
diff --git a/ChatSecure/Classes/Controllers/OTRAudioPlaybackController.m b/ChatSecure/Classes/Controllers/OTRAudioPlaybackController.m
@@ -44,18 +44,19 @@ - (void)updateTimeLabel
     [self.currentAudioControlsView setTime:currentTime];
 }
 
-- (void)playURL:(NSURL *)url error:(NSError **)error;
+- (BOOL)playURL:(NSURL *)url error:(NSError **)error;
 {
     AVURLAsset *asset = [AVURLAsset assetWithURL:url];
     self.duration = CMTimeGetSeconds(asset.duration);
     self.currentAudioControlsView.playPuaseProgressView.status = OTRPlayPauseProgressViewStatusPause;
     error = nil;
-    [self.audioSessionManager playAudioWithURL:url error:error];
+    BOOL result = [self.audioSessionManager playAudioWithURL:url error:error];
     
     self.currentAudioControlsView.playPuaseProgressView.status = OTRPlayPauseProgressViewStatusPause;
     [self.currentAudioControlsView setTime:0];
     
     [self startLabelTimer];
+    return result;
 }
 
 - (void)startLabelTimer
@@ -93,13 +94,13 @@ - (void)startAnimatingArc
 
 #pragma - mark Public Methods
 
-- (void)playAudioItem:(OTRAudioItem *)audioItem buddyUniqueId:(NSString *)buddyUniqueId error:(NSError *__autoreleasing *)error
+- (BOOL)playAudioItem:(OTRAudioItem *)audioItem buddyUniqueId:(NSString *)buddyUniqueId error:(NSError *__autoreleasing *)error
 {
     NSURL *audioURL = [[OTRMediaServer sharedInstance] urlForMediaItem:audioItem buddyUniqueId:buddyUniqueId];
     
     _currentAudioItem = audioItem;
     
-    [self playURL:audioURL error:error];
+    return [self playURL:audioURL error:error];
 }
 
 - (void)attachAudioControlsView:(OTRAudioControlsView *)audioControlsView
diff --git a/ChatSecure/Classes/Controllers/OTRAudioSessionManager.h b/ChatSecure/Classes/Controllers/OTRAudioSessionManager.h
@@ -25,7 +25,7 @@
 
 @property (nonatomic, weak) id<OTRAudioSessionManagerDelegate> delegate;
 
-- (void)playAudioWithURL:(NSURL *)url error:(NSError **)error;
+- (BOOL)playAudioWithURL:(NSURL *)url error:(NSError **)error;
 - (void)pausePlaying;
 - (void)resumePlaying;
 - (void)stopPlaying;
@@ -34,7 +34,7 @@
 - (NSURL *)currentPlayerURL;
 - (BOOL)isPlaying;
 
-- (void)recordAudioToURL:(NSURL *)url error:(NSError **)error;
+- (BOOL)recordAudioToURL:(NSURL *)url error:(NSError **)error;
 - (void)stopRecording;
 - (NSTimeInterval)currentTimeRecordTime;
 - (NSURL *)currentRecorderURL;
diff --git a/ChatSecure/Classes/Controllers/OTRAudioSessionManager.m b/ChatSecure/Classes/Controllers/OTRAudioSessionManager.m
@@ -49,28 +49,30 @@ - (BOOL)isPlaying
 #pragma - mark Public Methods
 
 ////// Playing //////
-- (void)playAudioWithURL:(NSURL *)url error:(NSError **)error
+- (BOOL)playAudioWithURL:(NSURL *)url error:(NSError **)error
 {
     [self stopPlaying];
     [self stopRecording];
     error = nil;
     
     [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:error];
     if (error) {
-        return;
+        return NO;
     }
     [[AVAudioSession sharedInstance] setMode:AVAudioSessionModeSpokenAudio error:error];
     if (error) {
-        return;
+        return NO;
     }
     
     error = nil;
     self.currentPlayer = [self audioPlayerWithURL:url error:error];
     if (error) {
-        return;
+        return NO;
     }
     
     [self.currentPlayer play];
+    
+    return YES;
 }
 
 - (void)pausePlaying
@@ -119,30 +121,32 @@ - (NSURL *)currentPlayerURL
 }
 
 ////// Recording //////
-- (void)recordAudioToURL:(NSURL *)url error:(NSError **)error
+- (BOOL)recordAudioToURL:(NSURL *)url error:(NSError **)error
 {
     [self stopRecording];
     [self stopPlaying];
     
     [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryRecord error:error];
     if (error) {
-        return;
+        return NO;
     }
     [[AVAudioSession sharedInstance] setMode:AVAudioSessionModeSpokenAudio error:error];
     if (error) {
-        return;
+        return NO;
     }
     
     self.currentRecorder = [self audioRecorderWithURL:url error:error];
     
     if (error) {
-        return;
+        return NO;
     }
     
     self.currentRecorder.meteringEnabled = YES;
     self.recordDecibelTimer = [NSTimer scheduledTimerWithTimeInterval:0.03 target:self selector:@selector(updateDecibelRecording:) userInfo:nil repeats:YES];
     
     [self.currentRecorder record];
+    
+    return YES;
 }
 
 - (void)stopRecording
@@ -179,9 +183,9 @@ - (NSURL *)currentRecorderURL
 
 #pragma - mark Private Methods
 
-- (void)deactivateSession:(NSError **)error
+- (BOOL)deactivateSession:(NSError **)error
 {
-    [[AVAudioSession sharedInstance] setActive:NO withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:error];
+    return [[AVAudioSession sharedInstance] setActive:NO withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:error];
 }
 
 - (AVPlayer *)audioPlayerWithURL:(NSURL *)url error:(NSError **)error
diff --git a/ChatSecure/Classes/Controllers/OTRDatabaseManager.h b/ChatSecure/Classes/Controllers/OTRDatabaseManager.h
@@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN
                     directory:(nullable NSString*)directory
                   withMediaStorage:(BOOL)withMediaStorage;
 
-- (void)setDatabasePassphrase:(NSString *)passphrase remember:(BOOL)rememeber error:(NSError *_Nullable*)error;
+- (BOOL)setDatabasePassphrase:(NSString *)passphrase remember:(BOOL)rememeber error:(NSError *_Nullable*)error;
 
 
 - (BOOL)hasPassphrase;
diff --git a/ChatSecure/Classes/Controllers/OTRDatabaseManager.m b/ChatSecure/Classes/Controllers/OTRDatabaseManager.m
@@ -299,15 +299,17 @@ + (BOOL)existsYapDatabase
     return [[NSFileManager defaultManager] fileExistsAtPath:[self defaultYapDatabasePathWithName:OTRYapDatabaseName]];
 }
 
-- (void) setDatabasePassphrase:(NSString *)passphrase remember:(BOOL)rememeber error:(NSError**)error
+- (BOOL) setDatabasePassphrase:(NSString *)passphrase remember:(BOOL)rememeber error:(NSError**)error
 {
+    BOOL result = NO;
     if (rememeber) {
         self.inMemoryPassphrase = nil;
-        [SAMKeychain setPassword:passphrase forService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName error:error];
+        result = [SAMKeychain setPassword:passphrase forService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName error:error];
     } else {
-        [SAMKeychain deletePasswordForService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName];
+        result = [SAMKeychain deletePasswordForService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName];
         self.inMemoryPassphrase = passphrase;
     }
+    return result;
 }
 
 - (BOOL)hasPassphrase
diff --git a/ChatSecure/Classes/Controllers/OTRMediaFileManager.h b/ChatSecure/Classes/Controllers/OTRMediaFileManager.h
@@ -43,8 +43,8 @@ completionQueue:(nullable dispatch_queue_t)completionQueue;
                   buddyUniqueId:(NSString *)buddyUniqueId
                           error:(NSError* __autoreleasing *)error;
 
-+ (NSString *)pathForMediaItem:(OTRMediaItem *)mediaItem buddyUniqueId:(NSString *)buddyUniqueId;
-+ (NSString *)pathForMediaItem:(OTRMediaItem *)mediaItem buddyUniqueId:(NSString *)buddyUniqueId withLeadingSlash:(BOOL)includeLeadingSlash;
++ (nullable NSString *)pathForMediaItem:(OTRMediaItem *)mediaItem buddyUniqueId:(NSString *)buddyUniqueId;
++ (nullable NSString *)pathForMediaItem:(OTRMediaItem *)mediaItem buddyUniqueId:(NSString *)buddyUniqueId withLeadingSlash:(BOOL)includeLeadingSlash;
 
 @property (class, nonatomic, readonly) OTRMediaFileManager *shared;
 
diff --git a/ChatSecure/Classes/Controllers/OTRSettingsManager.m b/ChatSecure/Classes/Controllers/OTRSettingsManager.m
@@ -64,11 +64,11 @@ - (void) populateSettings
     [settingsGroups addObject:accountsGroup];
     
     if (OTRBranding.allowsDonation) {
-        NSString *donateTitle = DONATE_STRING();
+        NSString *donateTitle = nil;
         if (TransactionObserver.hasValidReceipt) {
             donateTitle = [NSString stringWithFormat:@"%@    ✅", DONATE_STRING()];
         } else {
-            donateTitle = [NSString stringWithFormat:@"%@    🆕", DONATE_STRING()];
+            donateTitle = [NSString stringWithFormat:@"%@    🎁", DONATE_STRING()];
         }
         OTRDonateSetting *donateSetting = [[OTRDonateSetting alloc] initWithTitle:donateTitle description:nil];
         //donateSetting.imageName = @"29-heart.png";
diff --git a/ChatSecure/Classes/Controllers/XMPP/OTRServerCapabilities.m b/ChatSecure/Classes/Controllers/XMPP/OTRServerCapabilities.m
@@ -279,6 +279,9 @@ - (void)handleDiscoverServicesQueryIQ:(XMPPIQ *)iq withInfo:(XMPPBasicTrackingIn
                                            xmlns:XMPPDiscoverItemsNamespace];
         
         NSArray<NSXMLElement*> *items = [query elementsForName:@"item"];
+        if (!items) {
+            items = @[];
+        }
         self.discoveredServices = [items copy];
         [self->multicastDelegate serverCapabilities:self didDiscoverServices:items];
         
diff --git a/ChatSecure/Classes/Controllers/XMPP/OTRXMPPManager.m b/ChatSecure/Classes/Controllers/XMPP/OTRXMPPManager.m
@@ -301,8 +301,6 @@ - (void)teardownStream
     [_messageStatusModule deactivate];
     [_omemoModule deactivate];
     [_serverCheck deactivate];
-    _serverCheck = nil;
-    _fileTransferManager = nil;
 
     [_xmppStream disconnect];
 }
@@ -405,7 +403,7 @@ - (NSString *)accountDomainWithError:(id)error;
 - (void)didRegisterNewAccountWithStream:(XMPPStream *)stream
 {
     self.isRegisteringNewAccount = NO;
-    [self authenticateWithStream:stream];
+    [self authenticateWithStream:stream error:nil];
 }
 
 - (void)failedToRegisterNewAccount:(NSError *)error
@@ -414,15 +412,15 @@ - (void)failedToRegisterNewAccount:(NSError *)error
     [self failedToConnect:error];
 }
 
-- (void)authenticateWithStream:(XMPPStream *)stream {
-    NSError * error = nil;
-    BOOL status = YES;
+- (BOOL)authenticateWithStream:(XMPPStream *)stream error:(NSError**)error {
+    BOOL status = NO;
     if ([stream supportsXOAuth2GoogleAuthentication] && self.account.accountType == OTRAccountTypeGoogleTalk) {
-        status = [stream authenticateWithGoogleAccessToken:self.account.password error:&error];
+        status = [stream authenticateWithGoogleAccessToken:self.account.password error:error];
     }
     else {
-        status = [stream authenticateWithPassword:self.account.password error:&error];
+        status = [stream authenticateWithPassword:self.account.password error:error];
     }
+    return status;
 }
 
 ///////////////////////////////
@@ -449,8 +447,7 @@ - (BOOL)startConnection
     }
     self.xmppStream.myJID = jid;
 	if (![self.xmppStream isDisconnected]) {
-        [self authenticateWithStream:self.xmppStream];
-		return YES;
+        return [self authenticateWithStream:self.xmppStream error:nil];
 	}
     
 	//
@@ -807,7 +804,7 @@ - (void)xmppStreamDidConnect:(XMPPStream *)sender
         [self continueRegisteringNewAccount];
     }
     else{
-        [self authenticateWithStream:sender];
+        [self authenticateWithStream:sender error:nil];
     }
     
     self.loginStatus = OTRLoginStatusAuthenticating;
diff --git a/ChatSecure/Classes/Controllers/XMPP/OTRXMPPTorManager.m b/ChatSecure/Classes/Controllers/XMPP/OTRXMPPTorManager.m
@@ -59,7 +59,7 @@ - (NSString *)accountDomainWithError:(NSError**)error;
         domainString = jid.domain;
     }
     
-    if (!domainString.length) {
+    if (!domainString.length && error) {
         *error = [NSError errorWithDomain:OTRXMPPErrorDomain code:OTRXMPPErrorCodeDomainError userInfo:@{NSLocalizedDescriptionKey:@"Tor accounts require a valid domain"}];
     }
     
diff --git a/ChatSecure/Classes/Model/OTRToastOptions.m b/ChatSecure/Classes/Model/OTRToastOptions.m
@@ -68,9 +68,6 @@ - (void)addInteractionResponderWithType:(int)type
                    automaticallyDismiss:(BOOL)automaticallyDismiss
                                   block:(void (^)(int interactionType))block
 {
-    if (!block) {
-        block = ^void(int interactionType) { };
-    }
     /*
     CRToastInteractionResponder *interactionResponder = [CRToastInteractionResponder interactionResponderWithInteractionType:type automaticallyDismiss:automaticallyDismiss block:block];
     
diff --git a/ChatSecure/Classes/Model/Yap Storage/OTRMediaItem.m b/ChatSecure/Classes/Model/Yap Storage/OTRMediaItem.m
@@ -109,9 +109,11 @@ + (instancetype) incomingItemWithFilename:(NSString*)filename
     } else {
         mediaClass = [OTRFileItem class];
     }
-    
     if (mediaClass) {
         mediaItem = [[mediaClass alloc] initWithFilename:filename mimeType:mimeType isIncoming:YES];
+    } else {
+        // satisfying the static analyzer
+        mediaItem = [[OTRFileItem alloc] initWithFilename:filename mimeType:mimeType isIncoming:YES];
     }
     return mediaItem;
 }
diff --git a/ChatSecure/Classes/Utilities/OTRColors.m b/ChatSecure/Classes/Utilities/OTRColors.m
@@ -16,13 +16,12 @@ +(UIColor *)colorWithStatus:(OTRThreadStatus)status
     if (!OTRBranding.showsColorForStatus) {
         return [UIColor clearColor];
     }
-    UIColor *color = [UIColor clearColor];
+    UIColor *color = nil;
     switch(status)
     {
         case OTRThreadStatusUnknown:
         case OTRThreadStatusOffline:
-            //color = [UIColor colorWithRed: 0.763 green: 0.763 blue: 0.763 alpha: 1];
-            return [UIColor clearColor];
+            color = [UIColor clearColor];
             break;
         case OTRThreadStatusAway:
             color = [UIColor colorWithRed: 0.901 green: 0.527 blue: 0.23 alpha: 1];
diff --git a/ChatSecure/Classes/Utilities/OTRUtilities.m b/ChatSecure/Classes/Utilities/OTRUtilities.m
@@ -124,28 +124,20 @@ +(NSArray *)cipherSuites
     
     //GEt number of Supported Ciphers
     status = SSLGetNumberSupportedCiphers(sslContext, &numCiphers);
-    //DDLogVerbose(@"SSLGetNumberSupportedCiphers result %d, count %d",(int)status, (int)numCiphers);
+    DDLogVerbose(@"SSLGetNumberSupportedCiphers result %d, count %d",(int)status, (int)numCiphers);
     SSLCipherSuite ciphers[numCiphers];
     
     //Get list of Supported Ciphers
     status = SSLGetSupportedCiphers(sslContext, ciphers, &numCiphers);
-    //DDLogVerbose(@"SSLGetSupportedCiphers result %d",(int)status);
+    DDLogVerbose(@"SSLGetSupportedCiphers result %d",(int)status);
     
-    
-    //NSMutableArray * discardedCiphers = [NSMutableArray array];
     for (int index = 0; index < numCiphers; index++) {
         if ([self useCipher:ciphers[index]]) {
             NSNumber * cipher = [NSNumber numberWithUnsignedShort: ciphers[index]];
             [cipherSuitesArray addObject:cipher];
-        }/**
-          * Used to detect discarded ciphers
-        else {
-            
-            NSNumber * cipher = [NSNumber numberWithUnsignedShort: ciphers[index]];
-            DDLogVerbose(@"Hex value is 0x%02x", (unsigned int) ciphers[index]);
-            [discardedCiphers addObject:cipher];
-        }*/
+        }
     }
+    CFRelease(sslContext);
     
     return cipherSuitesArray;
 }
diff --git a/ChatSecure/Classes/View Controllers/OTRCertificateDomainViewController.m b/ChatSecure/Classes/View Controllers/OTRCertificateDomainViewController.m
@@ -29,6 +29,7 @@ - (void)viewDidLoad
 
 -(void)viewWillAppear:(BOOL)animated
 {
+    [super viewWillAppear:animated];
     [self refreshData];
     
     [self.tableView reloadData];
diff --git a/ChatSecure/Classes/View Controllers/OTRComposeViewController.m b/ChatSecure/Classes/View Controllers/OTRComposeViewController.m
diff --git a/ChatSecure/Classes/View Controllers/OTRMessagesViewController.m b/ChatSecure/Classes/View Controllers/OTRMessagesViewController.m
diff --git a/ChatSecure/Classes/View Controllers/OTRSettingsViewController.m b/ChatSecure/Classes/View Controllers/OTRSettingsViewController.m
diff --git a/ChatSecure/Classes/Views/Cells/XMPPServerInfoCell.m b/ChatSecure/Classes/Views/Cells/XMPPServerInfoCell.m

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking`
`110`	`110`	`finalImage = originalImage;`
`111`	`111`	`}`
`112`	`112`
`113`		`- if ([self.delegate respondsToSelector:@selector(attachmentPicker:gotPhoto:withInfo:)]) {`
	`113`	`+ if (finalImage && [self.delegate respondsToSelector:@selector(attachmentPicker:gotPhoto:withInfo:)]) {`
`114`	`114`	`[self.delegate attachmentPicker:self gotPhoto:finalImage withInfo:info];`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -44,18 +44,19 @@ - (void)updateTimeLabel`
`44`	`44`	`[self.currentAudioControlsView setTime:currentTime];`
`45`	`45`	`}`
`46`	`46`
`47`		`-- (void)playURL:(NSURL )url error:(NSError *)error;`
	`47`	`+- (BOOL)playURL:(NSURL )url error:(NSError *)error;`
`48`	`48`	`{`
`49`	`49`	`AVURLAsset *asset = [AVURLAsset assetWithURL:url];`
`50`	`50`	`self.duration = CMTimeGetSeconds(asset.duration);`
`51`	`51`	`self.currentAudioControlsView.playPuaseProgressView.status = OTRPlayPauseProgressViewStatusPause;`
`52`	`52`	`error = nil;`
`53`		`- [self.audioSessionManager playAudioWithURL:url error:error];`
	`53`	`+ BOOL result = [self.audioSessionManager playAudioWithURL:url error:error];`
`54`	`54`
`55`	`55`	`self.currentAudioControlsView.playPuaseProgressView.status = OTRPlayPauseProgressViewStatusPause;`
`56`	`56`	`[self.currentAudioControlsView setTime:0];`
`57`	`57`
`58`	`58`	`[self startLabelTimer];`
	`59`	`+ return result;`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`- (void)startLabelTimer`
`@@ -93,13 +94,13 @@ - (void)startAnimatingArc`
`93`	`94`
`94`	`95`	`#pragma - mark Public Methods`
`95`	`96`
`96`		`-- (void)playAudioItem:(OTRAudioItem )audioItem buddyUniqueId:(NSString )buddyUniqueId error:(NSError __autoreleasing )error`
	`97`	`+- (BOOL)playAudioItem:(OTRAudioItem )audioItem buddyUniqueId:(NSString )buddyUniqueId error:(NSError __autoreleasing )error`
`97`	`98`	`{`
`98`	`99`	`NSURL *audioURL = [[OTRMediaServer sharedInstance] urlForMediaItem:audioItem buddyUniqueId:buddyUniqueId];`
`99`	`100`
`100`	`101`	`_currentAudioItem = audioItem;`
`101`	`102`
`102`		`- [self playURL:audioURL error:error];`
	`103`	`+ return [self playURL:audioURL error:error];`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`- (void)attachAudioControlsView:(OTRAudioControlsView *)audioControlsView`
Original file line number	Diff line number	Diff line change
`@@ -49,28 +49,30 @@ - (BOOL)isPlaying`
`49`	`49`	`#pragma - mark Public Methods`
`50`	`50`
`51`	`51`	`////// Playing //////`
`52`		`-- (void)playAudioWithURL:(NSURL )url error:(NSError *)error`
	`52`	`+- (BOOL)playAudioWithURL:(NSURL )url error:(NSError *)error`
`53`	`53`	`{`
`54`	`54`	`[self stopPlaying];`
`55`	`55`	`[self stopRecording];`
`56`	`56`	`error = nil;`
`57`	`57`
`58`	`58`	`[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:error];`
`59`	`59`	`if (error) {`
`60`		`- return;`
	`60`	`+ return NO;`
`61`	`61`	`}`
`62`	`62`	`[[AVAudioSession sharedInstance] setMode:AVAudioSessionModeSpokenAudio error:error];`
`63`	`63`	`if (error) {`
`64`		`- return;`
	`64`	`+ return NO;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`error = nil;`
`68`	`68`	`self.currentPlayer = [self audioPlayerWithURL:url error:error];`
`69`	`69`	`if (error) {`
`70`		`- return;`
	`70`	`+ return NO;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`[self.currentPlayer play];`
	`74`	`+`
	`75`	`+ return YES;`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`- (void)pausePlaying`
`@@ -119,30 +121,32 @@ - (NSURL *)currentPlayerURL`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`////// Recording //////`
`122`		`-- (void)recordAudioToURL:(NSURL )url error:(NSError *)error`
	`124`	`+- (BOOL)recordAudioToURL:(NSURL )url error:(NSError *)error`
`123`	`125`	`{`
`124`	`126`	`[self stopRecording];`
`125`	`127`	`[self stopPlaying];`
`126`	`128`
`127`	`129`	`[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryRecord error:error];`
`128`	`130`	`if (error) {`
`129`		`- return;`
	`131`	`+ return NO;`
`130`	`132`	`}`
`131`	`133`	`[[AVAudioSession sharedInstance] setMode:AVAudioSessionModeSpokenAudio error:error];`
`132`	`134`	`if (error) {`
`133`		`- return;`
	`135`	`+ return NO;`
`134`	`136`	`}`
`135`	`137`
`136`	`138`	`self.currentRecorder = [self audioRecorderWithURL:url error:error];`
`137`	`139`
`138`	`140`	`if (error) {`
`139`		`- return;`
	`141`	`+ return NO;`
`140`	`142`	`}`
`141`	`143`
`142`	`144`	`self.currentRecorder.meteringEnabled = YES;`
`143`	`145`	`self.recordDecibelTimer = [NSTimer scheduledTimerWithTimeInterval:0.03 target:self selector:@selector(updateDecibelRecording:) userInfo:nil repeats:YES];`
`144`	`146`
`145`	`147`	`[self.currentRecorder record];`
	`148`	`+`
	`149`	`+ return YES;`
`146`	`150`	`}`
`147`	`151`
`148`	`152`	`- (void)stopRecording`
`@@ -179,9 +183,9 @@ - (NSURL *)currentRecorderURL`
`179`	`183`
`180`	`184`	`#pragma - mark Private Methods`
`181`	`185`
`182`		`-- (void)deactivateSession:(NSError **)error`
	`186`	`+- (BOOL)deactivateSession:(NSError **)error`
`183`	`187`	`{`
`184`		`- [[AVAudioSession sharedInstance] setActive:NO withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:error];`
	`188`	`+ return [[AVAudioSession sharedInstance] setActive:NO withOptions:AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation error:error];`
`185`	`189`	`}`
`186`	`190`
`187`	`191`	`- (AVPlayer )audioPlayerWithURL:(NSURL )url error:(NSError **)error`
Original file line number	Diff line number	Diff line change
`@@ -299,15 +299,17 @@ + (BOOL)existsYapDatabase`
`299`	`299`	`return [[NSFileManager defaultManager] fileExistsAtPath:[self defaultYapDatabasePathWithName:OTRYapDatabaseName]];`
`300`	`300`	`}`
`301`	`301`
`302`		`-- (void) setDatabasePassphrase:(NSString )passphrase remember:(BOOL)rememeber error:(NSError*)error`
	`302`	`+- (BOOL) setDatabasePassphrase:(NSString )passphrase remember:(BOOL)rememeber error:(NSError*)error`
`303`	`303`	`{`
	`304`	`+ BOOL result = NO;`
`304`	`305`	`if (rememeber) {`
`305`	`306`	`self.inMemoryPassphrase = nil;`
`306`		`- [SAMKeychain setPassword:passphrase forService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName error:error];`
	`307`	`+ result = [SAMKeychain setPassword:passphrase forService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName error:error];`
`307`	`308`	`} else {`
`308`		`- [SAMKeychain deletePasswordForService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName];`
	`309`	`+ result = [SAMKeychain deletePasswordForService:kOTRServiceName account:OTRYapDatabasePassphraseAccountName];`
`309`	`310`	`self.inMemoryPassphrase = passphrase;`
`310`	`311`	`}`
	`312`	`+ return result;`
`311`	`313`	`}`
`312`	`314`
`313`	`315`	`- (BOOL)hasPassphrase`