Skip to content

Commit

Permalink
Always write the manifest in multiRemove (#18613)
Browse files Browse the repository at this point in the history
Summary:
RCTAsyncLocalStorage did not write the manifest after removing a value that was larger than RCTInlineValueThreshold. This meant that the values would still be on disk as null in the manifest.json, and if the app didn't do anything to make the manifest get written out again the null values would persist in the AsyncStorage and be returned by getAllKeys. We need to always write out the manifest.json even if the value is in the overflow storage files.

Thank you for sending the PR! We appreciate you spending the time to work on these changes.
Help us understand your motivation by explaining why you decided to make this change.

Fixes #9196.

Not sure where the tests are for this?

none.

[IOS] [BUGFIX] [AsyncStorage] - Correctly remove keys of large values from AsyncStorage.

tadeuzagallo nicklockwood dannycochran
Pull Request resolved: #18613

Differential Revision: D13860820

Pulled By: cpojer

fbshipit-source-id: ced1cd40273140335cd9b1f29fc1c1881ab8cebd
  • Loading branch information
esprehn authored and facebook-github-bot committed Jan 29, 2019
1 parent 7b8235a commit 27b4d21
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions React/Modules/RCTAsyncLocalStorage.m
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,8 @@ - (NSDictionary *)_writeEntry:(NSArray<NSString *> *)entry changedManifest:(BOOL
NSString *filePath = [self _filePathForKey:key];
[[NSFileManager defaultManager] removeItemAtPath:filePath error:nil];
[RCTGetCache() removeObjectForKey:key];
// remove the key from manifest, but no need to mark as changed just for
// this, as the cost of checking again next time is negligible.
[_manifest removeObjectForKey:key];
} else if (_manifest[key]) {
}
if (_manifest[key]) {
changedManifest = YES;
[_manifest removeObjectForKey:key];
}
Expand Down

0 comments on commit 27b4d21

Please sign in to comment.