oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Add protocol context to protocol kit.

Browse source
This commit is contained in:
Matthew Chen 2018-01-25 18:14:22 -05:00
parent 218bb15ea7
commit 7358f3053f
5 changed files with 1189 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SignalServiceKit/src/Messages/OWSBatchMessageProcessor.m
View file

@ -12,6 +12,7 @@
#import "OWSSignalServiceProtos.pb.h"
#import "OWSStorage.h"
#import "TSDatabaseView.h"
#import "TSStorageManager+SessionStore.h"
#import "TSStorageManager.h"
#import "TSYapDatabaseObject.h"
#import "Threading.h"
@ -363,7 +364,9 @@ NSString *const OWSMessageContentJobFinderExtensionGroup = @"OWSMessageContentJo
{
AssertOnDispatchQueue(self.serialQueue);
[self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
// Note that we use the protocolStoreDBConnection to process incoming messages,
// to ensure session & identity store consistency.
[TSStorageManager.protocolStoreDBConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
for (OWSMessageContentJob *job in jobs) {
[self.messagesManager processEnvelope:job.envelopeProto
plaintextData:job.plaintextData

29
SignalServiceKit/src/Messages/OWSMessageUtils.h Normal file
View file

@ -0,0 +1,29 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "OWSMessageHandler.h"
NS_ASSUME_NONNULL_BEGIN
@class OWSSignalServiceProtosEnvelope;
@class TSThread;
@class YapDatabaseReadWriteTransaction;
@interface OWSMessageManager : OWSMessageHandler
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)sharedManager;
// processEnvelope: can be called from any thread.
- (void)processEnvelope:(OWSSignalServiceProtosEnvelope *)envelope
plaintextData:(NSData *_Nullable)plaintextData
transaction:(YapDatabaseReadWriteTransaction *)transaction;
- (NSUInteger)unreadMessagesCount;
- (NSUInteger)unreadMessagesCountExcept:(TSThread *)thread;
- (NSUInteger)unreadMessagesInThread:(TSThread *)thread;
@end
NS_ASSUME_NONNULL_END

1148
SignalServiceKit/src/Messages/OWSMessageUtils.m Normal file
View file

File diff suppressed because it is too large Load diff

2
SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.h
View file

@ -9,6 +9,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface TSStorageManager (SessionStore) <SessionStore>
+ (YapDatabaseConnection *)protocolStoreDBConnection;
- (void)archiveAllSessionsForContact:(NSString *)contactIdentifier protocolContext:(nullable id)protocolContext;
#pragma mark - debug

20
SignalServiceKit/src/Storage/AxolotlStore/TSStorageManager+SessionStore.m
View file

@ -196,20 +196,16 @@ NSString *const kSessionStoreDBConnectionKey = @"kSessionStoreDBConnectionKey";
- (void)resetSessionStore
{
AssertIsOnSessionStoreQueue();
DDLogWarn(@"%@ resetting session store", self.logTag);
[self.sessionDBConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
[self.protocolStoreDBConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
[transaction removeAllObjectsInCollection:TSStorageManagerSessionStoreCollection];
}];
}
- (void)printAllSessions
{
AssertIsOnSessionStoreQueue();
NSString *tag = @"[TSStorageManager (SessionStore)]";
[self.sessionDBConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
[self.protocolStoreDBConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
DDLogDebug(@"%@ All Sessions:", tag);
[transaction
enumerateKeysAndObjectsInCollection:TSStorageManagerSessionStoreCollection
@ -258,18 +254,14 @@ NSString *const kSessionStoreDBConnectionKey = @"kSessionStoreDBConnectionKey";
- (void)snapshotSessionStore
{
AssertIsOnSessionStoreQueue();
[self.sessionDBConnection snapshotCollection:TSStorageManagerSessionStoreCollection
snapshotFilePath:self.snapshotFilePath];
[self.protocolStoreDBConnection snapshotCollection:TSStorageManagerSessionStoreCollection
snapshotFilePath:self.snapshotFilePath];
}
- (void)restoreSessionStore
{
AssertIsOnSessionStoreQueue();
[self.sessionDBConnection restoreSnapshotOfCollection:TSStorageManagerSessionStoreCollection
snapshotFilePath:self.snapshotFilePath];
[self.protocolStoreDBConnection restoreSnapshotOfCollection:TSStorageManagerSessionStoreCollection
snapshotFilePath:self.snapshotFilePath];
}
#endif