signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

CR: fixup nil/error handling

Browse Source
This commit is contained in:
Michael Kirk 2019-08-15 11:03:35 -06:00
parent 546dbb13c4
commit e490163896
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -2837,7 +2837,7 @@ typedef enum : NSUInteger {
_Nullable id<DataSource> dataSource = [DataSourcePath dataSourceWithURL:url
shouldDeleteOnDeallocation:NO
error:&error];
if (error != nil) {
if (dataSource == nil) {
OWSFailDebug(@"error: %@", error);
dispatch_async(dispatch_get_main_queue(), ^{

4
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
View File

@ -442,7 +442,7 @@ NS_ASSUME_NONNULL_BEGIN
_Nullable id<DataSource> dataSource = [DataSourcePath dataSourceWithFilePath:filePath
shouldDeleteOnDeallocation:NO
error:&error];
if (error != nil) {
if (dataSource == nil) {
OWSFailDebug(@"error while creating data source: %@", error);
failure();
return;
@ -1767,7 +1767,7 @@ NS_ASSUME_NONNULL_BEGIN
_Nullable id<DataSource> dataSource = [DataSourcePath dataSourceWithFilePath:filePath
shouldDeleteOnDeallocation:NO
error:&error];
OWSAssertDebug(error == nil);
OWSAssertDebug(dataSource != nil);
[dataSource setSourceFilename:filename];
SignalAttachment *attachment =
[SignalAttachment attachmentWithDataSource:dataSource dataUTI:utiType imageQuality:TSImageQualityOriginal];

4
Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
View File

@ -240,7 +240,7 @@ NS_ASSUME_NONNULL_BEGIN
_Nullable id<DataSource> dataSource = [DataSourcePath dataSourceWithFilePath:filePath
shouldDeleteOnDeallocation:YES
error:&error];
OWSAssertDebug(error == nil);
OWSAssertDebug(dataSource != nil);
[dataSource setSourceFilename:fileName];
SignalAttachment *attachment = [SignalAttachment attachmentWithDataSource:dataSource dataUTI:utiType];
NSData *databasePassword = [OWSPrimaryStorage.sharedManager databasePassword];
@ -279,7 +279,7 @@ NS_ASSUME_NONNULL_BEGIN
_Nullable id<DataSource> dataSource = [DataSourcePath dataSourceWithFilePath:filePath
shouldDeleteOnDeallocation:YES
error:&error];
if (error != nil) {
if (dataSource == nil) {
OWSFailDebug(@"Could not create dataSource: %@.", error);
return;
}