Use cached group details when rendering blocklist

Signal.xcodeproj/project.pbxproj

@@ -435,6 +435,7 @@
 		4C13C9F620E57BA30089A98B /* ColorPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C13C9F520E57BA30089A98B /* ColorPickerViewController.swift */; };
 		4C20B2B720CA0034001BAC90 /* ThreadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4542DF51208B82E9007B4E76 /* ThreadViewModel.swift */; };
 		4C20B2B920CA10DE001BAC90 /* ConversationSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C20B2B820CA10DE001BAC90 /* ConversationSearchViewController.swift */; };
+		4C2F454F214C00E1004871FF /* AvatarTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */; };
 		4C3EF7FD2107DDEE0007EBF7 /* ParamParserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EF7FC2107DDEE0007EBF7 /* ParamParserTest.swift */; };
 		4C3EF802210918740007EBF7 /* SSKProtoEnvelopeTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C3EF801210918740007EBF7 /* SSKProtoEnvelopeTest.swift */; };
 		4C4AEC4520EC343B0020E72B /* DismissableTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C4AEC4420EC343B0020E72B /* DismissableTextField.swift */; };
@@ -1125,6 +1126,7 @@
 		4C11AA4F20FD59C700351FBD /* MessageStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageStatusView.swift; sourceTree = "<group>"; };
 		4C13C9F520E57BA30089A98B /* ColorPickerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorPickerViewController.swift; sourceTree = "<group>"; };
 		4C20B2B820CA10DE001BAC90 /* ConversationSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationSearchViewController.swift; sourceTree = "<group>"; };
+		4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarTableViewCell.swift; sourceTree = "<group>"; };
 		4C3EF7FC2107DDEE0007EBF7 /* ParamParserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParamParserTest.swift; sourceTree = "<group>"; };
 		4C3EF801210918740007EBF7 /* SSKProtoEnvelopeTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSKProtoEnvelopeTest.swift; sourceTree = "<group>"; };
 		4C4AEC4420EC343B0020E72B /* DismissableTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DismissableTextField.swift; sourceTree = "<group>"; };
@@ -2233,6 +2235,7 @@
 			isa = PBXGroup;
 			children = (
 				452EA09D1EA7ABE00078744B /* AttachmentPointerView.swift */,
+				4C2F454E214C00E1004871FF /* AvatarTableViewCell.swift */,
 				34E3E5671EC4B19400495BAC /* AudioProgressView.swift */,
 				451764291DE939FD00EDB8B9 /* ContactCell.swift */,
 				4523149F1F7E9E18003A428C /* DirectionalPanGestureRecognizer.swift */,
@@ -3327,6 +3330,7 @@
 				451166C01FD86B98000739BA /* AccountManager.swift in Sources */,
 				34D2CCD220618B3000CB1A14 /* OWSBackupLazyRestoreJob.swift in Sources */,
 				3430FE181F7751D4000EC51B /* GiphyAPI.swift in Sources */,
+				4C2F454F214C00E1004871FF /* AvatarTableViewCell.swift in Sources */,
 				34A55F3720485465002CC6DE /* OWS2FARegistrationViewController.m in Sources */,
 				340FC8AD204DAC8D007AEB0F /* OWSLinkedDevicesTableViewController.m in Sources */,
 				340FC8AA204DAC8D007AEB0F /* NotificationSettingsViewController.m in Sources */,

Signal/src/ViewControllers/AppSettings/BlockListViewController.m

@@ -9,6 +9,7 @@
 #import "ContactsViewHelper.h"
 #import "OWSTableViewController.h"
 #import "PhoneNumber.h"
+#import "Signal-Swift.h"
 #import "UIFont+OWS.h"
 #import "UIView+OWS.h"
 #import <SignalMessaging/Environment.h>
@@ -115,20 +116,25 @@ NS_ASSUME_NONNULL_BEGIN
         blockedGroupsSection.headerTitle = NSLocalizedString(
             @"BLOCK_LIST_BLOCKED_GROUPS_SECTION", @"Section header for groups that have been blocked");
         for (NSData *groupId in blockedGroupIds) {
-            TSGroupThread *groupThread = [TSGroupThread getOrCreateThreadWithGroupId:groupId];
+            TSGroupModel *_Nullable cachedGroup = [self.blockingManager cachedGroupDetailsWithGroupId:groupId];
+            OWSAssert(cachedGroup);
+            UIImage *image = cachedGroup.groupImage ?: OWSGroupAvatarBuilder.defaultGroupImage;
+            NSString *groupName = cachedGroup.groupName ?: TSGroupThread.defaultGroupName;
+            
             [blockedGroupsSection addItem:[OWSTableItem
                                               itemWithCustomCellBlock:^{
-                                                  ContactTableViewCell *cell = [ContactTableViewCell new];
+                                                  OWSAvatarTableViewCell *cell = [OWSAvatarTableViewCell new];
-                                                  [cell configureWithThread:groupThread
+                                                  [cell configureWithImage:image
-                                                            contactsManager:helper.contactsManager];
+                                                                      text:groupName
+                                                                detailText:nil];
                                                   return cell;
                                               }
                                               customRowHeight:UITableViewAutomaticDimension
                                               actionBlock:^{
-                                                  [BlockListUIUtils showUnblockThreadActionSheet:groupThread
+                                                  [BlockListUIUtils showUnblockGroupActionSheet:cachedGroup
+                                                                                    displayName:groupName
                                                                               fromViewController:weakSelf
                                                                                  blockingManager:helper.blockingManager
-                                                                                 contactsManager:helper.contactsManager
                                                                                  completionBlock:nil];
                                               }]];
         }

Signal/src/views/AvatarTableViewCell.swift

@@ -0,0 +1,72 @@
+//
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//
+
+import Foundation
+
+@objc(OWSAvatarTableViewCell)
+public class AvatarTableViewCell: UITableViewCell {
+
+    private let columns: UIStackView
+    private let textRows: UIStackView
+    private let avatarView: AvatarImageView
+
+    private let _textLabel: UILabel
+    override public var textLabel: UILabel? {
+        get {
+            return _textLabel
+        }
+    }
+
+    private let _detailTextLabel: UILabel
+    override public var detailTextLabel: UILabel? {
+        get {
+            return _detailTextLabel
+        }
+    }
+
+    @objc
+    public override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+        self.avatarView =  AvatarImageView()
+        avatarView.autoSetDimensions(to: CGSize(width: CGFloat(kContactCellAvatarSize), height: CGFloat(kContactCellAvatarSize)))
+
+        self._textLabel = UILabel()
+        self._detailTextLabel = UILabel()
+
+        self.textRows = UIStackView(arrangedSubviews: [_textLabel, _detailTextLabel])
+        textRows.axis = .vertical
+
+        self.columns = UIStackView(arrangedSubviews: [avatarView, textRows])
+        columns.axis = .horizontal
+        columns.spacing = CGFloat(kContactCellAvatarTextMargin)
+
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+
+        self.contentView.addSubview(columns)
+        columns.autoPinEdgesToSuperviewMargins()
+
+        OWSTableItem.configureCell(self)
+    }
+
+    required public init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    @objc
+    public func configure(image: UIImage?, text: String?, detailText: String?) {
+        self.avatarView.image = image
+        self.textLabel?.text = text
+        self.detailTextLabel?.text = detailText
+
+        OWSTableItem.configureCell(self)
+    }
+
+    @objc
+    public override func prepareForReuse() {
+        super.prepareForReuse()
+
+        self.avatarView.image = nil
+        self.textLabel?.text = nil
+        self.detailTextLabel?.text = nil
+    }
+}

SignalMessaging/utils/BlockListUIUtils.h

@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class OWSContactsManager;
 @class OWSMessageSender;
 @class SignalAccount;
+@class TSGroupModel;
 @class TSThread;
 
 typedef void (^BlockActionCompletionBlock)(BOOL isBlocked);
@@ -60,6 +61,12 @@ typedef void (^BlockActionCompletionBlock)(BOOL isBlocked);
                             contactsManager:(OWSContactsManager *)contactsManager
                             completionBlock:(nullable BlockActionCompletionBlock)completionBlock;
 
++ (void)showUnblockGroupActionSheet:(TSGroupModel *)groupModel
+                        displayName:(NSString *)displayName
+                 fromViewController:(UIViewController *)fromViewController
+                    blockingManager:(OWSBlockingManager *)blockingManager
+                    completionBlock:(nullable BlockActionCompletionBlock)completionBlock;
+
 #pragma mark - UI Utils
 
 + (NSString *)formatDisplayNameForAlertTitle:(NSString *)displayName;

SignalMessaging/utils/OWSGroupAvatarBuilder.h

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSAvatarBuilder.h"
@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface OWSGroupAvatarBuilder : OWSAvatarBuilder
 
 - (instancetype)initWithThread:(TSGroupThread *)thread;
++ (UIImage *)defaultGroupImage;
 
 @end
 

SignalMessaging/utils/OWSGroupAvatarBuilder.m

@@ -33,6 +33,11 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (UIImage *)buildDefaultImage
+{
+    return self.class.defaultGroupImage;
+}
+
++ (UIImage *)defaultGroupImage
 {
     static UIImage *defaultGroupImage;
     static dispatch_once_t onceToken;

SignalServiceKit/src/Contacts/Threads/TSGroupThread.h

@@ -29,6 +29,8 @@ extern NSString *const TSGroupThread_NotificationKey_UniqueId;
 
 + (NSString *)threadIdFromGroupId:(NSData *)groupId;
 
++ (NSString *)defaultGroupName;
+
 // all group threads containing recipient as a member
 + (NSArray<TSGroupThread *> *)groupThreadsWithRecipientId:(NSString *)recipientId
                                               transaction:(YapDatabaseReadWriteTransaction *)transaction;

SignalServiceKit/src/Contacts/Threads/TSGroupThread.m

@@ -175,7 +175,12 @@ NSString *const TSGroupThread_NotificationKey_UniqueId = @"TSGroupThread_Notific
 
 - (NSString *)name
 {
-    return self.groupModel.groupName ? self.groupModel.groupName : NSLocalizedString(@"NEW_GROUP_DEFAULT_TITLE", @"");
+    return self.groupModel.groupName ?: self.class.defaultGroupName;
+}
+
++ (NSString *)defaultGroupName
+{
+    return NSLocalizedString(@"NEW_GROUP_DEFAULT_TITLE", @"");
 }
 
 - (void)leaveGroupWithSneakyTransaction