Merge branch 'mkirk/fix-spurious-disabled-timer-messages'

Signal/src/ViewControllers/DebugUI/DebugUIMisc.m

@@ -69,6 +69,18 @@ NS_ASSUME_NONNULL_BEGIN
                                          [DebugUIMisc clearHasDismissedOffers];
                                      }]];
 
+    [items addObject:[OWSTableItem itemWithTitle:@"Delete disappearing messages config"
+                                     actionBlock:^{
+                                         [[OWSPrimaryStorage sharedManager].newDatabaseConnection readWriteWithBlock:^(
+                                             YapDatabaseReadWriteTransaction *_Nonnull transaction) {
+                                             OWSDisappearingMessagesConfiguration *config =
+                                                 [OWSDisappearingMessagesConfiguration
+                                                     fetchOrCreateDefaultWithThreadId:thread.uniqueId
+                                                                          transaction:transaction];
+                                             [config removeWithTransaction:transaction];
+                                         }];
+                                     }]];
+
     [items addObject:[OWSTableItem
                          itemWithTitle:@"Re-register"
                            actionBlock:^{

SignalServiceKit/src/Contacts/OWSDisappearingMessagesConfiguration.m

@@ -44,8 +44,8 @@ NS_ASSUME_NONNULL_BEGIN
 
     _enabled = isEnabled;
     _durationSeconds = seconds;
-    _originalDictionaryValue = [NSDictionary new];
     _newRecord = YES;
+    _originalDictionaryValue = self.dictionaryValue;
 
     return self;
 }