persist thread view

// FREEBIE
2017-07-05 21:33:11 -05:00
43 changed files with 278 additions and 607 deletions
--- a/Example/TSKitiOSTestApp/Podfile
+++ b/Example/TSKitiOSTestApp/Podfile
@ -21,8 +21,7 @@ post_install do |installer|
          existing_definitions = "$(inheritied)"
        end

-		config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = "#{existing_definitions} SSK_BUILDING_FOR_TESTS=1"
-		config.build_settings['OTHER_SWIFT_FLAGS'] = ['$(inherited)', '-DSSK_BUILDING_FOR_TESTS']
+        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = "#{existing_definitions} SSK_BUILDING_FOR_TESTS=1"
      end
    end
  end
--- a/Example/TSKitiOSTestApp/Podfile.lock
+++ b/Example/TSKitiOSTestApp/Podfile.lock
@ -111,7 +111,7 @@ EXTERNAL SOURCES:
  AxolotlKit:
    :git: https://github.com/WhisperSystems/SignalProtocolKit.git
  SignalServiceKit:
-    :path: ../../SignalServiceKit.podspec
+    :path: "../../SignalServiceKit.podspec"
  SocketRocket:
    :git: https://github.com/facebook/SocketRocket.git

@ -140,6 +140,6 @@ SPEC CHECKSUMS:
  UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
  YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266

-PODFILE CHECKSUM: a0f4507b6b4e6f9da3250901b06187a67236e083
+PODFILE CHECKSUM: 124c05542083fefccb75f4b7afbdd839e27ff5ab

 COCOAPODS: 1.2.1
--- a/Example/TSKitiOSTestApp/TSKitiOSTestApp.xcodeproj/xcshareddata/xcschemes/TSKitiOSTestApp.xcscheme
+++ b/Example/TSKitiOSTestApp/TSKitiOSTestApp.xcodeproj/xcshareddata/xcschemes/TSKitiOSTestApp.xcscheme
@ -28,7 +28,7 @@
            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FF3F51F81980908EDE1836B76AA3A1EC"
+               BlueprintIdentifier = "1D0826C97B09E58C83B3C228FBC535FA"
               BuildableName = "libSignalServiceKit.a"
               BlueprintName = "SignalServiceKit"
               ReferencedContainer = "container:Pods/Pods.xcodeproj">
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -2,7 +2,7 @@ GEM
  remote: https://rubygems.org/
  specs:
    CFPropertyList (2.3.5)
-    activesupport (4.2.9)
+    activesupport (4.2.8)
      i18n (~> 0.7)
      minitest (~> 5.1)
      thread_safe (~> 0.3, >= 0.3.4)
@ -10,7 +10,7 @@ GEM
    addressable (2.5.1)
      public_suffix (~> 2.0, >= 2.0.2)
    babosa (1.0.2)
-    claide (1.0.2)
+    claide (1.0.1)
    cocoapods (1.2.1)
      activesupport (>= 4.0.2, < 5)
      claide (>= 1.0.1, < 2.0)
@ -46,16 +46,14 @@ GEM
    cocoapods-try (1.1.0)
    colored (1.2)
    colored2 (3.1.2)
-    commander-fastlane (4.4.5)
+    commander-fastlane (4.4.4)
      highline (~> 1.7.2)
-    declarative (0.0.9)
-    declarative-option (0.1.0)
    domain_name (0.5.20170404)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.1)
+    dotenv (2.2.0)
    escape (0.0.4)
-    excon (0.57.1)
-    faraday (0.12.1)
+    excon (0.55.0)
+    faraday (0.12.0.1)
      multipart-post (>= 1.2, < 3)
    faraday-cookie_jar (0.0.6)
      faraday (>= 0.7.4)
@ -63,21 +61,20 @@ GEM
    faraday_middleware (0.11.0.1)
      faraday (>= 0.7.4, < 1.0)
    fastimage (2.1.0)
-    fastlane (2.46.0)
-      CFPropertyList (>= 2.3, < 3.0.0)
+    fastlane (2.27.0)
      addressable (>= 2.3, < 3.0.0)
      babosa (>= 1.0.2, < 2.0.0)
      bundler (>= 1.12.0, < 2.0.0)
      colored
-      commander-fastlane (>= 4.4.5, < 5.0.0)
+      commander-fastlane (>= 4.4.0, < 5.0.0)
      dotenv (>= 2.1.1, < 3.0.0)
      excon (>= 0.45.0, < 1.0.0)
      faraday (~> 0.9)
      faraday-cookie_jar (~> 0.0.6)
      faraday_middleware (~> 0.9)
-      fastimage (>= 2.1.0, < 3.0.0)
+      fastimage (>= 1.6)
      gh_inspector (>= 1.0.1, < 2.0.0)
-      google-api-client (>= 0.12.0, < 0.13.0)
+      google-api-client (~> 0.9.2)
      highline (>= 1.7.2, < 2.0.0)
      json (< 3.0.0)
      mini_magick (~> 4.5.1)
@ -98,13 +95,15 @@ GEM
    fourflusher (2.0.1)
    fuzzy_match (2.0.4)
    gh_inspector (1.0.3)
-    google-api-client (0.12.0)
-      addressable (~> 2.5, >= 2.5.1)
+    google-api-client (0.9.28)
+      addressable (~> 2.3)
      googleauth (~> 0.5)
-      httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
+      httpclient (~> 2.7)
+      hurley (~> 0.1)
+      memoist (~> 0.11)
+      mime-types (>= 1.6)
+      representable (~> 2.3.0)
+      retriable (~> 2.0)
    googleauth (0.5.1)
      faraday (~> 0.9)
      jwt (~> 1.4)
@ -117,19 +116,20 @@ GEM
    http-cookie (1.0.3)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (0.8.6)
-    json (2.1.0)
+    hurley (0.2)
+    i18n (0.8.1)
+    json (2.0.4)
    jwt (1.5.6)
    little-plugger (1.1.4)
    logging (2.2.2)
      little-plugger (~> 1.1)
      multi_json (~> 1.10)
-    memoist (0.16.0)
+    memoist (0.15.0)
    mime-types (3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2016.0521)
    mini_magick (4.5.1)
-    minitest (5.10.2)
+    minitest (5.10.1)
    molinillo (0.5.7)
    multi_json (1.12.1)
    multi_xml (0.6.0)
@ -138,14 +138,12 @@ GEM
    nap (1.1.0)
    netrc (0.7.8)
    os (0.9.6)
-    plist (3.3.0)
+    plist (3.2.0)
    public_suffix (2.0.5)
-    representable (3.0.4)
-      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.0.2)
-    rouge (2.0.7)
+    representable (2.3.0)
+      uber (~> 0.0.7)
+    retriable (2.1.0)
+    rouge (1.11.1)
    ruby-macho (1.1.0)
    rubyzip (1.2.1)
    security (0.1.3)
@ -155,26 +153,26 @@ GEM
      jwt (~> 1.5)
      multi_json (~> 1.10)
    slack-notifier (1.5.1)
-    terminal-notifier (1.8.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-notifier (1.7.1)
+    terminal-table (1.7.3)
+      unicode-display_width (~> 1.1.1)
    thread_safe (0.3.6)
    tty-screen (0.5.0)
    tzinfo (1.2.3)
      thread_safe (~> 0.1)
-    uber (0.1.0)
+    uber (0.0.15)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.4)
-    unicode-display_width (1.3.0)
+    unf_ext (0.0.7.3)
+    unicode-display_width (1.1.3)
    word_wrap (1.0.0)
-    xcodeproj (1.5.0)
+    xcodeproj (1.4.4)
      CFPropertyList (~> 2.3.3)
-      claide (>= 1.0.2, < 2.0)
+      claide (>= 1.0.1, < 2.0)
      colored2 (~> 3.1)
      nanaimo (~> 0.2.3)
-    xcpretty (0.2.8)
-      rouge (~> 2.0.7)
+    xcpretty (0.2.6)
+      rouge (~> 1.8)
    xcpretty-travis-formatter (0.0.4)
      xcpretty (~> 0.2, >= 0.0.7)

--- a/README.md
+++ b/README.md
@ -1,27 +1,3 @@
-# SignalServiceKit has Moved
-
-Per https://github.com/WhisperSystems/Signal-iOS/pull/2341 we've moved
-the SignalServiceKit codebase into the primary Signal-iOS repository at
-https://github.com/WhisperSystems/Signal-iOS. As such, this repository
-will no longer be updated.
-
-Don't worry - we will continue to make updates to SignalServiceKit, and
-you can continue to use it in your projects as before. The only
-difference is where the code lives.
-
-If you are using Cocoapods, staying up to date is as simple as modifying
-a line in your Podfile from this:
-
-```
-  pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
-```
-
-To this:
-
-```
-+  pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/Signal-iOS.git'
-```
-
 # SignalServiceKit

 SignalServiceKit is an Objective-C library for communicating with the Signal
--- a/SignalServiceKit.podspec
+++ b/SignalServiceKit.podspec
@ -17,37 +17,15 @@ An Objective-C library for communicating with the Signal messaging service.

  s.homepage         = "https://github.com/WhisperSystems/SignalServiceKit"
  s.license          = 'GPLv3'
-  s.author           = { "Whisper Systems" => "ios@whispersystems.com" }
+  s.author           = { "Frederic Jacobs" => "github@fredericjacobs.com" }
  s.source           = { :git => "https://github.com/WhisperSystems/SignalServiceKit.git", :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/WhipserSystems'
-
-  deprecation_message = <<EOS
-installing SignalServiceKit via the Signal-iOS repository.
-
-To get future updates, point your Podfile at the new location. Simply change this:
-
-    pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
-
-To this:
-
-    pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/Signal-iOS.git'
-
-Sorry for the disruption!
-
-EOS
-
-  s.deprecated_in_favor_of = deprecation_message
+  s.social_media_url = 'https://twitter.com/FredericJacobs'

  s.platform     = :ios, '8.0'
  #s.ios.deployment_target = '8.0'
  #s.osx.deployment_target = '10.9'
  s.requires_arc = true
-
-  # By not including any actual files, upgrading users will see
-  # that they need to point upgrades to the new source at
-  # https://github.com/WhisperSystems/Signal-iOS
-  # Details in README.md
-  s.source_files = 'README.md'
+  s.source_files = 'src/**/*.{h,m,mm}'

  s.resources = ['src/Security/PinningCertificate/textsecure.cer',
                 'src/Security/PinningCertificate/GIAG2.crt']
--- a/src/Contacts/Contact.m
+++ b/src/Contacts/Contact.m
@ -244,12 +244,13 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSArray<NSString *> *)textSecureIdentifiers {
    __block NSMutableArray *identifiers = [NSMutableArray array];

-    [[TSStorageManager sharedManager].dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-        for (PhoneNumber *number in self.parsedPhoneNumbers) {
-            if ([SignalRecipient recipientWithTextSecureIdentifier:number.toE164 withTransaction:transaction]) {
-                [identifiers addObject:number.toE164];
-            }
-        }
+    [[TSStorageManager sharedManager]
+            .dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+      for (PhoneNumber *number in self.parsedPhoneNumbers) {
+          if ([SignalRecipient recipientWithTextSecureIdentifier:number.toE164 withTransaction:transaction]) {
+              [identifiers addObject:number.toE164];
+          }
+      }
    }];
    return [identifiers copy];
 }
--- a/src/Contacts/ContactsUpdater.m
+++ b/src/Contacts/ContactsUpdater.m
@ -122,11 +122,11 @@ NS_ASSUME_NONNULL_BEGIN
    }

    NSMutableSet *recipientIds = [NSMutableSet set];
-    [[TSStorageManager sharedManager].dbReadConnection
-        readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
-            NSArray *allRecipientKeys = [transaction allKeysInCollection:[SignalRecipient collection]];
-            [recipientIds addObjectsFromArray:allRecipientKeys];
-        }];
+    [[TSStorageManager sharedManager]
+            .dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
+      NSArray *allRecipientKeys = [transaction allKeysInCollection:[SignalRecipient collection]];
+      [recipientIds addObjectsFromArray:allRecipientKeys];
+    }];

    NSMutableSet<NSString *> *allContacts = [[abPhoneNumbers setByAddingObjectsFromSet:recipientIds] mutableCopy];

@ -135,7 +135,7 @@ NS_ASSUME_NONNULL_BEGIN
                                 [recipientIds minusSet:matchedIds];

                                 // Cleaning up unregistered identifiers
-                                 [[TSStorageManager sharedManager].dbReadWriteConnection
+                                 [[TSStorageManager sharedManager].dbConnection
                                     readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
                                         for (NSString *identifier in recipientIds) {
                                             SignalRecipient *recipient =
@ -185,22 +185,23 @@ NS_ASSUME_NONNULL_BEGIN
            }

            // Insert or update contact attributes
-            [[TSStorageManager sharedManager].dbReadWriteConnection
-                readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-                    for (NSString *identifier in attributesForIdentifier) {
-                        SignalRecipient *recipient =
-                            [SignalRecipient recipientWithTextSecureIdentifier:identifier withTransaction:transaction];
-                        if (!recipient) {
-                            recipient = [[SignalRecipient alloc] initWithTextSecureIdentifier:identifier relay:nil];
-                        }
+            [[TSStorageManager sharedManager]
+                    .dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+              for (NSString *identifier in attributesForIdentifier) {
+                  SignalRecipient *recipient =
+                      [SignalRecipient recipientWithTextSecureIdentifier:identifier withTransaction:transaction];
+                  if (!recipient) {
+                      recipient = [[SignalRecipient alloc] initWithTextSecureIdentifier:identifier
+                                                                                  relay:nil];
+                  }

-                        NSDictionary *attributes = [attributesForIdentifier objectForKey:identifier];
+                  NSDictionary *attributes = [attributesForIdentifier objectForKey:identifier];

-                        recipient.relay = attributes[@"relay"];
+                  recipient.relay = attributes[@"relay"];

-                        [recipient saveWithTransaction:transaction];
-                    }
-                }];
+                  [recipient saveWithTransaction:transaction];
+              }
+            }];

            success([NSSet setWithArray:attributesForIdentifier.allKeys]);
          }
--- a/src/Contacts/PhoneNumber.m
+++ b/src/Contacts/PhoneNumber.m
@ -22,6 +22,7 @@ static NSString *const RPDefaultsKeyPhoneNumberCanonical = @"RPDefaultsKeyPhoneN
    NBPhoneNumber *number = [phoneUtil parse:text defaultRegion:regionCode error:&parseError];

    if (parseError) {
+        DDLogDebug(@"Issue while parsing number: %@", [parseError description]);
        return nil;
    }

--- a/src/Contacts/PhoneNumberUtil.m
+++ b/src/Contacts/PhoneNumberUtil.m
@ -85,9 +85,6 @@
    NSDictionary *countryCodeComponent = @{NSLocaleCountryCode : countryCode};
    NSString *identifier               = [NSLocale localeIdentifierFromComponents:countryCodeComponent];
    NSString *country                  = [NSLocale.currentLocale displayNameForKey:NSLocaleIdentifier value:identifier];
-    if (country.length < 1) {
-        country = [NSLocale.systemLocale displayNameForKey:NSLocaleIdentifier value:identifier];
-    }
    return country;
 }

--- a/src/Contacts/SignalRecipient.m
+++ b/src/Contacts/SignalRecipient.m
@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (nullable instancetype)recipientWithTextSecureIdentifier:(NSString *)textSecureIdentifier
 {
    __block SignalRecipient *recipient;
-    [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
+    [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
        recipient = [self recipientWithTextSecureIdentifier:textSecureIdentifier withTransaction:transaction];
    }];
    return recipient;
--- a/src/Contacts/TSThread.m
+++ b/src/Contacts/TSThread.m
@ -131,7 +131,7 @@ NS_ASSUME_NONNULL_BEGIN
 */
 - (void)enumerateInteractionsUsingBlock:(void (^)(TSInteraction *interaction))block
 {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self enumerateInteractionsWithTransaction:transaction
                                        usingBlock:^(
                                            TSInteraction *interaction, YapDatabaseReadTransaction *transaction) {
@ -172,7 +172,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSUInteger)numberOfInteractions
 {
    __block NSUInteger count;
-    [[self dbReadConnection] readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
+    [[self dbConnection] readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
        YapDatabaseViewTransaction *interactionsByThread = [transaction ext:TSMessageDatabaseViewExtensionName];
        count = [interactionsByThread numberOfItemsInGroup:self.uniqueId];
    }];
@ -237,7 +237,7 @@ NS_ASSUME_NONNULL_BEGIN

 - (TSInteraction *) lastInteraction {
    __block TSInteraction *last;
-    [TSStorageManager.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+    [TSStorageManager.sharedManager.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction){
        last = [[transaction ext:TSMessageDatabaseViewExtensionName] lastObjectInGroup:self.uniqueId];
    }];
    return last;
@ -246,7 +246,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (TSInteraction *)lastInteractionForInbox
 {
    __block TSInteraction *last = nil;
-    [TSStorageManager.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+    [TSStorageManager.sharedManager.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
        [[transaction ext:TSMessageDatabaseViewExtensionName]
            enumerateRowsInGroup:self.uniqueId
                     withOptions:NSEnumerationReverse
@ -397,7 +397,7 @@ NS_ASSUME_NONNULL_BEGIN

 - (void)updateWithMutedUntilDate:(NSDate *)mutedUntilDate
 {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self applyChangeToSelfAndLatestThread:transaction
                                            changeBlock:^(TSThread *thread) {
                                                [thread setMutedUntilDate:mutedUntilDate];
--- a/src/Contacts/Threads/TSContactThread.m
+++ b/src/Contacts/Threads/TSContactThread.m
@ -76,7 +76,7 @@ NS_ASSUME_NONNULL_BEGIN
    OWSAssert(contactId.length > 0);

    __block TSContactThread *thread;
-    [[self dbReadWriteConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [[self dbConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        thread = [self getOrCreateThreadWithContactId:contactId transaction:transaction];
    }];

--- a/src/Contacts/Threads/TSGroupThread.m
+++ b/src/Contacts/Threads/TSGroupThread.m
@ -91,7 +91,7 @@ NS_ASSUME_NONNULL_BEGIN
    OWSAssert(groupModel.groupId.length > 0);

    __block TSGroupThread *thread;
-    [[self dbReadWriteConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [[self dbConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        thread = [self getOrCreateThreadWithGroupModel:groupModel transaction:transaction];
    }];
    return thread;
--- a/src/Devices/OWSReadReceipt.m
+++ b/src/Devices/OWSReadReceipt.m
@ -1,6 +1,4 @@
-//
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//
+//  Copyright © 2016 Open Whisper Systems. All rights reserved.

 #import "OWSReadReceipt.h"
 #import <YapDatabase/YapDatabase.h>
@ -106,7 +104,7 @@ NSString *const OWSReadReceiptColumnSenderId = @"senderId";
        stringWithFormat:@"WHERE %@ = ? AND %@ = ?", OWSReadReceiptColumnSenderId, OWSReadReceiptColumnTimestamp];
    YapDatabaseQuery *query = [YapDatabaseQuery queryWithFormat:queryFormat, senderId, @(timestamp)];

-    [[self dbReadConnection] readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
+    [[self dbConnection] readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
        [[transaction ext:OWSReadReceiptIndexOnSenderIdAndTimestamp]
            enumerateKeysAndObjectsMatchingQuery:query
                                      usingBlock:^(NSString *collection, NSString *key, id object, BOOL *stop) {
--- a/src/Devices/OWSReadReceiptsProcessor.m
+++ b/src/Devices/OWSReadReceiptsProcessor.m
@ -94,8 +94,7 @@ NSString *const OWSReadReceiptsProcessorMarkedMessageAsReadNotification =
            // Always mark the message specified by the read receipt as read.
            [interactionsToMarkAsRead addObject:message];

-            [self.storageManager.dbReadWriteConnection readWriteWithBlock:^(
-                YapDatabaseReadWriteTransaction *transaction) {
+            [self.storageManager.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
                [[TSDatabaseView unseenDatabaseViewExtension:transaction]
                    enumerateRowsInGroup:message.uniqueThreadId
                              usingBlock:^(NSString *collection,
--- a/src/Messages/Attachments/TSAttachmentStream.h
+++ b/src/Messages/Attachments/TSAttachmentStream.h
@ -46,6 +46,7 @@ NS_ASSUME_NONNULL_BEGIN

 + (void)deleteAttachments;
 + (NSString *)attachmentsFolder;
+ (NSUInteger)numberOfItemsInAttachmentsFolder;

 - (CGSize)imageSizeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
 - (CGSize)imageSizeWithoutTransaction;
--- a/src/Messages/Attachments/TSAttachmentStream.m
+++ b/src/Messages/Attachments/TSAttachmentStream.m
@ -189,6 +189,19 @@ NS_ASSUME_NONNULL_BEGIN
    return attachmentsFolder;
 }

+ (NSUInteger)numberOfItemsInAttachmentsFolder
+{
+    NSError *error;
+    NSUInteger count =
+        [[[NSFileManager defaultManager] contentsOfDirectoryAtPath:[self attachmentsFolder] error:&error] count];
+
+    if (error) {
+        DDLogError(@"Unable to count attachments in attachments folder. Error: %@", error);
+    }
+
+    return count;
+}
+
 - (nullable NSString *)filePath
 {
    if (!self.localRelativeFilePath) {
@ -374,7 +387,7 @@ NS_ASSUME_NONNULL_BEGIN
    if (transaction) {
        updateDataStore(transaction);
    } else {
-        [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
            updateDataStore(transaction);
        }];
    }
@ -445,7 +458,7 @@ NS_ASSUME_NONNULL_BEGIN
    if (transaction) {
        updateDataStore(transaction);
    } else {
-        [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
            updateDataStore(transaction);
        }];
    }
--- a/src/Messages/Interactions/TSIncomingMessage.m
+++ b/src/Messages/Interactions/TSIncomingMessage.m
@ -78,7 +78,7 @@ NSString *const TSIncomingMessageWasReadOnThisDeviceNotification = @"TSIncomingM
 + (nullable instancetype)findMessageWithAuthorId:(NSString *)authorId timestamp:(uint64_t)timestamp
 {
    __block TSIncomingMessage *foundMessage;
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        // In theory we could build a new secondaryIndex for (authorId,timestamp), but in practice there should
        // be *very* few (millisecond) timestamps with multiple authors.
        [TSDatabaseSecondaryIndexes
--- a/src/Messages/Interactions/TSOutgoingMessage.m
+++ b/src/Messages/Interactions/TSOutgoingMessage.m
@ -245,7 +245,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec
 {
    OWSAssert(error);

-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self applyChangeToSelfAndLatestOutgoingMessage:transaction
                                            changeBlock:^(TSOutgoingMessage *message) {
                                                [message setMessageState:TSOutgoingMessageStateUnsent];
@ -256,7 +256,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec

 - (void)updateWithMessageState:(TSOutgoingMessageState)messageState
 {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self updateWithMessageState:messageState transaction:transaction];
    }];
 }
@ -274,7 +274,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec

 - (void)updateWithHasSyncedTranscript:(BOOL)hasSyncedTranscript
 {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self applyChangeToSelfAndLatestOutgoingMessage:transaction
                                            changeBlock:^(TSOutgoingMessage *message) {
                                                [message setHasSyncedTranscript:hasSyncedTranscript];
@ -295,7 +295,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec

 - (void)updateWithCustomMessage:(NSString *)customMessage
 {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self updateWithCustomMessage:customMessage transaction:transaction];
    }];
 }
@ -312,14 +312,14 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec

 - (void)updateWithWasDelivered
 {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self updateWithWasDeliveredWithTransaction:transaction];
    }];
 }

 - (void)updateWithWasSentAndDelivered
 {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self applyChangeToSelfAndLatestOutgoingMessage:transaction
                                            changeBlock:^(TSOutgoingMessage *message) {
                                                [message setMessageState:TSOutgoingMessageStateSentToService];
@ -397,7 +397,7 @@ NSString *const kTSOutgoingMessageSentRecipientAll = @"kTSOutgoingMessageSentRec

 - (void)updateWithSentRecipient:(NSString *)contactId
 {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self updateWithSentRecipient:contactId transaction:transaction];
    }];
 }
--- a/src/Messages/OWSIdentityManager.m
+++ b/src/Messages/OWSIdentityManager.m
@ -93,8 +93,12 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa

    OWSSingletonAssert();

-    [self observeNotifications];
-
+    // We want to observe these notifications lazily to avoid accessing
+    // the data store in [application: didFinishLaunchingWithOptions:].
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)1.f * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+        [self tryToSyncQueuedVerificationStates];
+        [self observeNotifications];
+    });
    return self;
 }

@ -207,6 +211,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
            return YES;
        }

+        DDLogDebug(@"%@ no changes for identity saved for recipient: %@", self.tag, recipientId);
        return NO;
    }
 }
@ -364,6 +369,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
    @synchronized(self)
    {
        if (recipientIdentity == nil) {
+            DDLogDebug(@"%@ Trusting previously unknown recipient: %@", self.tag, recipientIdentity.recipientId);
            return YES;
        }

@ -374,6 +380,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
        }

        if ([recipientIdentity isFirstKnownKey]) {
+            DDLogDebug(@"%@ trusting first known key for recipient: %@", self.tag, recipientIdentity.recipientId);
            return YES;
        }

@ -385,10 +392,12 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                    DDLogWarn(@"%@ not trusting new identity for recipient: %@", self.tag, recipientIdentity.recipientId);
                    return NO;
                } else {
+                    DDLogWarn(@"%@ trusting existing identity for recipient: %@", self.tag, recipientIdentity.recipientId);
                    return YES;
                }
            }
            case OWSVerificationStateVerified:
+                DDLogWarn(@"%@ trusting verified identity for recipient: %@", self.tag, recipientIdentity.recipientId);
                return YES;
            case OWSVerificationStateNoLongerVerified:
                DDLogWarn(@"%@ not trusting no longer verified identity for recipient: %@", self.tag, recipientIdentity.recipientId);
@ -415,7 +424,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
        [messages addObject:[TSErrorMessage nonblockingIdentityChangeInThread:groupThread recipientId:recipientId]];
    }

-    [self.storageManager.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.storageManager.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        for (TSMessage *message in messages) {
            [message saveWithTransaction:transaction];
        }
@ -434,29 +443,17 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                              inCollection:OWSIdentityManager_QueuedVerificationStateSyncMessages];
        }

-        dispatch_async(dispatch_get_main_queue(), ^{
-            [self tryToSyncQueuedVerificationStates];
-        });
+        [self tryToSyncQueuedVerificationStates];
    });
 }

 - (void)tryToSyncQueuedVerificationStates
 {
-    OWSAssert([NSThread isMainThread]);
-
-    if ([UIApplication sharedApplication].applicationState != UIApplicationStateActive) {
-        // Only try to sync if the app is active to avoid interfering with startup.
-        //
-        // applicationDidBecomeActive: will try to sync again when the app becomes active.
-        return;
-    }
-
    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
        @synchronized(self)
        {
            NSMutableArray<NSString *> *recipientIds = [NSMutableArray new];
-            [self.storageManager.dbReadWriteConnection readWriteWithBlock:^(
-                YapDatabaseReadWriteTransaction *transaction) {
+            [self.storageManager.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
                [transaction enumerateKeysAndObjectsInCollection:OWSIdentityManager_QueuedVerificationStateSyncMessages
                                                      usingBlock:^(NSString *_Nonnull recipientId,
                                                                   id _Nonnull object,
@ -742,7 +739,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
                                                                     isLocalChange:isLocalChange]];
    }

-    [self.storageManager.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.storageManager.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        for (TSMessage *message in messages) {
            [message saveWithTransaction:transaction];
        }
@ -755,11 +752,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
 {
    OWSAssert([NSThread isMainThread]);

-    // We want to defer this so that we never call this method until
-    // [UIApplicationDelegate applicationDidBecomeActive:] is complete.
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)1.f * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-        [self tryToSyncQueuedVerificationStates];
-    });
+    [self tryToSyncQueuedVerificationStates];
 }

 #pragma mark - Logging
--- a/src/Messages/OWSMessageSender.m
+++ b/src/Messages/OWSMessageSender.m
@ -192,6 +192,7 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;

        [message updateWithMessageState:TSOutgoingMessageStateSentToService];

+        DDLogDebug(@"%@ succeeded.", strongSelf.tag);
        aSuccessHandler();

        [strongSelf markAsComplete];
@ -280,10 +281,12 @@ NSUInteger const OWSSendMessageOperationMaxRetries = 4;

 - (void)tryWithRemainingRetries:(NSUInteger)remainingRetries
 {
+    DDLogDebug(@"%@ remainingRetries: %lu", self.tag, (unsigned long)remainingRetries);
+
    // Use this flag to ensure a given operation only succeeds or fails once.
    __block BOOL onceFlag = NO;
    RetryableFailureHandler retryableFailureHandler = ^(NSError *_Nonnull error) {
-        DDLogInfo(@"%@ Sending failed. Remaining retries: %lu", self.tag, (unsigned long)remainingRetries);
+        DDLogInfo(@"%@ Sending failed.", self.tag);

        OWSAssert(!onceFlag);
        onceFlag = YES;
@ -447,6 +450,8 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                     success:(void (^)())successHandler
                     failure:(RetryableFailureHandler)failureHandler
 {
+    DDLogDebug(@"%@ sending message: %@", self.tag, message.debugDescription);
+
    [self ensureAnyAttachmentsUploaded:message
        success:^() {
            [self deliverMessage:message
@ -467,6 +472,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                             failure:(RetryableFailureHandler)failureHandler
 {
    if (!message.hasAttachments) {
+        DDLogDebug(@"%@ No attachments for message: %@", self.tag, message);
        return successHandler();
    }

@ -1163,7 +1169,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
    NSMutableArray *messagesArray = [NSMutableArray arrayWithCapacity:recipient.devices.count];
    
    NSData *plainText = [message buildPlainTextData];
-    DDLogDebug(@"%@ built message: %@ plainTextData.length: %lu", self.tag, [message class], plainText.length);
+    DDLogDebug(@"%@ message: %@ plainTextData.length: %lu", self.tag, [message class], plainText.length);

    for (NSNumber *deviceNumber in recipient.devices) {
        @try {
--- a/src/Messages/TSCall.m
+++ b/src/Messages/TSCall.m
@ -119,7 +119,7 @@ NSUInteger TSCallCurrentSchemaVersion = 1;

    _callType = callType;

-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
        [self saveWithTransaction:transaction];

        // redraw any thread-related unread count UI.
--- a/src/Messages/TSMessagesManager.m
+++ b/src/Messages/TSMessagesManager.m
@ -525,7 +525,7 @@ NS_ASSUME_NONNULL_BEGIN
            NSString *recipientId = incomingEnvelope.source;

            __block TSThread *thread;
-            [[TSStorageManager sharedManager].dbReadWriteConnection
+            [[TSStorageManager sharedManager].dbConnection
                readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
                    thread = [TSContactThread getOrCreateThreadWithContactId:recipientId transaction:transaction];
                }];
--- a/src/Network/API/TSNetworkManager.h
+++ b/src/Network/API/TSNetworkManager.h
@ -30,7 +30,7 @@ extern NSString *const TSNetworkManagerDomain;

 - (instancetype)init NS_UNAVAILABLE;

-+ (instancetype)sharedManager;
+ (id)sharedManager;

 - (void)makeRequest:(TSRequest *)request
            success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
--- a/src/Network/API/TSNetworkManager.m
+++ b/src/Network/API/TSNetworkManager.m
@ -22,8 +22,7 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);

 #pragma mark Singleton implementation

-+ (instancetype)sharedManager
-{
+ (id)sharedManager {
    static TSNetworkManager *sharedMyManager = nil;
    static dispatch_once_t onceToken;
    dispatch_once(&onceToken, ^{
--- a/src/Network/OWSSignalService.m
+++ b/src/Network/OWSSignalService.m
@ -160,6 +160,7 @@ NSString *const kNSNotificationName_IsCensorshipCircumventionActiveDidChange =
        DDLogInfo(@"%@ using reflector HTTPSessionManager", self.tag);
        return self.reflectorHTTPSessionManager;
    } else {
+        DDLogDebug(@"%@ using default HTTPSessionManager", self.tag);
        return self.defaultHTTPSessionManager;
    }
 }
--- a/src/Network/WebSockets/TSSocketManager.m
+++ b/src/Network/WebSockets/TSSocketManager.m
@ -156,6 +156,7 @@ NSString *const kNSNotification_SocketManagerStateDidChange = @"kNSNotification_
    if (self.websocket) {
        switch ([self.websocket readyState]) {
            case SR_OPEN:
+                DDLogVerbose(@"WebSocket already open on connection request");
                self.state = SocketManagerStateOpen;
                return;
            case SR_CONNECTING:
--- a/src/Security/OWSRecipientIdentity.m
+++ b/src/Security/OWSRecipientIdentity.m
@ -91,7 +91,7 @@ OWSSignalServiceProtosVerifiedState OWSVerificationStateToProtoState(OWSVerifica
 {
    changeBlock(self);

-    [[self class].dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
+    [[self class].dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
        OWSRecipientIdentity *latest = [[self class] fetchObjectWithUniqueID:self.uniqueId transaction:transaction];
        if (latest == nil) {
            [self saveWithTransaction:transaction];
--- a/src/Storage/AxolotlStore/TSStorageManager+SignedPreKeyStore.m
+++ b/src/Storage/AxolotlStore/TSStorageManager+SignedPreKeyStore.m
@ -148,7 +148,7 @@ NSString *const TSStorageManagerKeyPrekeyCurrentSignedPrekeyId = @"currentSigned
    NSDate *firstPrekeyUpdateFailureDate = [self firstPrekeyUpdateFailureDate];
    NSUInteger prekeyUpdateFailureCount = [self prekeyUpdateFailureCount];

-    [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
+    [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
        __block int i = 0;

        DDLogInfo(@"%@ SignedPreKeys Report:", tag);
--- a/src/Storage/OWSOrphanedDataCleaner.h
+++ b/src/Storage/OWSOrphanedDataCleaner.h
@ -1,30 +1,10 @@
-//
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//
+// Copyright (c) 2016 Open Whisper Systems. All rights reserved.

-NS_ASSUME_NONNULL_BEGIN
-
-// Notes:
-//
-// * On disk, we only bother cleaning up files, not directories.
-// * For code simplicity, we don't guarantee that everything is
-//   cleaned up in a single pass. If an interaction is cleaned up,
-//   it's attachments might not be cleaned up until the next pass.
-//   If an attachment is cleaned up, it's file on disk might not
-//   be cleaned up until the next pass.
@interface OWSOrphanedDataCleaner : NSObject

- (instancetype)init NS_UNAVAILABLE;
-
-+ (void)auditAsync;
-
-// completion, if present, will be invoked on the main thread.
-+ (void)auditAndCleanupAsync:(void (^_Nullable)())completion;
-
-+ (NSSet<NSString *> *)filePathsInAttachmentsFolder;
-
-+ (long long)fileSizeOfFilePaths:(NSArray<NSString *> *)filePaths;
+/**
+ * Remove any inaccessible data left behind due to application bugs.
+ */
+- (void)removeOrphanedData;

@end
-
-NS_ASSUME_NONNULL_END
--- a/src/Storage/OWSOrphanedDataCleaner.m
+++ b/src/Storage/OWSOrphanedDataCleaner.m
@ -1,6 +1,4 @@
-//
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//
+// Copyright (c) 2016 Open Whisper Systems. All rights reserved.

 #import "OWSOrphanedDataCleaner.h"
 #import "TSAttachmentStream.h"
@ -9,256 +7,84 @@
 #import "TSStorageManager.h"
 #import "TSThread.h"

-NS_ASSUME_NONNULL_BEGIN
-
-#ifdef SSK_BUILDING_FOR_TESTS
-#define CleanupLogDebug NSLog
-#define CleanupLogInfo NSLog
-#else
-#define CleanupLogDebug DDLogDebug
-#define CleanupLogInfo DDLogInfo
-#endif
-
@implementation OWSOrphanedDataCleaner

-+ (void)auditAsync
+- (void)removeOrphanedData
 {
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [OWSOrphanedDataCleaner auditAndCleanup:NO completion:nil];
-    });
-}
-
-+ (void)auditAndCleanupAsync:(void (^_Nullable)())completion
-{
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [OWSOrphanedDataCleaner auditAndCleanup:YES completion:completion];
-    });
-}
-
-// This method finds and optionally cleans up:
-//
-// * Orphan messages (with no thread).
-// * Orphan attachments (with no message).
-// * Orphan attachment files (with no attachment).
-// * Missing attachment files (cannot be cleaned up).
-//   These are attachments which have no file on disk.  They should be extremely rare -
-//   the only cases I have seen are probably due to debugging.
-//   They can't be cleaned up - we don't want to delete the TSAttachmentStream or
-//   its corresponding message.  Better that the broken message shows up in the
-//   conversation view.
-+ (void)auditAndCleanup:(BOOL)shouldCleanup completion:(void (^_Nullable)())completion
-{
-    NSSet<NSString *> *diskFilePaths = [self filePathsInAttachmentsFolder];
-    long long totalFileSize = [self fileSizeOfFilePaths:diskFilePaths.allObjects];
-    NSUInteger fileCount = diskFilePaths.count;
-
-    TSStorageManager *storageManager = [TSStorageManager sharedManager];
-    YapDatabaseConnection *databaseConnection = storageManager.newDatabaseConnection;
-
-    __block int attachmentStreamCount = 0;
-    NSMutableSet<NSString *> *attachmentFilePaths = [NSMutableSet new];
-    NSMutableSet<NSString *> *attachmentIds = [NSMutableSet new];
-    [databaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
-        [transaction enumerateKeysAndObjectsInCollection:TSAttachmentStream.collection
-                                              usingBlock:^(NSString *key, TSAttachment *attachment, BOOL *stop) {
-                                                  [attachmentIds addObject:attachment.uniqueId];
-                                                  if (![attachment isKindOfClass:[TSAttachmentStream class]]) {
-                                                      return;
-                                                  }
-                                                  TSAttachmentStream *attachmentStream
-                                                      = (TSAttachmentStream *)attachment;
-                                                  attachmentStreamCount++;
-                                                  NSString *_Nullable filePath = [attachmentStream filePath];
-                                                  OWSAssert(filePath);
-                                                  [attachmentFilePaths addObject:filePath];
-                                              }];
-    }];
-
-    CleanupLogDebug(@"fileCount: %zd", fileCount);
-    CleanupLogDebug(@"totalFileSize: %lld", totalFileSize);
-    CleanupLogDebug(@"attachmentStreams: %d", attachmentStreamCount);
-    CleanupLogDebug(@"attachmentStreams with file paths: %zd", attachmentFilePaths.count);
-
-    NSMutableSet<NSString *> *orphanDiskFilePaths = [diskFilePaths mutableCopy];
-    [orphanDiskFilePaths minusSet:attachmentFilePaths];
-    NSMutableSet<NSString *> *missingAttachmentFilePaths = [attachmentFilePaths mutableCopy];
-    [missingAttachmentFilePaths minusSet:diskFilePaths];
-
-    CleanupLogDebug(@"orphan disk file paths: %zd", orphanDiskFilePaths.count);
-    CleanupLogDebug(@"missing attachment file paths: %zd", missingAttachmentFilePaths.count);
-
-    [self printPaths:orphanDiskFilePaths.allObjects label:@"orphan disk file paths"];
-    [self printPaths:missingAttachmentFilePaths.allObjects label:@"missing attachment file paths"];
-
-    NSMutableSet *threadIds = [NSMutableSet new];
-    [databaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
-        [transaction enumerateKeysInCollection:TSThread.collection
-                                    usingBlock:^(NSString *_Nonnull key, BOOL *_Nonnull stop) {
-                                        [threadIds addObject:key];
-                                    }];
-    }];
-
-    NSMutableSet<NSString *> *orphanInteractionIds = [NSMutableSet new];
-    NSMutableSet<NSString *> *messageAttachmentIds = [NSMutableSet new];
-    [databaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
-        [transaction enumerateKeysAndObjectsInCollection:TSMessage.collection
-                                              usingBlock:^(NSString *key, TSInteraction *interaction, BOOL *stop) {
-                                                  if (![threadIds containsObject:interaction.uniqueThreadId]) {
-                                                      [orphanInteractionIds addObject:interaction.uniqueId];
-                                                  }
-
-                                                  if (![interaction isKindOfClass:[TSMessage class]]) {
-                                                      return;
-                                                  }
-                                                  TSMessage *message = (TSMessage *)interaction;
-                                                  if (message.attachmentIds.count > 0) {
-                                                      [messageAttachmentIds addObjectsFromArray:message.attachmentIds];
-                                                  }
-                                              }];
-    }];
-
-    CleanupLogDebug(@"attachmentIds: %zd", attachmentIds.count);
-    CleanupLogDebug(@"messageAttachmentIds: %zd", messageAttachmentIds.count);
-
-    NSMutableSet<NSString *> *orphanAttachmentIds = [attachmentIds mutableCopy];
-    [orphanAttachmentIds minusSet:messageAttachmentIds];
-    NSMutableSet<NSString *> *missingAttachmentIds = [messageAttachmentIds mutableCopy];
-    [missingAttachmentIds minusSet:attachmentIds];
-
-    CleanupLogDebug(@"orphan attachmentIds: %zd", orphanAttachmentIds.count);
-    CleanupLogDebug(@"missing attachmentIds: %zd", missingAttachmentIds.count);
-    CleanupLogDebug(@"orphan interactions: %zd", orphanInteractionIds.count);
-
-    // We need to avoid cleaning up new attachments and files that are still in the process of
-    // being created/written, so we don't clean up anything recent.
-#ifdef SSK_BUILDING_FOR_TESTS
-    const NSTimeInterval kMinimumOrphanAge = 0.f;
-#else
-    const NSTimeInterval kMinimumOrphanAge = 15 * 60.f;
-#endif
-
-    if (!shouldCleanup) {
-        return;
+    // Remove interactions whose threads have been deleted
+    for (NSString *interactionId in [self orphanedInteractionIds]) {
+        DDLogWarn(@"Removing orphaned interaction with id: %@", interactionId);
+        TSInteraction *interaction = [TSInteraction fetchObjectWithUniqueID:interactionId];
+        [interaction remove];
    }

-    [databaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
-        for (NSString *interactionId in orphanInteractionIds) {
-            TSInteraction *interaction = [TSInteraction fetchObjectWithUniqueID:interactionId transaction:transaction];
-            if (!interaction) {
-                // This could just be a race condition, but it should be very unlikely.
-                OWSFail(@"Could not load interaction: %@", interactionId);
-                continue;
-            }
-            CleanupLogInfo(@"Removing orphan message: %@", interaction.uniqueId);
-            [interaction removeWithTransaction:transaction];
-        }
-        for (NSString *attachmentId in orphanAttachmentIds) {
-            TSAttachment *attachment = [TSAttachment fetchObjectWithUniqueID:attachmentId transaction:transaction];
-            if (!attachment) {
-                // This could just be a race condition, but it should be very unlikely.
-                OWSFail(@"Could not load attachment: %@", attachmentId);
-                continue;
-            }
-            if (![attachment isKindOfClass:[TSAttachmentStream class]]) {
-                continue;
-            }
-            TSAttachmentStream *attachmentStream = (TSAttachmentStream *)attachment;
-            // Don't delete attachments which were created in the last N minutes.
-            if (fabs([attachmentStream.creationTimestamp timeIntervalSinceNow]) < kMinimumOrphanAge) {
-                CleanupLogInfo(@"Skipping orphan attachment due to age: %f",
-                    fabs([attachmentStream.creationTimestamp timeIntervalSinceNow]));
-                continue;
-            }
-            CleanupLogInfo(@"Removing orphan attachment: %@", attachmentStream.uniqueId);
-            [attachmentStream removeWithTransaction:transaction];
-        }
-    }];
-
-    for (NSString *filePath in orphanDiskFilePaths) {
+    // Remove any lingering attachments
+    for (NSString *path in [self orphanedFilePaths]) {
+        DDLogWarn(@"Removing orphaned file attachment at path: %@", path);
        NSError *error;
-        NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:&error];
-        if (!attributes || error) {
-            OWSFail(@"Could not get attributes of file at: %@", filePath);
-            continue;
-        }
-        // Don't delete files which were created in the last N minutes.
-        if (fabs([attributes.fileModificationDate timeIntervalSinceNow]) < kMinimumOrphanAge) {
-            CleanupLogInfo(@"Skipping orphan attachment file due to age: %f",
-                fabs([attributes.fileModificationDate timeIntervalSinceNow]));
-            continue;
-        }
-
-        CleanupLogInfo(@"Removing orphan attachment file: %@", filePath);
-        [[NSFileManager defaultManager] removeItemAtPath:filePath error:&error];
+        [[NSFileManager defaultManager] removeItemAtPath:path error:&error];
        if (error) {
-            OWSFail(@"Could not remove orphan file at: %@", filePath);
+            DDLogError(@"Unable to remove orphaned file attachment at path:%@", path);
        }
    }
-
-    if (completion) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            completion();
-        });
-    }
 }

-+ (void)printPaths:(NSArray<NSString *> *)paths label:(NSString *)label
+- (NSArray<NSString *> *)orphanedInteractionIds
 {
-    for (NSString *path in [paths sortedArrayUsingSelector:@selector(compare:)]) {
-        CleanupLogDebug(@"%@: %@", label, path);
-    }
+    NSMutableArray *interactionIds = [NSMutableArray new];
+    [[TSInteraction dbConnection] readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
+        [TSInteraction enumerateCollectionObjectsWithTransaction:transaction
+                                                      usingBlock:^(TSInteraction *interaction, BOOL *stop) {
+                                                          TSThread *thread = [TSThread
+                                                              fetchObjectWithUniqueID:interaction.uniqueThreadId
+                                                                          transaction:transaction];
+                                                          if (!thread) {
+                                                              [interactionIds addObject:interaction.uniqueId];
+                                                          }
+                                                      }];
+    }];
+
+
+    return [interactionIds copy];
 }

-+ (NSSet<NSString *> *)filePathsInAttachmentsFolder
+- (NSArray<NSString *> *)orphanedFilePaths
 {
-    NSString *attachmentsFolder = [TSAttachmentStream attachmentsFolder];
-    CleanupLogDebug(@"attachmentsFolder: %@", attachmentsFolder);
-
-    return [self filePathsInDirectory:attachmentsFolder];
-}
-
-+ (NSSet<NSString *> *)filePathsInDirectory:(NSString *)dirPath
-{
-    NSMutableSet *filePaths = [NSMutableSet new];
    NSError *error;
-    NSArray<NSString *> *fileNames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:dirPath error:&error];
+    NSMutableArray<NSString *> *filenames =
+        [[[NSFileManager defaultManager] contentsOfDirectoryAtPath:[TSAttachmentStream attachmentsFolder] error:&error]
+            mutableCopy];
    if (error) {
-        OWSFail(@"contentsOfDirectoryAtPath error: %@", error);
-        return [NSSet new];
+        DDLogError(@"error getting orphanedFilePaths:%@", error);
+        return @[];
    }
-    for (NSString *fileName in fileNames) {
-        NSString *filePath = [dirPath stringByAppendingPathComponent:fileName];
-        BOOL isDirectory;
-        [[NSFileManager defaultManager] fileExistsAtPath:filePath isDirectory:&isDirectory];
-        if (isDirectory) {
-            [filePaths addObjectsFromArray:[self filePathsInDirectory:filePath].allObjects];
-        } else {
-            [filePaths addObject:filePath];
+
+    NSMutableDictionary<NSString *, NSString *> *attachmentIdFilenames = [NSMutableDictionary new];
+    for (NSString *filename in filenames) {
+        // Remove extension from (e.g.) 1234.png to get the attachmentId "1234"
+        NSString *attachmentId = [filename stringByDeletingPathExtension];
+        attachmentIdFilenames[attachmentId] = filename;
+    }
+
+    [TSInteraction enumerateCollectionObjectsUsingBlock:^(TSInteraction *interaction, BOOL *stop) {
+        if ([interaction isKindOfClass:[TSMessage class]]) {
+            TSMessage *message = (TSMessage *)interaction;
+            if ([message hasAttachments]) {
+                for (NSString *attachmentId in message.attachmentIds) {
+                    [attachmentIdFilenames removeObjectForKey:attachmentId];
+                }
+            }
        }
-    }
-    return filePaths;
-}
+    }];

-+ (long long)fileSizeOfFilePath:(NSString *)filePath
-{
-    NSError *error;
-    NSNumber *fileSize = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:&error][NSFileSize];
-    if (error) {
-        OWSFail(@"attributesOfItemAtPath: %@ error: %@", filePath, error);
-        return 0;
+    NSArray<NSString *> *filenamesToDelete = [attachmentIdFilenames allValues];
+    NSMutableArray<NSString *> *absolutePathsToDelete = [NSMutableArray arrayWithCapacity:[filenamesToDelete count]];
+    for (NSString *filename in filenamesToDelete) {
+        NSString *absolutePath = [[TSAttachmentStream attachmentsFolder] stringByAppendingFormat:@"/%@", filename];
+        [absolutePathsToDelete addObject:absolutePath];
    }
-    return fileSize.longLongValue;
-}

-+ (long long)fileSizeOfFilePaths:(NSArray<NSString *> *)filePaths
-{
-    long long result = 0;
-    for (NSString *filePath in filePaths) {
-        result += [self fileSizeOfFilePath:filePath];
-    }
-    return result;
+    return [absolutePathsToDelete copy];
 }

@end
-
-NS_ASSUME_NONNULL_END
--- a/src/Storage/TSDatabaseView.m
+++ b/src/Storage/TSDatabaseView.m
@ -21,9 +21,7 @@ NSString *const TSArchiveGroup = @"TSArchiveGroup";
 NSString *const TSUnreadIncomingMessagesGroup = @"TSUnreadIncomingMessagesGroup";
 NSString *const TSSecondaryDevicesGroup = @"TSSecondaryDevicesGroup";

-// YAPDB BUG: when changing from non-persistent to persistent view, we had to rename TSThreadDatabaseViewExtensionName
-// -> TSThreadDatabaseViewExtensionName2 to work around https://github.com/yapstudios/YapDatabase/issues/324
-NSString *const TSThreadDatabaseViewExtensionName = @"TSThreadDatabaseViewExtensionName2";
+NSString *const TSThreadDatabaseViewExtensionName = @"TSThreadDatabaseViewExtensionName";
 NSString *const TSMessageDatabaseViewExtensionName = @"TSMessageDatabaseViewExtensionName";
 NSString *const TSThreadOutgoingMessageDatabaseViewExtensionName = @"TSThreadOutgoingMessageDatabaseViewExtensionName";
 NSString *const TSUnreadDatabaseViewExtensionName = @"TSUnreadDatabaseViewExtensionName";
--- a/src/Storage/TSStorageManager+keyingMaterial.m
+++ b/src/Storage/TSStorageManager+keyingMaterial.m
@ -53,7 +53,7 @@

 - (void)storePhoneNumber:(NSString *)phoneNumber
 {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [transaction setObject:phoneNumber
                        forKey:TSStorageRegisteredNumberKey
                  inCollection:TSStorageUserAccountCollection];
@ -61,12 +61,13 @@
 }

 + (void)storeServerToken:(NSString *)authToken signalingKey:(NSString *)signalingKey {
-    TSStorageManager *sharedManager = self.sharedManager;
-    [sharedManager.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-        [transaction setObject:authToken forKey:TSStorageServerAuthToken inCollection:TSStorageUserAccountCollection];
-        [transaction setObject:signalingKey
-                        forKey:TSStorageServerSignalingKey
-                  inCollection:TSStorageUserAccountCollection];
+    YapDatabaseConnection *dbConn = [[self sharedManager] dbConnection];
+
+    [dbConn readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+      [transaction setObject:authToken forKey:TSStorageServerAuthToken inCollection:TSStorageUserAccountCollection];
+      [transaction setObject:signalingKey
+                      forKey:TSStorageServerSignalingKey
+                inCollection:TSStorageUserAccountCollection];

    }];
 }
--- a/src/Storage/TSStorageManager.h
+++ b/src/Storage/TSStorageManager.h
@ -61,8 +61,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (nullable SignedPreKeyRecord *)signedPreKeyRecordForKey:(NSString *)key inCollection:(NSString *)collection;
 - (void)purgeCollection:(NSString *)collection;

-@property (nullable, nonatomic, readonly) YapDatabaseConnection *dbReadConnection;
-@property (nullable, nonatomic, readonly) YapDatabaseConnection *dbReadWriteConnection;
+@property (nullable, nonatomic, readonly) YapDatabaseConnection *dbConnection;

@end

--- a/src/Storage/TSStorageManager.m
+++ b/src/Storage/TSStorageManager.m
@ -156,8 +156,7 @@ static NSString *keychainDBPassAccount    = @"TSDatabasePass";
    if (!_database) {
        return NO;
    }
-    _dbReadConnection = self.newDatabaseConnection;
-    _dbReadWriteConnection = self.newDatabaseConnection;
+    _dbConnection = self.newDatabaseConnection;

    return YES;
 }
@ -389,19 +388,19 @@ static NSString *keychainDBPassAccount    = @"TSDatabasePass";
 #pragma mark - convenience methods

 - (void)purgeCollection:(NSString *)collection {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-        [transaction removeAllObjectsInCollection:collection];
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+      [transaction removeAllObjectsInCollection:collection];
    }];
 }

 - (void)setObject:(id)object forKey:(NSString *)key inCollection:(NSString *)collection {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-        [transaction setObject:object forKey:key inCollection:collection];
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+      [transaction setObject:object forKey:key inCollection:collection];
    }];
 }

 - (void)removeObjectForKey:(NSString *)string inCollection:(NSString *)collection {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [transaction removeObjectForKey:string inCollection:collection];
    }];
 }
@ -409,8 +408,8 @@ static NSString *keychainDBPassAccount    = @"TSDatabasePass";
 - (id)objectForKey:(NSString *)key inCollection:(NSString *)collection {
    __block NSString *object;

-    [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-        object = [transaction objectForKey:key inCollection:collection];
+    [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+      object = [transaction objectForKey:key inCollection:collection];
    }];

    return object;
@ -420,8 +419,8 @@ static NSString *keychainDBPassAccount    = @"TSDatabasePass";
 {
    __block NSDictionary *object;

-    [self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
-        object = [transaction objectForKey:key inCollection:collection];
+    [self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+      object = [transaction objectForKey:key inCollection:collection];
    }];

    return object;
@ -480,7 +479,7 @@ static NSString *keychainDBPassAccount    = @"TSDatabasePass";
 - (int)incrementIntForKey:(NSString *)key inCollection:(NSString *)collection
 {
    __block int value = 0;
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        value = [[transaction objectForKey:key inCollection:collection] intValue];
        value++;
        [transaction setObject:@(value) forKey:key inCollection:collection];
@ -504,11 +503,11 @@ static NSString *keychainDBPassAccount    = @"TSDatabasePass";
 }

 - (void)deleteThreadsAndMessages {
-    [self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-        [transaction removeAllObjectsInCollection:[TSThread collection]];
-        [transaction removeAllObjectsInCollection:[SignalRecipient collection]];
-        [transaction removeAllObjectsInCollection:[TSInteraction collection]];
-        [transaction removeAllObjectsInCollection:[TSAttachment collection]];
+    [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+      [transaction removeAllObjectsInCollection:[TSThread collection]];
+      [transaction removeAllObjectsInCollection:[SignalRecipient collection]];
+      [transaction removeAllObjectsInCollection:[TSInteraction collection]];
+      [transaction removeAllObjectsInCollection:[TSAttachment collection]];
    }];
    [TSAttachmentStream deleteAttachments];
 }
@ -530,8 +529,7 @@ static NSString *keychainDBPassAccount    = @"TSDatabasePass";
 - (void)resetSignalStorage
 {
    self.database = nil;
-    _dbReadConnection = nil;
-    _dbReadWriteConnection = nil;
+    _dbConnection = nil;

    [self deletePasswordFromKeychain];

--- a/src/Storage/TSYapDatabaseObject.h
+++ b/src/Storage/TSYapDatabaseObject.h
@ -58,12 +58,10 @@
                                       usingBlock:(void (^)(id object, BOOL *stop))block;

 /**
- * @return Shared database connections for reading and writing.
+ * @return A shared database connection.
 */
- (YapDatabaseConnection *)dbReadConnection;
-+ (YapDatabaseConnection *)dbReadConnection;
- (YapDatabaseConnection *)dbReadWriteConnection;
-+ (YapDatabaseConnection *)dbReadWriteConnection;
+- (YapDatabaseConnection *)dbConnection;
+ (YapDatabaseConnection *)dbConnection;

 - (TSStorageManager *)storageManager;
 + (TSStorageManager *)storageManager;
--- a/src/Storage/TSYapDatabaseObject.m
+++ b/src/Storage/TSYapDatabaseObject.m
@ -1,6 +1,5 @@
-//
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//
+//  Created by Frederic Jacobs on 16/11/14.
+//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.

 #import "TSYapDatabaseObject.h"
 #import "TSStorageManager.h"
@ -32,7 +31,7 @@

 - (void)save
 {
-    [[self dbReadWriteConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [[self dbConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self saveWithTransaction:transaction];
    }];
 }
@ -44,7 +43,7 @@

 - (void)touch
 {
-    [[self dbReadWriteConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [[self dbConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self touchWithTransaction:transaction];
    }];
 }
@ -56,19 +55,14 @@

 - (void)remove
 {
-    [[self dbReadWriteConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [[self dbConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [self removeWithTransaction:transaction];
    }];
 }

- (YapDatabaseConnection *)dbReadConnection
+- (YapDatabaseConnection *)dbConnection
 {
-    return [[self class] dbReadConnection];
-}
-
- (YapDatabaseConnection *)dbReadWriteConnection
-{
-    return [[self class] dbReadWriteConnection];
+    return [[self class] dbConnection];
 }

 - (TSStorageManager *)storageManager
@ -78,26 +72,9 @@

 #pragma mark Class Methods

-+ (YapDatabaseConnection *)dbReadConnection
+ (YapDatabaseConnection *)dbConnection
 {
-    // We use TSYapDatabaseObject's dbReadWriteConnection (not TSStorageManager's
-    // dbReadConnection) for consistency, since we tend to [TSYapDatabaseObject
-    // save] and want to write to the same connection we read from.  To get true
-    // consistency, we'd want to update entities by reading & writing from within
-    // the same transaction, but that'll be a big refactor.
-
-    return self.dbReadWriteConnection;
-}
-
-+ (YapDatabaseConnection *)dbReadWriteConnection
-{
-    // Use a dedicated connection for model reads & writes.
-    static YapDatabaseConnection *dbReadWriteConnection = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        dbReadWriteConnection = [self storageManager].newDatabaseConnection;
-    });
-    return dbReadWriteConnection;
+    return [self storageManager].dbConnection;
 }

 + (TSStorageManager *)storageManager
@ -113,7 +90,7 @@
 + (NSUInteger)numberOfKeysInCollection
 {
    __block NSUInteger count;
-    [[self dbReadConnection] readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+    [[self dbConnection] readWithBlock:^(YapDatabaseReadTransaction *transaction) {
        count = [self numberOfKeysInCollectionWithTransaction:transaction];
    }];
    return count;
@ -135,7 +112,7 @@

 + (void)enumerateCollectionObjectsUsingBlock:(void (^)(id object, BOOL *stop))block
 {
-    [[self dbReadConnection] readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+    [[self dbConnection] readWithBlock:^(YapDatabaseReadTransaction *transaction) {
        [self enumerateCollectionObjectsWithTransaction:transaction usingBlock:block];
    }];
 }
@ -154,7 +131,7 @@

 + (void)removeAllObjectsInCollection
 {
-    [[self dbReadWriteConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+    [[self dbConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        [transaction removeAllObjectsInCollection:[self collection]];
    }];
 }
@ -167,7 +144,7 @@
 + (instancetype)fetchObjectWithUniqueID:(NSString *)uniqueID
 {
    __block id object;
-    [[self dbReadConnection] readWithBlock:^(YapDatabaseReadTransaction *transaction) {
+    [[self dbConnection] readWithBlock:^(YapDatabaseReadTransaction *transaction) {
        object = [transaction objectForKey:uniqueID inCollection:[self collection]];
    }];
    return object;
--- a/src/Util/Cryptography.m
+++ b/src/Util/Cryptography.m
@ -153,6 +153,8 @@ NS_ASSUME_NONNULL_BEGIN
            DDLogWarn(@"%@ Bad digest on decrypting payload. Their digest: %@, our digest: %@", self.tag, digest, ourDigest);
            return nil;
        }
+    } else {
+        DDLogVerbose(@"%@ %s no digest to verify", self.tag, __PRETTY_FUNCTION__);
    }

    // decrypt
--- a/src/Util/MIMETypeUtil.m
+++ b/src/Util/MIMETypeUtil.m
@ -420,12 +420,6 @@ NSString *const OWSMimeTypeUnknownForTests = @"unknown/mimetype";

 + (nullable NSString *)fileExtensionForUTIType:(NSString *)utiType
 {
-    // Special-case the "aac" filetype we use for voice messages (for legacy reasons)
-    // to use a .m4a file extension, not .aac, since AVAudioPlayer can't handle .aac
-    // properly. Doesn't affect file contents.
-    if ([utiType isEqualToString:@"public.aac-audio"]) {
-        return @"m4a";
-    }
    CFStringRef fileExtension
        = UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)utiType, kUTTagClassFilenameExtension);
    return (__bridge_transfer NSString *)fileExtension;
--- a/tests/Account/SignedPreKeyDeletionTests.m
+++ b/tests/Account/SignedPreKeyDeletionTests.m
@ -30,10 +30,9 @@
 }

 - (void)testSignedPreKeyDeletion {
-    [[TSStorageManager sharedManager].dbReadWriteConnection
-        readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-            [transaction removeAllObjectsInCollection:TSStorageManagerSignedPreKeyStoreCollection];
-        }];
+    [[TSStorageManager sharedManager].dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        [transaction removeAllObjectsInCollection:TSStorageManagerSignedPreKeyStoreCollection];
+    }];

    int days = 20;
    int lastPreKeyId = days;
@ -70,10 +69,9 @@

 - (void)testSignedPreKeyDeletionKeepsSomeOldKeys
 {
-    [[TSStorageManager sharedManager].dbReadWriteConnection
-        readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-            [transaction removeAllObjectsInCollection:TSStorageManagerSignedPreKeyStoreCollection];
-        }];
+    [[TSStorageManager sharedManager].dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        [transaction removeAllObjectsInCollection:TSStorageManagerSignedPreKeyStoreCollection];
+    }];

    int lastPreKeyId = 10;
    for (int i = 0; i <= 10; i++) {
@ -115,11 +113,10 @@
 }

 - (void)testOlderRecordsNotDeletedIfNoReplacement {
-    [[TSStorageManager sharedManager].dbReadWriteConnection
-        readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-            [transaction removeAllObjectsInCollection:TSStorageManagerSignedPreKeyStoreCollection];
-        }];
-
+    [[TSStorageManager sharedManager].dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        [transaction removeAllObjectsInCollection:TSStorageManagerSignedPreKeyStoreCollection];
+    }];
+    
    int days = 3;
    int lastPreKeyId = days;

--- a/tests/Storage/OWSOrphanedDataCleanerTest.m
+++ b/tests/Storage/OWSOrphanedDataCleanerTest.m
@ -14,8 +14,6 @@

@end

-#pragma mark -
-
@implementation OWSOrphanedDataCleanerTest

 - (void)setUp
@ -26,7 +24,7 @@

    // Set up initial conditions & Sanity check
    [TSAttachmentStream deleteAttachments];
-    XCTAssertEqual(0, [self numberOfItemsInAttachmentsFolder]);
+    XCTAssertEqual(0, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
    [TSAttachmentStream removeAllObjectsInCollection];
    XCTAssertEqual(0, [TSAttachmentStream numberOfKeysInCollection]);
    [TSIncomingMessage removeAllObjectsInCollection];
@ -40,11 +38,6 @@
    [super tearDown];
 }

- (NSUInteger)numberOfItemsInAttachmentsFolder
-{
-    return [OWSOrphanedDataCleaner filePathsInAttachmentsFolder].count;
-}
-
 - (void)testInteractionsWithoutThreadAreDeleted
 {
    // This thread is intentionally not saved. It's meant to recreate a situation we've seen where interactions exist
@ -60,17 +53,7 @@
    [incomingMessage save];
    XCTAssertEqual(1, [TSIncomingMessage numberOfKeysInCollection]);

-    XCTestExpectation *expectation = [self expectationWithDescription:@"Cleanup"];
-    [OWSOrphanedDataCleaner auditAndCleanupAsync:^{
-        [expectation fulfill];
-    }];
-    [self waitForExpectationsWithTimeout:5.0
-                                 handler:^(NSError *error) {
-                                     if (error) {
-                                         XCTFail(@"Expectation Failed with error: %@", error);
-                                     }
-                                 }];
-
+    [[OWSOrphanedDataCleaner new] removeOrphanedData];
    XCTAssertEqual(0, [TSIncomingMessage numberOfKeysInCollection]);
 }

@ -87,24 +70,14 @@
    [incomingMessage save];
    XCTAssertEqual(1, [TSIncomingMessage numberOfKeysInCollection]);

-    XCTestExpectation *expectation = [self expectationWithDescription:@"Cleanup"];
-    [OWSOrphanedDataCleaner auditAndCleanupAsync:^{
-        [expectation fulfill];
-    }];
-    [self waitForExpectationsWithTimeout:5.0
-                                 handler:^(NSError *error) {
-                                     if (error) {
-                                         XCTFail(@"Expectation Failed with error: %@", error);
-                                     }
-                                 }];
-
+    [[OWSOrphanedDataCleaner new] removeOrphanedData];
    XCTAssertEqual(1, [TSIncomingMessage numberOfKeysInCollection]);
 }

 - (void)testFilesWithoutInteractionsAreDeleted
 {
    // sanity check
-    XCTAssertEqual(0, [self numberOfItemsInAttachmentsFolder]);
+    XCTAssertEqual(0, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);

    NSError *error;
    TSAttachmentStream *attachmentStream = [[TSAttachmentStream alloc] initWithContentType:@"image/jpeg" sourceFilename:nil];
@ -113,25 +86,12 @@
    NSString *orphanedFilePath = [attachmentStream filePath];
    BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
    XCTAssert(fileExists);
-    XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]);
-
-    // Do multiple cleanup passes.
-    for (int i = 0; i < 2; i++) {
-        XCTestExpectation *expectation = [self expectationWithDescription:@"Cleanup"];
-        [OWSOrphanedDataCleaner auditAndCleanupAsync:^{
-            [expectation fulfill];
-        }];
-        [self waitForExpectationsWithTimeout:5.0
-                                     handler:^(NSError *error) {
-                                         if (error) {
-                                             XCTFail(@"Expectation Failed with error: %@", error);
-                                         }
-                                     }];
-    }
+    XCTAssertEqual(1, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);

+    [[OWSOrphanedDataCleaner new] removeOrphanedData];
    fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
    XCTAssertFalse(fileExists);
-    XCTAssertEqual(0, [self numberOfItemsInAttachmentsFolder]);
+    XCTAssertEqual(0, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
 }

 - (void)testFilesWithInteractionsAreNotDeleted
@ -156,22 +116,13 @@
    NSString *attachmentFilePath = [attachmentStream filePath];
    BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:attachmentFilePath];
    XCTAssert(fileExists);
-    XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]);
+    XCTAssertEqual(1, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);

-    XCTestExpectation *expectation = [self expectationWithDescription:@"Cleanup"];
-    [OWSOrphanedDataCleaner auditAndCleanupAsync:^{
-        [expectation fulfill];
-    }];
-    [self waitForExpectationsWithTimeout:5.0
-                                 handler:^(NSError *error) {
-                                     if (error) {
-                                         XCTFail(@"Expectation Failed with error: %@", error);
-                                     }
-                                 }];
+    [[OWSOrphanedDataCleaner new] removeOrphanedData];

    fileExists = [[NSFileManager defaultManager] fileExistsAtPath:attachmentFilePath];
    XCTAssert(fileExists);
-    XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]);
+    XCTAssertEqual(1, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
 }

 - (void)testFilesWithoutAttachmentStreamsAreDeleted
@ -184,22 +135,12 @@
    NSString *orphanedFilePath = [attachmentStream filePath];
    BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
    XCTAssert(fileExists);
-    XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]);
-
-    XCTestExpectation *expectation = [self expectationWithDescription:@"Cleanup"];
-    [OWSOrphanedDataCleaner auditAndCleanupAsync:^{
-        [expectation fulfill];
-    }];
-    [self waitForExpectationsWithTimeout:5.0
-                                 handler:^(NSError *error) {
-                                     if (error) {
-                                         XCTFail(@"Expectation Failed with error: %@", error);
-                                     }
-                                 }];
+    XCTAssertEqual(1, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);

+    [[OWSOrphanedDataCleaner new] removeOrphanedData];
    fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
    XCTAssertFalse(fileExists);
-    XCTAssertEqual(0, [self numberOfItemsInAttachmentsFolder]);
+    XCTAssertEqual(0, [TSAttachmentStream numberOfItemsInAttachmentsFolder]);
 }

@end
--- a/tests/Storage/TSMessageStorageTests.m
+++ b/tests/Storage/TSMessageStorageTests.m
@ -27,14 +27,13 @@
 - (void)setUp
 {
    [super setUp];
-
-    [[TSStorageManager sharedManager].dbReadWriteConnection
-        readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
-            self.thread = [TSContactThread getOrCreateThreadWithContactId:@"aStupidId" transaction:transaction];
-
-            [self.thread saveWithTransaction:transaction];
-        }];
-
+    
+    [[TSStorageManager sharedManager].dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
+        self.thread = [TSContactThread getOrCreateThreadWithContactId:@"aStupidId" transaction:transaction];
+        
+        [self.thread saveWithTransaction:transaction];
+    }];
+    
    TSStorageManager *manager = [TSStorageManager sharedManager];
    [manager purgeCollection:[TSMessage collection]];
 }
@ -155,8 +154,7 @@
    NSString *body = @"A child born today will grow up with no conception of privacy at all. They’ll never know what it means to have a private moment to themselves an unrecorded, unanalyzed thought. And that’s a problem because privacy matters; privacy is what allows us to determine who we are and who we want to be.";

    __block TSGroupThread *thread;
-    [[TSStorageManager sharedManager].dbReadWriteConnection readWriteWithBlock:^(
-        YapDatabaseReadWriteTransaction *transaction) {
+    [[TSStorageManager sharedManager].dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
        thread = [TSGroupThread getOrCreateThreadWithGroupModel:[[TSGroupModel alloc] initWithTitle:@"fdsfsd"
                                                                                          memberIds:[@[] mutableCopy]
                                                                                              image:nil