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

Merge branch 'mlin/PR/SchemaMigrationCrash' into release/5.21.2

Browse Source
This commit is contained in:
Michelle Linington 2021-09-30 13:01:06 -07:00
commit 75af0c570d
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
SignalMessaging/profiles/OWSProfileManager.m
View File

@ -220,12 +220,9 @@ const NSString *kNSNotificationKey_UserProfileWriter = @"kNSNotificationKey_User
- (OWSUserProfile *)localUserProfile
{
OWSAssertDebug(GRDBSchemaMigrator.areMigrationsComplete);
@synchronized(self)
{
@synchronized(self) {
if (_localUserProfile) {
OWSAssertDebug(_localUserProfile.profileKey);
return [_localUserProfile shallowCopy];
}
}
@ -239,14 +236,9 @@ const NSString *kNSNotificationKey_UserProfileWriter = @"kNSNotificationKey_User
// We first try using a read block to avoid opening a write block.
__block OWSUserProfile *_Nullable localUserProfile;
[self.databaseStorage readWithBlock:^(SDSAnyReadTransaction *transaction) {
localUserProfile = [OWSUserProfile getUserProfileForAddress:OWSUserProfile.localProfileAddress
transaction:transaction];
localUserProfile = [self getLocalUserProfileWithTransaction:transaction];
}];
if (localUserProfile != nil) {
@synchronized(self) {
_localUserProfile = localUserProfile;
}
return [localUserProfile shallowCopy];
}
@ -266,12 +258,10 @@ const NSString *kNSNotificationKey_UserProfileWriter = @"kNSNotificationKey_User
- (nullable OWSUserProfile *)getLocalUserProfileWithTransaction:(SDSAnyReadTransaction *)transaction
{
OWSAssertDebug(GRDBSchemaMigrator.areMigrationsComplete);
BOOL migrationsAreComplete = GRDBSchemaMigrator.areMigrationsComplete;
@synchronized(self) {
if (_localUserProfile) {
if (_localUserProfile && migrationsAreComplete) {
OWSAssertDebug(_localUserProfile.profileKey);
return [_localUserProfile shallowCopy];
}
}
@ -279,15 +269,12 @@ const NSString *kNSNotificationKey_UserProfileWriter = @"kNSNotificationKey_User
OWSUserProfile *_Nullable localUserProfile =
[OWSUserProfile getUserProfileForAddress:OWSUserProfile.localProfileAddress transaction:transaction];
if (localUserProfile != nil) {
if (migrationsAreComplete) {
@synchronized(self) {
_localUserProfile = localUserProfile;
}
return [localUserProfile shallowCopy];
}
OWSFailDebug(@"We're trying to fetch the local user profile before it exists. This shouldn't happen.");
return nil;
return [localUserProfile shallowCopy];
}
- (void)localProfileWasUpdated:(OWSUserProfile *)localUserProfile

6
SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift
View File

@ -1724,7 +1724,11 @@ public class GRDBSchemaMigrator: NSObject {
let transaction = GRDBWriteTransaction(database: db)
defer { transaction.finalizeTransaction() }
if Self.profileManager.localProfileAvatarData() != nil {
let avatarData = Self.profileManager.profileAvatarData(
for: OWSUserProfile.localProfileAddress,
transaction: transaction.asAnyWrite)
if avatarData != nil {
ExperienceUpgradeFinder.markAsComplete(experienceUpgradeId: .avatarBuilder, transaction: transaction)
}
}