Clean up ahead of PR.

This commit is contained in:
Matthew Chen 2018-01-29 12:50:17 -05:00
parent 3609275c20
commit 7ebeeda5f9
5 changed files with 16 additions and 28 deletions

View File

@ -785,16 +785,16 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
self.isEnvironmentSetup = YES;
//#ifdef DEBUG
// // A bug in orphan cleanup could be disastrous so let's only
// // run it in DEBUG builds for a few releases.
// //
// // TODO: Release to production once we have analytics.
// // TODO: Orphan cleanup is somewhat expensive - not least in doing a bunch
// // of disk access. We might want to only run it "once per version"
// // or something like that in production.
// [OWSOrphanedDataCleaner auditAndCleanupAsync:nil];
//#endif
#ifdef DEBUG
// A bug in orphan cleanup could be disastrous so let's only
// run it in DEBUG builds for a few releases.
//
// TODO: Release to production once we have analytics.
// TODO: Orphan cleanup is somewhat expensive - not least in doing a bunch
// of disk access. We might want to only run it "once per version"
// or something like that in production.
[OWSOrphanedDataCleaner auditAndCleanupAsync:nil];
#endif
[OWSProfileManager.sharedManager fetchLocalUsersProfile];
[[OWSReadReceiptManager sharedManager] prepareCachedValues];

View File

@ -1030,8 +1030,6 @@ NS_ASSUME_NONNULL_BEGIN
authorId:@"+19174054215"
sourceDeviceId:0
messageBody:randomText];
// DDLogError(@"%@ sendFakeMessages incoming timestamp: %llu.", self.logTag,
// message.timestamp);
[message markAsReadWithTransaction:transaction sendReadReceipt:NO updateExpiration:NO];
break;
}
@ -1040,8 +1038,6 @@ NS_ASSUME_NONNULL_BEGIN
[[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
inThread:thread
messageBody:randomText];
// DDLogError(@"%@ sendFakeMessages outgoing timestamp: %llu.", self.logTag,
// message.timestamp);
[message saveWithTransaction:transaction];
[message updateWithMessageState:TSOutgoingMessageStateUnsent transaction:transaction];
break;
@ -1069,8 +1065,6 @@ NS_ASSUME_NONNULL_BEGIN
pointer.uniqueId,
]
expiresInSeconds:0];
// DDLogError(@"%@ sendFakeMessages incoming attachment timestamp: %llu.", self.logTag,
// message.timestamp);
[message markAsReadWithTransaction:transaction sendReadReceipt:NO updateExpiration:NO];
break;
}
@ -1081,8 +1075,6 @@ NS_ASSUME_NONNULL_BEGIN
messageBody:nil
isVoiceMessage:NO
expiresInSeconds:0];
// DDLogError(@"%@ sendFakeMessages outgoing attachment timestamp: %llu.", self.logTag,
// message.timestamp);
NSString *filename = @"test.mp3";
UInt32 filesize = 16;

View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "SignalsNavigationController.h"
@ -36,11 +36,7 @@ static double const STALLED_PROGRESS = 0.9;
CGRect bar = self.navigationBar.frame;
_socketStatusView.frame = CGRectMake(0, bar.size.height - 1.0f, self.view.frame.size.width, 1.0f);
_socketStatusView.progress = 0.0f;
#ifdef INTERNAL
_socketStatusView.progressTintColor = [UIColor ows_destructiveRedColor];
#else
_socketStatusView.progressTintColor = [UIColor ows_fadedBlueColor];
#endif
if (![_socketStatusView superview]) {
[self.navigationBar addSubview:_socketStatusView];

View File

@ -162,7 +162,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSFail(@"%@ Missing path for attachment.", self.logTag);
return NO;
}
DDLogInfo(@"%@ Writing attachment data to file: %@", self.logTag, filePath);
DDLogInfo(@"%@ Writing attachment to file: %@", self.logTag, filePath);
return [data writeToFile:filePath options:0 error:error];
}
@ -175,7 +175,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSFail(@"%@ Missing path for attachment.", self.logTag);
return NO;
}
DDLogInfo(@"%@ Writing attachment data source to file: %@", self.logTag, filePath);
DDLogInfo(@"%@ Writing attachment to file: %@", self.logTag, filePath);
return [dataSource writeToPath:filePath];
}

View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "TSIncomingMessage.h"
@ -156,8 +156,8 @@ NS_ASSUME_NONNULL_BEGIN
return;
}
// DDLogDebug(
// @"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.logTag, self.uniqueId, self.timestamp);
DDLogDebug(
@"%@ marking as read uniqueId: %@ which has timestamp: %llu", self.logTag, self.uniqueId, self.timestamp);
_read = YES;
[self saveWithTransaction:transaction];
[self touchThreadWithTransaction:transaction];