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

Merge tag '2.13.4.0'

Browse Source 
// FREEBIE
This commit is contained in:
Matthew Chen 2017-07-27 15:04:03 -04:00
commit bca736a2b7
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Signal/src/AppDelegate.m
View File

@ -169,24 +169,16 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
UIViewController *viewController =
[[UIStoryboard storyboardWithName:@"Launch Screen" bundle:nil] instantiateInitialViewController];
BOOL shouldShowUpgradeLabel = NO;
NSString *lastAppVersion = AppVersion.instance.lastAppVersion;
NSString *lastLaunchedAppVersion = AppVersion.instance.lastAppVersion;
NSString *lastCompletedLaunchAppVersion = AppVersion.instance.lastCompletedLaunchAppVersion;
BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] &&
[VersionMigrations isVersion:lastAppVersion atLeast:@"2.0.0" andLessThan:@"2.13.0"]);
BOOL hasCompletedUpgrade = (lastCompletedLaunchAppVersion &&
[VersionMigrations isVersion:lastCompletedLaunchAppVersion atLeast:@"2.13.0"]);
// We added a number of database views in v2.13.0.
if (mayNeedUpgrade && !hasCompletedUpgrade) {
shouldShowUpgradeLabel = YES;
}
DDLogInfo(@"%@ shouldShowUpgradeLabel: %d, %d -> %d",
self.tag,
mayNeedUpgrade,
hasCompletedUpgrade,
shouldShowUpgradeLabel);
if (shouldShowUpgradeLabel) {
NSString *kLastVersionWithDatabaseViewChange = @"2.13.0";
BOOL mayNeedUpgrade = ([TSAccountManager isRegistered] && lastLaunchedAppVersion
&& (!lastCompletedLaunchAppVersion ||
[VersionMigrations isVersion:lastCompletedLaunchAppVersion
lessThan:kLastVersionWithDatabaseViewChange]));
DDLogInfo(@"%@ mayNeedUpgrade: %d", self.tag, mayNeedUpgrade);
if (mayNeedUpgrade) {
UIView *rootView = viewController.view;
UIImageView *iconView = nil;
for (UIView *subview in viewController.view.subviews) {

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

@ -59,6 +59,10 @@ NS_ASSUME_NONNULL_BEGIN
actionBlock:^{
[DebugUIMessages sendTextMessages:1000 thread:thread];
}],
[OWSTableItem itemWithTitle:@"Send 3,000 messages (1/sec.)"
actionBlock:^{
[DebugUIMessages sendTextMessages:3000 thread:thread];
}],
[OWSTableItem itemWithTitle:@"Send 10 tiny attachments"
actionBlock:^{
[DebugUIMessages sendTinyAttachments:10 thread:thread];
@ -71,6 +75,10 @@ NS_ASSUME_NONNULL_BEGIN
actionBlock:^{
[DebugUIMessages sendTinyAttachments:1000 thread:thread];
}],
[OWSTableItem itemWithTitle:@"Send 3,000 tiny attachments"
actionBlock:^{
[DebugUIMessages sendTinyAttachments:3000 thread:thread];
}],
[OWSTableItem itemWithTitle:@"Create 10 fake messages"
actionBlock:^{
[DebugUIMessages sendFakeMessages:10 thread:thread];

2
Signal/src/environment/VersionMigrations.h
View File

@ -18,4 +18,6 @@
+ (BOOL)isVersion:(NSString *)thisVersionString atLeast:(NSString *)thatVersionString;
+ (BOOL)isVersion:(NSString *)thisVersionString lessThan:(NSString *)thatVersionString;
@end