147927 2015-08-12 00:00:56 -0700 Web Inspector: Control-backtick should focus on the console prompt 2015-08-24 16:34:22 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev hi bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1116915 0 nvasilyev 2015-08-12 00:00:56 -0700 This is a feedback from https://twitter.com/glenmaddern. Esc key focuses on the console prompt line, unless: — the text cursor is in a text field (e.g. the global search field at the top right corner, filter fields, etc.) — the text cursor is in the styles sidebar — the text cursor is inside of any CodeMirror view — DOM node content/attribute is being edited in Elements — there is a text selection — <select> menu is opened — autocomplete suggestion is opened — a message in the Console tab is already selected (needs two Esc presses to focus on the prompt, not one) The list goes on and on. We need a keyboard shortcut that would just focus on the console prompt so one could press it with their eyes closed and start typing console commands, no matter which more they're in. 1116917 1 timothy 2015-08-12 00:05:15 -0700 Sounds good, as long as escape still works. Does Chrome have a better one? Esc still works there with similar caveats. (Actually it just opens and closes the drawer, it doesn't show the Console in the drawer. Eww.) 1116919 2 nvasilyev 2015-08-12 00:20:26 -0700 No, not really. Command-Option-J opens console and focuses on the prompt line if Chrome DevTools are closed. It closes the DevTools if it's already opened. Esc doesn't trigger autocomplete in Chrome, so the issue is less severe. It can also open the split console when HTML/CSS/JS resource is being edited, unlike in WebKit Inspector. 1118081 3 nvasilyev 2015-08-17 00:26:44 -0700 Chrome DevTools also has Control ~ (tilde), which does exactly what I have proposed. We should support it. 1118082 4 webkit-bug-importer 2015-08-17 00:26:58 -0700 <rdar://problem/22304177> 1118168 5 259165 hi 2015-08-17 11:24:02 -0700 Created attachment 259165 Patch Just FYI, you can also press Option+Command+C to immediately switch to the console tab and focus the prompt. It isn't as subtle as toggling the split console, but it works. 1118458 6 259165 nvasilyev 2015-08-17 23:08:43 -0700 Comment on attachment 259165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259165&action=review Option+Command+C also doesn't work when: — the text cursor is in a text field (e.g. the global search field at the top right corner, filter fields, etc.) — the text cursor is in the styles sidebar — the text cursor is inside of any CodeMirror view — <select> menu is opened > Source/WebInspectorUI/UserInterface/Base/Main.js:248 > + this._quickConsoleKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Apostrophe, this.showSplitConsole.bind(this)); This focuses on the console prompt and opens the split console. I think we should just focus on the prompt, nothing else. 1118548 7 hi 2015-08-18 10:26:42 -0700 (In reply to comment #6) > Option+Command+C also doesn't work when: > — the text cursor is in a text field (e.g. the global search field at the > top right corner, filter fields, etc.) > — the text cursor is in the styles sidebar > — the text cursor is inside of any CodeMirror view > — <select> menu is opened I am actually seeing Option+Command+C working in all but the <select> scenario. It's bound in Main.js so it fires before everything else. For the <select>, I don't think that there is anything we can do there since that is system behavior. 1118551 8 259278 hi 2015-08-18 10:32:30 -0700 Created attachment 259278 Patch 1118555 9 259278 bburg 2015-08-18 10:41:20 -0700 Comment on attachment 259278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259278&action=review r=me > Source/WebInspectorUI/ChangeLog:11 > + Added a keyboard shortcut to focus the console prompt. Please say here what the new keyboard shortcut *is*. 1118562 10 259281 hi 2015-08-18 10:54:29 -0700 Created attachment 259281 Patch 1118575 11 259281 commit-queue 2015-08-18 11:47:52 -0700 Comment on attachment 259281 Patch Clearing flags on attachment: 259281 Committed r188586: <http://trac.webkit.org/changeset/188586> 1118576 12 commit-queue 2015-08-18 11:47:56 -0700 All reviewed patches have been landed. Closing bug. 259165 2015-08-17 11:24:02 -0700 2015-08-18 10:32:27 -0700 Patch 147927.txt text/plain 2283 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGM5ZTUzOGIuLjRlZjI5OTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA4LTE3ICBEZXZpbiBSb3Vzc28g IDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBCZXR0ZXIga2V5 Ym9hcmQgc2hvcnRjdXQgdG8gZm9jdXMgb24gdGhlIGNvbnNvbGUgcHJvbXB0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc5MjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQpOgorICAgICAg ICBBZGRlZCBhIGtleWJvYXJkIHNob3J0Y3V0IHRvIG9wZW4gdGhlIHNwbGl0IGNvbnNvbGUgYW5k IGZvY3VzIHRoZSBjb25zb2xlIHByb21wdC4KKwogMjAxNS0wOC0xNCAgRGV2aW4gUm91c3NvICA8 ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIFZpc3VhbFN0 eWxlRGV0YWlsc1BhbmVsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL01haW4uanMKaW5kZXggZjRhNmVhOS4uNzNjMmU1NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMjQ0LDcgKzI0NCw4 IEBAIFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogICAgIHRoaXMuX3Jl bG9hZFBhZ2VLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRy b2wsICJSIiwgdGhpcy5fcmVsb2FkUGFnZS5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9yZWxvYWRQ YWdlSWdub3JpbmdDYWNoZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFu ZE9yQ29udHJvbCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLlNoaWZ0 LCAiUiIsIHRoaXMuX3JlbG9hZFBhZ2VJZ25vcmluZ0NhY2hlLmJpbmQodGhpcykpOwogCi0gICAg dGhpcy5fY29uc29sZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuT3B0aW9uIHwg V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwg IkMiLCB0aGlzLl9zaG93Q29uc29sZVRhYi5iaW5kKHRoaXMpKTsKKyAgICB0aGlzLl9jb25zb2xl VGFiS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5PcHRpb24gfCBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiQyIsIHRoaXMu X3Nob3dDb25zb2xlVGFiLmJpbmQodGhpcykpOworICAgIHRoaXMuX3F1aWNrQ29uc29sZUtleWJv YXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29udHJvbCwgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQuS2V5LkFwb3N0cm9waGUsIHRoaXMuc2hvd1NwbGl0Q29uc29sZS5iaW5kKHRo aXMpKTsKIAogICAgIHRoaXMuX2luc3BlY3RNb2RlS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJ bnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5N b2RpZmllci5Db21tYW5kT3JDb250cm9sIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu TW9kaWZpZXIuU2hpZnQsICJDIiwgdGhpcy5fdG9nZ2xlSW5zcGVjdE1vZGUuYmluZCh0aGlzKSk7 CiAK 259278 2015-08-18 10:32:30 -0700 2015-08-18 10:54:29 -0700 Patch bug-147927-20150818103228.patch text/plain 2816 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDdiNTYwNjhkZTIwNWRmMzkzNDlkOGY0ZWQxMGNk NjE3ZmE1M2QzY2UuLjg3NTNkNDkyODVhOTQ5ZTRjMjYyZDMzOGMxYWUyNDkxNzY1NDFmNDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA4LTE4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBC ZXR0ZXIga2V5Ym9hcmQgc2hvcnRjdXQgdG8gZm9jdXMgb24gdGhlIGNvbnNvbGUgcHJvbXB0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc5MjcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9mb2N1c0NvbnNvbGVQcm9tcHQpOgorICAgICAgICBB ZGRlZCBhIGtleWJvYXJkIHNob3J0Y3V0IHRvIGZvY3VzIHRoZSBjb25zb2xlIHByb21wdC4KKwog MjAxNS0wOC0xOCAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBPcHRpb24tRW50ZXIgc2hvdWxkIGNvbW1pdCBjb25zb2xlIGNv bW1hbmQgd2l0aG91dCBlcmFzaW5nIHRoZSBwcm9tcHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCBmNGE2ZWE5N2ZiMDdkZmQzM2Nm NjhmN2M2YTE5MDE1ZjdhN2EwZjc4Li40OGI4ODYxMmUyNjk3N2E5ZmU5MTkwZWExMjFmMGVkYTM2 MDllNDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzCkBAIC0yNDQsNyArMjQ0LDggQEAgV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQg PSBmdW5jdGlvbigpCiAgICAgdGhpcy5fcmVsb2FkUGFnZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcg V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRj dXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgIlIiLCB0aGlzLl9yZWxvYWRQYWdlLmJpbmQo dGhpcykpOwogICAgIHRoaXMuX3JlbG9hZFBhZ2VJZ25vcmluZ0NhY2hlS2V5Ym9hcmRTaG9ydGN1 dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sIHwgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQsICJSIiwgdGhpcy5fcmVsb2FkUGFnZUlnbm9yaW5n Q2FjaGUuYmluZCh0aGlzKSk7CiAKLSAgICB0aGlzLl9jb25zb2xlS2V5Ym9hcmRTaG9ydGN1dCA9 IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dC5Nb2RpZmllci5PcHRpb24gfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5N b2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiQyIsIHRoaXMuX3Nob3dDb25zb2xlVGFiLmJpbmQo dGhpcykpOworICAgIHRoaXMuX2NvbnNvbGVUYWJLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1v ZGlmaWVyLk9wdGlvbiB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNv bW1hbmRPckNvbnRyb2wsICJDIiwgdGhpcy5fc2hvd0NvbnNvbGVUYWIuYmluZCh0aGlzKSk7Cisg ICAgdGhpcy5fcXVpY2tDb25zb2xlS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5D b250cm9sLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuQXBvc3Ryb3BoZSwgdGhp cy5fZm9jdXNDb25zb2xlUHJvbXB0LmJpbmQodGhpcykpOwogCiAgICAgdGhpcy5faW5zcGVjdE1v ZGVLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wgfCBX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5TaGlmdCwgIkMiLCB0aGlzLl90 b2dnbGVJbnNwZWN0TW9kZS5iaW5kKHRoaXMpKTsKIApAQCAtMTYxNyw2ICsxNjE4LDExIEBAIFdl Ykluc3BlY3Rvci5fc2hvd0NvbnNvbGVUYWIgPSBmdW5jdGlvbihldmVudCkKICAgICB0aGlzLnNo b3dDb25zb2xlVGFiKCk7CiB9OwogCitXZWJJbnNwZWN0b3IuX2ZvY3VzQ29uc29sZVByb21wdCA9 IGZ1bmN0aW9uKGV2ZW50KQoreworICAgIHRoaXMucXVpY2tDb25zb2xlLnByb21wdC5mb2N1cygp OworfTsKKwogV2ViSW5zcGVjdG9yLl9mb2N1c2VkQ29udGVudFZpZXcgPSBmdW5jdGlvbigpCiB7 CiAgICAgaWYgKHRoaXMudGFiQnJvd3Nlci5lbGVtZW50LmlzU2VsZk9yQW5jZXN0b3IodGhpcy5j dXJyZW50Rm9jdXNFbGVtZW50KSkgewo= 259281 2015-08-18 10:54:29 -0700 2015-08-18 11:47:52 -0700 Patch 147927.txt text/plain 2694 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDdiNTYwNjguLmQ2NjhlMGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA4LTE4ICBEZXZpbiBSb3Vzc28g IDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBCZXR0ZXIga2V5 Ym9hcmQgc2hvcnRjdXQgdG8gZm9jdXMgb24gdGhlIGNvbnNvbGUgcHJvbXB0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc5MjcKKworICAgICAgICBS ZXZpZXdlZCBieSBCcmlhbiBCdXJnLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01h aW4uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuX2ZvY3VzQ29uc29sZVByb21wdCk6CisgICAgICAgIEFkZGVkIGEgQ29udHJv bC1UaWxkZSBrZXlib2FyZCBzaG9ydGN1dCB0byBmb2N1cyB0aGUgY29uc29sZSBwcm9tcHQuCisK IDIwMTUtMDgtMTggIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogT3B0aW9uLUVudGVyIHNob3VsZCBjb21taXQgY29uc29sZSBj b21tYW5kIHdpdGhvdXQgZXJhc2luZyB0aGUgcHJvbXB0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggZjRhNmVhOS4uNDhiODg2MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5q cwpAQCAtMjQ0LDcgKzI0NCw4IEBAIFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkID0gZnVuY3Rp b24oKQogICAgIHRoaXMuX3JlbG9hZFBhZ2VLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3Bl Y3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlm aWVyLkNvbW1hbmRPckNvbnRyb2wsICJSIiwgdGhpcy5fcmVsb2FkUGFnZS5iaW5kKHRoaXMpKTsK ICAgICB0aGlzLl9yZWxvYWRQYWdlSWdub3JpbmdDYWNoZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcg V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRj dXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0Lk1vZGlmaWVyLlNoaWZ0LCAiUiIsIHRoaXMuX3JlbG9hZFBhZ2VJZ25vcmluZ0NhY2hlLmJp bmQodGhpcykpOwogCi0gICAgdGhpcy5fY29uc29sZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu TW9kaWZpZXIuT3B0aW9uIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIu Q29tbWFuZE9yQ29udHJvbCwgIkMiLCB0aGlzLl9zaG93Q29uc29sZVRhYi5iaW5kKHRoaXMpKTsK KyAgICB0aGlzLl9jb25zb2xlVGFiS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5P cHRpb24gfCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JD b250cm9sLCAiQyIsIHRoaXMuX3Nob3dDb25zb2xlVGFiLmJpbmQodGhpcykpOworICAgIHRoaXMu X3F1aWNrQ29uc29sZUtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29udHJvbCwg V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5LkFwb3N0cm9waGUsIHRoaXMuX2ZvY3Vz Q29uc29sZVByb21wdC5iaW5kKHRoaXMpKTsKIAogICAgIHRoaXMuX2luc3BlY3RNb2RlS2V5Ym9h cmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sIHwgV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQsICJDIiwgdGhpcy5fdG9nZ2xlSW5z cGVjdE1vZGUuYmluZCh0aGlzKSk7CiAKQEAgLTE2MTcsNiArMTYxOCwxMSBAQCBXZWJJbnNwZWN0 b3IuX3Nob3dDb25zb2xlVGFiID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgdGhpcy5zaG93Q29uc29s ZVRhYigpOwogfTsKIAorV2ViSW5zcGVjdG9yLl9mb2N1c0NvbnNvbGVQcm9tcHQgPSBmdW5jdGlv bihldmVudCkKK3sKKyAgICB0aGlzLnF1aWNrQ29uc29sZS5wcm9tcHQuZm9jdXMoKTsKK307CisK IFdlYkluc3BlY3Rvci5fZm9jdXNlZENvbnRlbnRWaWV3ID0gZnVuY3Rpb24oKQogewogICAgIGlm ICh0aGlzLnRhYkJyb3dzZXIuZWxlbWVudC5pc1NlbGZPckFuY2VzdG9yKHRoaXMuY3VycmVudEZv Y3VzRWxlbWVudCkpIHsK