{"action":"created","comment":{"url":"https://api.github.com/repos/wireapp/wire-ios/pulls/comments/90838176","pull_request_review_id":11351659,"id":90838176,"diff_hunk":"@@ -235,6 +238,55 @@ - (void)createContentViewController\n     self.contentViewController.bottomMargin = 16;\n }\n \n+- (void)createOutgoingConnectionViewController\n+{\n+    self.outgoingConnectionViewController = [[OutgoingConnectionViewController alloc] init];\n+    @weakify(self);\n+    self.outgoingConnectionViewController.buttonCallback = ^(OutgoingConnectionBottomBarAction action) {\n+        @strongify(self);\n+        [ZMUserSession.sharedSession enqueueChanges:^{\n+            switch (action) {\n+                case OutgoingConnectionBottomBarActionCancel:\n+                    [self.conversation.firstActiveParticipantOtherThanSelf cancelConnectionRequest];\n+                    break;\n+                case OutgoingConnectionBottomBarActionArchive:\n+                    self.conversation.isArchived = YES;\n+                    break;\n+            }\n+        }];\n+\n+        [self openConversationList];\n+    };\n+\n+    self.outgoingConnectionViewController.view.translatesAutoresizingMaskIntoConstraints = NO;\n+}\n+\n+- (void)updateOutgoingConnectionVisibility\n+{\n+    if (nil == self.conversation) {\n+        return;\n+    }\n+\n+    BOOL outgoingConnection = self.conversation.relatedConnectionState == ZMConnectionStatusSent;\n+    self.contentViewController.tableView.scrollEnabled = !outgoingConnection;","path":"Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.m","position":51,"original_position":51,"commit_id":"24f2232c196999bea5a1c153e108f5eae448ed0f","original_commit_id":"24f2232c196999bea5a1c153e108f5eae448ed0f","user":{"login":"mikeger","id":715129,"avatar_url":"https://avatars.githubusercontent.com/u/715129?v=3","gravatar_id":"","url":"https://api.github.com/users/mikeger","html_url":"https://github.com/mikeger","followers_url":"https://api.github.com/users/mikeger/followers","following_url":"https://api.github.com/users/mikeger/following{/other_user}","gists_url":"https://api.github.com/users/mikeger/gists{/gist_id}","starred_url":"https://api.github.com/users/mikeger/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mikeger/subscriptions","organizations_url":"https://api.github.com/users/mikeger/orgs","repos_url":"https://api.github.com/users/mikeger/repos","events_url":"https://api.github.com/users/mikeger/events{/privacy}","received_events_url":"https://api.github.com/users/mikeger/received_events","type":"User","site_admin":false},"body":"Funny, I asked Yorgos and he said last time that it is fine that it is remaining scrollable as conversation content.","created_at":"2016-12-05T10:33:22Z","updated_at":"2016-12-05T10:36:27Z","html_url":"https://github.com/wireapp/wire-ios/pull/450#discussion_r90838176","pull_request_url":"https://api.github.com/repos/wireapp/wire-ios/pulls/450","_links":{"self":{"href":"https://api.github.com/repos/wireapp/wire-ios/pulls/comments/90838176"},"html":{"href":"https://github.com/wireapp/wire-ios/pull/450#discussion_r90838176"},"pull_request":{"href":"https://api.github.com/repos/wireapp/wire-ios/pulls/450"}}},"pull_request":{"url":"https://api.github.com/repos/wireapp/wire-ios/pulls/450","id":96499749,"html_url":"https://github.com/wireapp/wire-ios/pull/450","diff_url":"https://github.com/wireapp/wire-ios/pull/450.diff","patch_url":"https://github.com/wireapp/wire-ios/pull/450.patch","issue_url":"https://api.github.com/repos/wireapp/wire-ios/issues/450","number":450,"state":"open","locked":false,"title":"Feature/usernames conversation menu","user":{"login":"daehn","id":4603353,"avatar_url":"https://avatars.githubusercontent.com/u/4603353?v=3","gravatar_id":"","url":"https://api.github.com/users/daehn","html_url":"https://github.com/daehn","followers_url":"https://api.github.com/users/daehn/followers","following_url":"https://api.github.com/users/daehn/following{/other_user}","gists_url":"https://api.github.com/users/daehn/gists{/gist_id}","starred_url":"https://api.github.com/users/daehn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/daehn/subscriptions","organizations_url":"https://api.github.com/users/daehn/orgs","repos_url":"https://api.github.com/users/daehn/repos","events_url":"https://api.github.com/users/daehn/events{/privacy}","received_events_url":"https://api.github.com/users/daehn/received_events","type":"User","site_admin":false},"body":"# What's in this PR?\r\n\r\n* This splits `UserConnectionView` in two separate classes, `UserConnectionView` and `IncomingConnectionView`. While `UserConnectionView` does not contain any controls anymore (the cancel request and archive button have been moved into a separate class called `OutgoingConnectionBottomBar`) and is shown at the top of 1-on-1 conversations, the `IncomingConnectionView` is used to show incoming requests and has a ignore and accept button. The controls for outgoing connection requests have been moved into a separate control to make the header more reusable and fix layout issues for outgoing requests.\r\n* Add functionality to use an arbitrary UIView as title view in an `ActionSheetController`, this was needed in order to use a `UserNameDetailView` (containing the name, handle and correlation labels) at the top instead of a simple label.\r\n* Copy adjustments (invitations & search).","created_at":"2016-12-05T10:05:40Z","updated_at":"2016-12-05T10:36:27Z","closed_at":null,"merged_at":null,"merge_commit_sha":"96e48d559306c9b6a6d1ce5a7d87e6f0280a63d0","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/wireapp/wire-ios/pulls/450/commits","review_comments_url":"https://api.github.com/repos/wireapp/wire-ios/pulls/450/comments","review_comment_url":"https://api.github.com/repos/wireapp/wire-ios/pulls/comments{/number}","comments_url":"https://api.github.com/repos/wireapp/wire-ios/issues/450/comments","statuses_url":"https://api.github.com/repos/wireapp/wire-ios/statuses/24f2232c196999bea5a1c153e108f5eae448ed0f","head":{"label":"wireapp:feature/usernames-conversation-menu","ref":"feature/usernames-conversation-menu","sha":"24f2232c196999bea5a1c153e108f5eae448ed0f","user":{"login":"wireapp","id":16047324,"avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=3","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"repo":{"id":63855049,"name":"wire-ios","full_name":"wireapp/wire-ios","owner":{"login":"wireapp","id":16047324,"avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=3","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/wireapp/wire-ios","description":"📱 Wire iOS client (iPhone and iPad)","fork":false,"url":"https://api.github.com/repos/wireapp/wire-ios","forks_url":"https://api.github.com/repos/wireapp/wire-ios/forks","keys_url":"https://api.github.com/repos/wireapp/wire-ios/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wireapp/wire-ios/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wireapp/wire-ios/teams","hooks_url":"https://api.github.com/repos/wireapp/wire-ios/hooks","issue_events_url":"https://api.github.com/repos/wireapp/wire-ios/issues/events{/number}","events_url":"https://api.github.com/repos/wireapp/wire-ios/events","assignees_url":"https://api.github.com/repos/wireapp/wire-ios/assignees{/user}","branches_url":"https://api.github.com/repos/wireapp/wire-ios/branches{/branch}","tags_url":"https://api.github.com/repos/wireapp/wire-ios/tags","blobs_url":"https://api.github.com/repos/wireapp/wire-ios/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wireapp/wire-ios/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wireapp/wire-ios/git/refs{/sha}","trees_url":"https://api.github.com/repos/wireapp/wire-ios/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wireapp/wire-ios/statuses/{sha}","languages_url":"https://api.github.com/repos/wireapp/wire-ios/languages","stargazers_url":"https://api.github.com/repos/wireapp/wire-ios/stargazers","contributors_url":"https://api.github.com/repos/wireapp/wire-ios/contributors","subscribers_url":"https://api.github.com/repos/wireapp/wire-ios/subscribers","subscription_url":"https://api.github.com/repos/wireapp/wire-ios/subscription","commits_url":"https://api.github.com/repos/wireapp/wire-ios/commits{/sha}","git_commits_url":"https://api.github.com/repos/wireapp/wire-ios/git/commits{/sha}","comments_url":"https://api.github.com/repos/wireapp/wire-ios/comments{/number}","issue_comment_url":"https://api.github.com/repos/wireapp/wire-ios/issues/comments{/number}","contents_url":"https://api.github.com/repos/wireapp/wire-ios/contents/{+path}","compare_url":"https://api.github.com/repos/wireapp/wire-ios/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wireapp/wire-ios/merges","archive_url":"https://api.github.com/repos/wireapp/wire-ios/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wireapp/wire-ios/downloads","issues_url":"https://api.github.com/repos/wireapp/wire-ios/issues{/number}","pulls_url":"https://api.github.com/repos/wireapp/wire-ios/pulls{/number}","milestones_url":"https://api.github.com/repos/wireapp/wire-ios/milestones{/number}","notifications_url":"https://api.github.com/repos/wireapp/wire-ios/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wireapp/wire-ios/labels{/name}","releases_url":"https://api.github.com/repos/wireapp/wire-ios/releases{/id}","deployments_url":"https://api.github.com/repos/wireapp/wire-ios/deployments","created_at":"2016-07-21T09:16:34Z","updated_at":"2016-12-05T06:02:59Z","pushed_at":"2016-12-05T10:05:40Z","git_url":"git://github.com/wireapp/wire-ios.git","ssh_url":"git@github.com:wireapp/wire-ios.git","clone_url":"https://github.com/wireapp/wire-ios.git","svn_url":"https://github.com/wireapp/wire-ios","homepage":"https://wire.com/download/","size":87762,"stargazers_count":1642,"watchers_count":1642,"language":"Objective-C","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":225,"mirror_url":null,"open_issues_count":61,"forks":225,"open_issues":61,"watchers":1642,"default_branch":"develop"}},"base":{"label":"wireapp:develop","ref":"develop","sha":"6730541bed97b6dd302258b02178e63fd9fa1228","user":{"login":"wireapp","id":16047324,"avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=3","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"repo":{"id":63855049,"name":"wire-ios","full_name":"wireapp/wire-ios","owner":{"login":"wireapp","id":16047324,"avatar_url":"https://avatars.githubusercontent.com/u/16047324?v=3","gravatar_id":"","url":"https://api.github.com/users/wireapp","html_url":"https://github.com/wireapp","followers_url":"https://api.github.com/users/wireapp/followers","following_url":"https://api.github.com/users/wireapp/following{/other_user}","gists_url":"https://api.github.com/users/wireapp/gists{/gist_id}","starred_url":"https://api.github.com/users/wireapp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wireapp/subscriptions","organizations_url":"https://api.github.com/users/wireapp/orgs","repos_url":"https://api.github.com/users/wireapp/repos","events_url":"https://api.github.com/users/wireapp/events{/privacy}","received_events_url":"https://api.github.com/users/wireapp/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/wireapp/wire-ios","description":"📱 Wire iOS client (iPhone and iPad)","fork":false,"url":"https://api.github.com/repos/wireapp/wire-ios","forks_url":"https://api.github.com/repos/wireapp/wire-ios/forks","keys_url":"https://api.github.com/repos/wireapp/wire-ios/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wireapp/wire-ios/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wireapp/wire-ios/teams","hooks_url":"https://api.github.com/repos/wireapp/wire-ios/hooks","issue_events_url":"https://api.github.com/repos/wireapp/wire-ios/issues/events{/number}","events_url":"https://api.github.com/repos/wireapp/wire-ios/events","assignees_url":"https://api.github.com/repos/wireapp/wire-ios/assignees{/user}","branches_url":"https://api.github.com/repos/wireapp/wire-ios/branches{/branch}","tags_url":"https://api.github.com/repos/wireapp/wire-ios/tags","blobs_url":"https://api.github.com/repos/wireapp/wire-ios/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wireapp/wire-ios/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wireapp/wire-ios/git/refs{/sha}","trees_url":"https://api.github.com/repos/wireapp/wire-ios/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wireapp/wire-ios/statuses/{sha}","languages_url":"https://api.github.com/repos/wireapp/wire-ios/languages","stargazers_url":"https://api.github.com/repos/wireapp/wire-ios/stargazers","contributors_url":"https://api.github.com/repos/wireapp/wire-ios/contributors","subscribers_url":"https://api.github.com/repos/wireapp/wire-ios/subscribers","subscription_url":"https://api.github.com/repos/wireapp/wire-ios/subscription","commits_url":"https://api.github.com/repos/wireapp/wire-ios/commits{/sha}","git_commits_url":"https://api.github.com/repos/wireapp/wire-ios/git/commits{/sha}","comments_url":"https://api.github.com/repos/wireapp/wire-ios/comments{/number}","issue_comment_url":"https://api.github.com/repos/wireapp/wire-ios/issues/comments{/number}","contents_url":"https://api.github.com/repos/wireapp/wire-ios/contents/{+path}","compare_url":"https://api.github.com/repos/wireapp/wire-ios/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wireapp/wire-ios/merges","archive_url":"https://api.github.com/repos/wireapp/wire-ios/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wireapp/wire-ios/downloads","issues_url":"https://api.github.com/repos/wireapp/wire-ios/issues{/number}","pulls_url":"https://api.github.com/repos/wireapp/wire-ios/pulls{/number}","milestones_url":"https://api.github.com/repos/wireapp/wire-ios/milestones{/number}","notifications_url":"https://api.github.com/repos/wireapp/wire-ios/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wireapp/wire-ios/labels{/name}","releases_url":"https://api.github.com/repos/wireapp/wire-ios/releases{/id}","deployments_url":"https://api.github.com/repos/wireapp/wire-ios/deployments","created_at":"2016-07-21T09:16:34Z","updated_at":"2016-12-05T06:02:59Z","pushed_at":"2016-12-05T10:05:40Z","git_url":"git://github.com/wireapp/wire-ios.git","ssh_url":"git@github.com:wireapp/wire-ios.git","clone_url":"https://github.com/wireapp/wire-ios.git","svn_url":"https://github.com/wireapp/wire-ios","homepage":"https://wire.com/download/","size":87762,"stargazers_count":1642,"watchers_count":1642,"language":"Objective-C","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":225,"mirror_url":null,"open_issues_count":61,"forks":225,"open_issues":61,"watchers":1642,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/wireapp/wire-ios/pulls/450"},"html":{"href":"https://github.com/wireapp/wire-ios/pull/450"},"issue":{"href":"https://api.github.com/repos/wireapp/wire-ios/issues/450"},"comments":{"href":"https://api.github.com/repos/wireapp/wire-ios/issues/450/comments"},"review_comments":{"href":"https://api.github.com/repos/wireapp/wire-ios/pulls/450/comments"},"review_comment":{"href":"https://api.github.com/repos/wireapp/wire-ios/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/wireapp/wire-ios/pulls/450/commits"},"statuses":{"href":"https://api.github.com/repos/wireapp/wire-ios/statuses/24f2232c196999bea5a1c153e108f5eae448ed0f"}}}}
{"actor":{"display_login":"mikeger"}}