209617 2020-03-26 13:18:19 -0700 Web Inspector: RTL: ArrowLeft and ArrowRight keys select wrong navigation bar items 2020-03-26 17:12:16 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 209625 1 nvasilyev nvasilyev hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1634524 0 nvasilyev 2020-03-26 13:18:19 -0700 Steps: 0. Enable RTL mode 1. Open Elements tab 2. In the right sidebar, focus on "Styles" navigation bar item 3. Press Arrow Left key Expected: Item on the left is selected ("Computed"). Actual: Selection didn't change. 1634530 1 394651 nvasilyev 2020-03-26 13:20:58 -0700 Created attachment 394651 Patch 1634557 2 394651 hi 2020-03-26 13:58:57 -0700 Comment on attachment 394651 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394651&action=review > Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:383 > + if (delta === -1) { Why not combine these into one loop? 1634560 3 394651 nvasilyev 2020-03-26 14:01:23 -0700 Comment on attachment 394651 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394651&action=review >> Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:383 >> + if (delta === -1) { > > Why not combine these into one loop? I can. I simply didn't touch what was working. 1634581 4 394659 nvasilyev 2020-03-26 14:44:00 -0700 Created attachment 394659 Patch Looks much nicer now. 1634585 5 394659 hi 2020-03-26 14:57:35 -0700 Comment on attachment 394659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394659&action=review r=me, with a few changes > Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:371 > + if (event.code !== "ArrowLeft" && event.code !== "ArrowRight") NIT: I'd pull this out into an `isLeftArrow` variable so you can avoid the repeated comparison below > Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:377 > + let selectedIndex = this._navigationItems.indexOf(this._selectedNavigationItem); NIT: I'd put this closer to the `while`, where it's used > Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:-381 > - if (selectedNavigationItemIndex === -1) > - selectedNavigationItemIndex = this._navigationItems.length; I think we still need this logic, or at least something like it. ``` if (selectedIndex === -1) selectedIndex = (this._navigationItems.length + delta) % this._navigationItems.length; ``` > Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:383 > + while (true) { I generally try to avoid `while (true)` as they can often easily turn into an infinite loop, but the bounding in this case looks fine. To be really safe, I'd ether add `console.assert(selectedIndex)` or move the first `if` to just be the condition of the `while` itself. > Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:392 > + this.selectedNavigationItem?.element.focus(); I don't think we need the `?.`, as it shouldn't be possible for a `WI.RadioButtonNavigationItem` to not have an `element`. 1634593 6 394659 nvasilyev 2020-03-26 15:07:11 -0700 Comment on attachment 394659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394659&action=review >> Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:392 >> + this.selectedNavigationItem?.element.focus(); > > I don't think we need the `?.`, as it shouldn't be possible for a `WI.RadioButtonNavigationItem` to not have an `element`. It checks for `this.selectedNavigationItem` which can be null. Not the element. 1634602 7 394659 nvasilyev 2020-03-26 15:36:05 -0700 Comment on attachment 394659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394659&action=review >> Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:-381 >> - selectedNavigationItemIndex = this._navigationItems.length; > > I think we still need this logic, or at least something like it. > ``` > if (selectedIndex === -1) > selectedIndex = (this._navigationItems.length + delta) % this._navigationItems.length; > ``` Currently in NavigationBar, focus doesn't cycle from the last item to the 1st. It *does* cycle in ScopeBar. I have a slight preference for not cycling the focus. 1634603 8 394659 hi 2020-03-26 15:36:22 -0700 Comment on attachment 394659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394659&action=review >>> Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:392 >>> + this.selectedNavigationItem?.element.focus(); >> >> I don't think we need the `?.`, as it shouldn't be possible for a `WI.RadioButtonNavigationItem` to not have an `element`. > > It checks for `this.selectedNavigationItem` which can be null. Not the element. Err, yes, my mistake 😅 Regardless, it shouldn't be possible for `this.selectedNavigationItem` to not exist in these conditions. `WI.NavigationBar.prototype.set selectedNavigationItem` will only result in a `null` value for `this.selectedNavitationItem` if: - the given `WI.NavigationItem` is attached to a different `WI.NavigationBar` => this isn't possible because we're grabbing the `WI.NavigationItem` from `this._navigationItems`, meaning `this` is already the right parent - the given `WI.NavigationItem` is `null` or not a `WI.RadioButtonNavigationItem` => this isn't possible because of the `if` condition that had to have been true for this code to be run As such, I think we should be safe to remove it. Or am I missing something? 1634604 9 394659 hi 2020-03-26 15:38:28 -0700 Comment on attachment 394659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394659&action=review >>> Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:-381 >>> - selectedNavigationItemIndex = this._navigationItems.length; >> >> I think we still need this logic, or at least something like it. >> ``` >> if (selectedIndex === -1) >> selectedIndex = (this._navigationItems.length + delta) % this._navigationItems.length; >> ``` > > Currently in NavigationBar, focus doesn't cycle from the last item to the 1st. It *does* cycle in ScopeBar. I have a slight preference for not cycling the focus. I don't think that's what this does. I think this just makes it so that if nothing is currently selected (or if somehow the selected `WI.NavigationItem` is not in the list of `_navigationItems`), it selects either the first or the last `WI.NavigationItem` depending on what key was pressed. 1634606 10 394659 nvasilyev 2020-03-26 15:42:41 -0700 Comment on attachment 394659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394659&action=review >>>> Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:-381 >>>> - selectedNavigationItemIndex = this._navigationItems.length; >>> >>> I think we still need this logic, or at least something like it. >>> ``` >>> if (selectedIndex === -1) >>> selectedIndex = (this._navigationItems.length + delta) % this._navigationItems.length; >>> ``` >> >> Currently in NavigationBar, focus doesn't cycle from the last item to the 1st. It *does* cycle in ScopeBar. I have a slight preference for not cycling the focus. > > I don't think that's what this does. I think this just makes it so that if nothing is currently selected (or if somehow the selected `WI.NavigationItem` is not in the list of `_navigationItems`), it selects either the first or the last `WI.NavigationItem` depending on what key was pressed. Oh, you're right. You just pointed out that this.selectedNavitationItem should never be null here, so this shouldn't be something that could happen. 1634611 11 394664 nvasilyev 2020-03-26 15:52:50 -0700 Created attachment 394664 Patch 1634621 12 394667 nvasilyev 2020-03-26 16:08:14 -0700 Created attachment 394667 Patch 1634633 13 394659 hi 2020-03-26 16:30:27 -0700 Comment on attachment 394659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394659&action=review >>>>> Source/WebInspectorUI/UserInterface/Views/NavigationBar.js:-381 >>>>> - selectedNavigationItemIndex = this._navigationItems.length; >>>> >>>> I think we still need this logic, or at least something like it. >>>> ``` >>>> if (selectedIndex === -1) >>>> selectedIndex = (this._navigationItems.length + delta) % this._navigationItems.length; >>>> ``` >>> >>> Currently in NavigationBar, focus doesn't cycle from the last item to the 1st. It *does* cycle in ScopeBar. I have a slight preference for not cycling the focus. >> >> I don't think that's what this does. I think this just makes it so that if nothing is currently selected (or if somehow the selected `WI.NavigationItem` is not in the list of `_navigationItems`), it selects either the first or the last `WI.NavigationItem` depending on what key was pressed. > > Oh, you're right. > > You just pointed out that this.selectedNavitationItem should never be null here, so this shouldn't be something that could happen. I pointed out that `this.selctedNavigationItem` can't be `null` _below_. I think this is completely possible for it to be `null` here, such as in the case that a `WI.NavigationBar` doesn't have any `WI.RadioButtonNavigationItem`. 1634639 14 394675 nvasilyev 2020-03-26 16:40:09 -0700 Created attachment 394675 Patch 1634654 15 ews-feeder 2020-03-26 17:11:37 -0700 Committed r259094: <https://trac.webkit.org/changeset/259094> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394675. 1634655 16 webkit-bug-importer 2020-03-26 17:12:16 -0700 <rdar://problem/60943785> 394651 2020-03-26 13:20:58 -0700 2020-03-26 14:44:00 -0700 Patch patch.txt text/plain 2570 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU1ZWVlMTk1ZjY5Li44ZmE5YWYwYTExNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDMtMjYgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUlRMOiBBcnJvd0xlZnQgYW5kIEFycm93UmlnaHQga2V5cyBzZWxlY3Qgd3JvbmcgbmF2aWdh dGlvbiBiYXIgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwOTYxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzOgorICAgICAgICAo V0kuTmF2aWdhdGlvbkJhci5wcm90b3R5cGUuX2tleURvd24pOgorICAgICAgICBSZXZlcnNlIGRp cmVjdGlvbiBmb3IgUlRMIG1vZGUuCisKIDIwMjAtMDMtMjMgIERldmluIFJvdXNzbyAgPGRyb3Vz c29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04ocjI1Nzc5 MSk6IGV2ZW50IGJyZWFrcG9pbnQgaWNvbiBzaG91bGQgYmUgW0VdCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5q cwppbmRleCA4M2FmYjkyZjY4ZS4uNjFhOTNhM2YyYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25CYXIuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5qcwpA QCAtMzY4LDcgKzM2OCw3IEBAIFdJLk5hdmlnYXRpb25CYXIgPSBjbGFzcyBOYXZpZ2F0aW9uQmFy IGV4dGVuZHMgV0kuVmlldwogCiAgICAgX2tleURvd24oZXZlbnQpCiAgICAgewotICAgICAgICBp ZiAoZXZlbnQua2V5SWRlbnRpZmllciAhPT0gIkxlZnQiICYmIGV2ZW50LmtleUlkZW50aWZpZXIg IT09ICJSaWdodCIpCisgICAgICAgIGlmIChldmVudC5jb2RlICE9PSAiQXJyb3dMZWZ0IiAmJiBl dmVudC5jb2RlICE9PSAiQXJyb3dSaWdodCIpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKQEAgLTM3NiwxNCArMzc2LDE4IEBAIFdJLk5hdmln YXRpb25CYXIgPSBjbGFzcyBOYXZpZ2F0aW9uQmFyIGV4dGVuZHMgV0kuVmlldwogCiAgICAgICAg IHZhciBzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggPSB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMu aW5kZXhPZih0aGlzLl9zZWxlY3RlZE5hdmlnYXRpb25JdGVtKTsKIAotICAgICAgICBpZiAoZXZl bnQua2V5SWRlbnRpZmllciA9PT0gIkxlZnQiKSB7CisgICAgICAgIGxldCBkZWx0YSA9IChldmVu dC5jb2RlID09PSAiQXJyb3dMZWZ0IikgPyAtMSA6IDE7CisgICAgICAgIGlmIChXSS5yZXNvbHZl TGF5b3V0RGlyZWN0aW9uRm9yRWxlbWVudCh0aGlzLl9lbGVtZW50KSA9PT0gV0kuTGF5b3V0RGly ZWN0aW9uLlJUTCkKKyAgICAgICAgICAgIGRlbHRhICo9IC0xOworCisgICAgICAgIGlmIChkZWx0 YSA9PT0gLTEpIHsKICAgICAgICAgICAgIGlmIChzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXgg PT09IC0xKQogICAgICAgICAgICAgICAgIHNlbGVjdGVkTmF2aWdhdGlvbkl0ZW1JbmRleCA9IHRo aXMuX25hdmlnYXRpb25JdGVtcy5sZW5ndGg7CiAKICAgICAgICAgICAgIGRvIHsKICAgICAgICAg ICAgICAgICBzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggPSBNYXRoLm1heCgwLCBzZWxlY3Rl ZE5hdmlnYXRpb25JdGVtSW5kZXggLSAxKTsKICAgICAgICAgICAgIH0gd2hpbGUgKHNlbGVjdGVk TmF2aWdhdGlvbkl0ZW1JbmRleCAmJiAhKHRoaXMuX25hdmlnYXRpb25JdGVtc1tzZWxlY3RlZE5h dmlnYXRpb25JdGVtSW5kZXhdIGluc3RhbmNlb2YgV0kuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRl bSkpOwotICAgICAgICB9IGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJSaWdodCIp IHsKKyAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGRvIHsKICAgICAgICAgICAgICAgICBz ZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggPSBNYXRoLm1pbihzZWxlY3RlZE5hdmlnYXRpb25J dGVtSW5kZXggKyAxLCB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMubGVuZ3RoIC0gMSk7CiAgICAgICAg ICAgICB9IHdoaWxlIChzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggPCB0aGlzLl9uYXZpZ2F0 aW9uSXRlbXMubGVuZ3RoIC0gMSAmJiAhKHRoaXMuX25hdmlnYXRpb25JdGVtc1tzZWxlY3RlZE5h dmlnYXRpb25JdGVtSW5kZXhdIGluc3RhbmNlb2YgV0kuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRl bSkpOwo= 394659 2020-03-26 14:44:00 -0700 2020-03-26 15:52:50 -0700 Patch patch.txt text/plain 3413 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU1ZWVlMTk1ZjY5Li44ZmE5YWYwYTExNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDMtMjYgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUlRMOiBBcnJvd0xlZnQgYW5kIEFycm93UmlnaHQga2V5cyBzZWxlY3Qgd3JvbmcgbmF2aWdh dGlvbiBiYXIgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwOTYxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzOgorICAgICAgICAo V0kuTmF2aWdhdGlvbkJhci5wcm90b3R5cGUuX2tleURvd24pOgorICAgICAgICBSZXZlcnNlIGRp cmVjdGlvbiBmb3IgUlRMIG1vZGUuCisKIDIwMjAtMDMtMjMgIERldmluIFJvdXNzbyAgPGRyb3Vz c29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04ocjI1Nzc5 MSk6IGV2ZW50IGJyZWFrcG9pbnQgaWNvbiBzaG91bGQgYmUgW0VdCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5q cwppbmRleCA4M2FmYjkyZjY4ZS4uMDBkOTE1ZjMyOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25CYXIuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5qcwpA QCAtMzY4LDMyICszNjgsMzEgQEAgV0kuTmF2aWdhdGlvbkJhciA9IGNsYXNzIE5hdmlnYXRpb25C YXIgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICBfa2V5RG93bihldmVudCkKICAgICB7Ci0gICAgICAg IGlmIChldmVudC5rZXlJZGVudGlmaWVyICE9PSAiTGVmdCIgJiYgZXZlbnQua2V5SWRlbnRpZmll ciAhPT0gIlJpZ2h0IikKKyAgICAgICAgaWYgKGV2ZW50LmNvZGUgIT09ICJBcnJvd0xlZnQiICYm IGV2ZW50LmNvZGUgIT09ICJBcnJvd1JpZ2h0IikKICAgICAgICAgICAgIHJldHVybjsKIAogICAg ICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRp b24oKTsKIAotICAgICAgICB2YXIgc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4ID0gdGhpcy5f bmF2aWdhdGlvbkl0ZW1zLmluZGV4T2YodGhpcy5fc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbSk7Cisg ICAgICAgIGxldCBzZWxlY3RlZEluZGV4ID0gdGhpcy5fbmF2aWdhdGlvbkl0ZW1zLmluZGV4T2Yo dGhpcy5fc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbSk7CiAKLSAgICAgICAgaWYgKGV2ZW50LmtleUlk ZW50aWZpZXIgPT09ICJMZWZ0IikgewotICAgICAgICAgICAgaWYgKHNlbGVjdGVkTmF2aWdhdGlv bkl0ZW1JbmRleCA9PT0gLTEpCi0gICAgICAgICAgICAgICAgc2VsZWN0ZWROYXZpZ2F0aW9uSXRl bUluZGV4ID0gdGhpcy5fbmF2aWdhdGlvbkl0ZW1zLmxlbmd0aDsKKyAgICAgICAgbGV0IGRlbHRh ID0gKGV2ZW50LmNvZGUgPT09ICJBcnJvd0xlZnQiKSA/IC0xIDogMTsKKyAgICAgICAgaWYgKFdJ LnJlc29sdmVMYXlvdXREaXJlY3Rpb25Gb3JFbGVtZW50KHRoaXMuX2VsZW1lbnQpID09PSBXSS5M YXlvdXREaXJlY3Rpb24uUlRMKQorICAgICAgICAgICAgZGVsdGEgKj0gLTE7CiAKLSAgICAgICAg ICAgIGRvIHsKLSAgICAgICAgICAgICAgICBzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggPSBN YXRoLm1heCgwLCBzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggLSAxKTsKLSAgICAgICAgICAg IH0gd2hpbGUgKHNlbGVjdGVkTmF2aWdhdGlvbkl0ZW1JbmRleCAmJiAhKHRoaXMuX25hdmlnYXRp b25JdGVtc1tzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXhdIGluc3RhbmNlb2YgV0kuUmFkaW9C dXR0b25OYXZpZ2F0aW9uSXRlbSkpOwotICAgICAgICB9IGVsc2UgaWYgKGV2ZW50LmtleUlkZW50 aWZpZXIgPT09ICJSaWdodCIpIHsKLSAgICAgICAgICAgIGRvIHsKLSAgICAgICAgICAgICAgICBz ZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggPSBNYXRoLm1pbihzZWxlY3RlZE5hdmlnYXRpb25J dGVtSW5kZXggKyAxLCB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMubGVuZ3RoIC0gMSk7Ci0gICAgICAg ICAgICB9IHdoaWxlIChzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggPCB0aGlzLl9uYXZpZ2F0 aW9uSXRlbXMubGVuZ3RoIC0gMSAmJiAhKHRoaXMuX25hdmlnYXRpb25JdGVtc1tzZWxlY3RlZE5h dmlnYXRpb25JdGVtSW5kZXhdIGluc3RhbmNlb2YgV0kuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRl bSkpOwotICAgICAgICB9CisgICAgICAgIHdoaWxlICh0cnVlKSB7CisgICAgICAgICAgICBzZWxl Y3RlZEluZGV4ICs9IGRlbHRhOwogCi0gICAgICAgIGlmICghKHRoaXMuX25hdmlnYXRpb25JdGVt c1tzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXhdIGluc3RhbmNlb2YgV0kuUmFkaW9CdXR0b25O YXZpZ2F0aW9uSXRlbSkpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBpZiAoc2Vs ZWN0ZWRJbmRleCA8IDAgfHwgc2VsZWN0ZWRJbmRleCA+PSB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMu bGVuZ3RoKQorICAgICAgICAgICAgICAgIGJyZWFrOwogCi0gICAgICAgIHRoaXMuc2VsZWN0ZWRO YXZpZ2F0aW9uSXRlbSA9IHRoaXMuX25hdmlnYXRpb25JdGVtc1tzZWxlY3RlZE5hdmlnYXRpb25J dGVtSW5kZXhdOwotICAgICAgICB0aGlzLnNlbGVjdGVkTmF2aWdhdGlvbkl0ZW0/LmVsZW1lbnQu Zm9jdXMoKTsKKyAgICAgICAgICAgIGxldCBzZWxlY3RlZEl0ZW1DYW5kaWRhdGUgPSB0aGlzLl9u YXZpZ2F0aW9uSXRlbXNbc2VsZWN0ZWRJbmRleF07CisgICAgICAgICAgICBpZiAoc2VsZWN0ZWRJ dGVtQ2FuZGlkYXRlIGluc3RhbmNlb2YgV0kuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbSkgewor ICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbSA9IHNlbGVjdGVkSXRl bUNhbmRpZGF0ZTsKKyAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGVkTmF2aWdhdGlvbkl0ZW0/ LmVsZW1lbnQuZm9jdXMoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQogICAgIH0KIAogICAgIF9jYWxjdWxhdGVNaW5pbXVtV2lkdGgoKQo= 394664 2020-03-26 15:52:50 -0700 2020-03-26 16:08:14 -0700 Patch patch.txt text/plain 3436 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU1ZWVlMTk1ZjY5Li44ZmE5YWYwYTExNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDMtMjYgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUlRMOiBBcnJvd0xlZnQgYW5kIEFycm93UmlnaHQga2V5cyBzZWxlY3Qgd3JvbmcgbmF2aWdh dGlvbiBiYXIgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwOTYxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzOgorICAgICAgICAo V0kuTmF2aWdhdGlvbkJhci5wcm90b3R5cGUuX2tleURvd24pOgorICAgICAgICBSZXZlcnNlIGRp cmVjdGlvbiBmb3IgUlRMIG1vZGUuCisKIDIwMjAtMDMtMjMgIERldmluIFJvdXNzbyAgPGRyb3Vz c29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT04ocjI1Nzc5 MSk6IGV2ZW50IGJyZWFrcG9pbnQgaWNvbiBzaG91bGQgYmUgW0VdCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5q cwppbmRleCA4M2FmYjkyZjY4ZS4uNjA5NjhkMmQ3ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25CYXIuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5qcwpA QCAtMzY4LDMyICszNjgsMzIgQEAgV0kuTmF2aWdhdGlvbkJhciA9IGNsYXNzIE5hdmlnYXRpb25C YXIgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICBfa2V5RG93bihldmVudCkKICAgICB7Ci0gICAgICAg IGlmIChldmVudC5rZXlJZGVudGlmaWVyICE9PSAiTGVmdCIgJiYgZXZlbnQua2V5SWRlbnRpZmll ciAhPT0gIlJpZ2h0IikKKyAgICAgICAgbGV0IGlzTGVmdEFycm93ID0gZXZlbnQuY29kZSA9PT0g IkFycm93TGVmdCI7CisgICAgICAgIGlmICghaXNMZWZ0QXJyb3cgJiYgZXZlbnQuY29kZSAhPT0g IkFycm93UmlnaHQiKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGV2ZW50LnByZXZl bnREZWZhdWx0KCk7CiAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOwogCi0gICAgICAg IHZhciBzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggPSB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMu aW5kZXhPZih0aGlzLl9zZWxlY3RlZE5hdmlnYXRpb25JdGVtKTsKKyAgICAgICAgbGV0IGRlbHRh ID0gaXNMZWZ0QXJyb3cgPyAtMSA6IDE7CisgICAgICAgIGlmIChXSS5yZXNvbHZlTGF5b3V0RGly ZWN0aW9uRm9yRWxlbWVudCh0aGlzLl9lbGVtZW50KSA9PT0gV0kuTGF5b3V0RGlyZWN0aW9uLlJU TCkKKyAgICAgICAgICAgIGRlbHRhICo9IC0xOwogCi0gICAgICAgIGlmIChldmVudC5rZXlJZGVu dGlmaWVyID09PSAiTGVmdCIpIHsKLSAgICAgICAgICAgIGlmIChzZWxlY3RlZE5hdmlnYXRpb25J dGVtSW5kZXggPT09IC0xKQotICAgICAgICAgICAgICAgIHNlbGVjdGVkTmF2aWdhdGlvbkl0ZW1J bmRleCA9IHRoaXMuX25hdmlnYXRpb25JdGVtcy5sZW5ndGg7CisgICAgICAgIGxldCBzZWxlY3Rl ZEluZGV4ID0gdGhpcy5fbmF2aWdhdGlvbkl0ZW1zLmluZGV4T2YodGhpcy5fc2VsZWN0ZWROYXZp Z2F0aW9uSXRlbSk7CiAKLSAgICAgICAgICAgIGRvIHsKLSAgICAgICAgICAgICAgICBzZWxlY3Rl ZE5hdmlnYXRpb25JdGVtSW5kZXggPSBNYXRoLm1heCgwLCBzZWxlY3RlZE5hdmlnYXRpb25JdGVt SW5kZXggLSAxKTsKLSAgICAgICAgICAgIH0gd2hpbGUgKHNlbGVjdGVkTmF2aWdhdGlvbkl0ZW1J bmRleCAmJiAhKHRoaXMuX25hdmlnYXRpb25JdGVtc1tzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5k ZXhdIGluc3RhbmNlb2YgV0kuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbSkpOwotICAgICAgICB9 IGVsc2UgaWYgKGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJSaWdodCIpIHsKLSAgICAgICAgICAg IGRvIHsKLSAgICAgICAgICAgICAgICBzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggPSBNYXRo Lm1pbihzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXggKyAxLCB0aGlzLl9uYXZpZ2F0aW9uSXRl bXMubGVuZ3RoIC0gMSk7Ci0gICAgICAgICAgICB9IHdoaWxlIChzZWxlY3RlZE5hdmlnYXRpb25J dGVtSW5kZXggPCB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMubGVuZ3RoIC0gMSAmJiAhKHRoaXMuX25h dmlnYXRpb25JdGVtc1tzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXhdIGluc3RhbmNlb2YgV0ku UmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbSkpOwotICAgICAgICB9CisgICAgICAgIHdoaWxlICh0 cnVlKSB7CisgICAgICAgICAgICBzZWxlY3RlZEluZGV4ICs9IGRlbHRhOwogCi0gICAgICAgIGlm ICghKHRoaXMuX25hdmlnYXRpb25JdGVtc1tzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXhdIGlu c3RhbmNlb2YgV0kuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbSkpCi0gICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICBpZiAoc2VsZWN0ZWRJbmRleCA8IDAgfHwgc2VsZWN0ZWRJbmRleCA+ PSB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMubGVuZ3RoKQorICAgICAgICAgICAgICAgIGJyZWFrOwog Ci0gICAgICAgIHRoaXMuc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbSA9IHRoaXMuX25hdmlnYXRpb25J dGVtc1tzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXhdOwotICAgICAgICB0aGlzLnNlbGVjdGVk TmF2aWdhdGlvbkl0ZW0/LmVsZW1lbnQuZm9jdXMoKTsKKyAgICAgICAgICAgIGxldCBzZWxlY3Rl ZEl0ZW1DYW5kaWRhdGUgPSB0aGlzLl9uYXZpZ2F0aW9uSXRlbXNbc2VsZWN0ZWRJbmRleF07Cisg ICAgICAgICAgICBpZiAoc2VsZWN0ZWRJdGVtQ2FuZGlkYXRlIGluc3RhbmNlb2YgV0kuUmFkaW9C dXR0b25OYXZpZ2F0aW9uSXRlbSkgeworICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0ZWROYXZp Z2F0aW9uSXRlbSA9IHNlbGVjdGVkSXRlbUNhbmRpZGF0ZTsKKyAgICAgICAgICAgICAgICB0aGlz LnNlbGVjdGVkTmF2aWdhdGlvbkl0ZW0uZWxlbWVudC5mb2N1cygpOworICAgICAgICAgICAgICAg IGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogCiAgICAgX2NhbGN1bGF0 ZU1pbmltdW1XaWR0aCgpCg== 394667 2020-03-26 16:08:14 -0700 2020-03-26 16:40:09 -0700 Patch patch.txt text/plain 3434 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU1ZWVlMTk1ZjY5Li5jNTJjMWVjYzYxMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDMtMjYgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUlRMOiBBcnJvd0xlZnQgYW5kIEFycm93UmlnaHQga2V5cyBzZWxlY3Qgd3JvbmcgbmF2aWdh dGlvbiBiYXIgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwOTYxNworCisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5qczoKKyAgICAgICAgKFdJ Lk5hdmlnYXRpb25CYXIucHJvdG90eXBlLl9rZXlEb3duKToKKyAgICAgICAgUmV2ZXJzZSBkaXJl Y3Rpb24gZm9yIFJUTCBtb2RlLgorCiAyMDIwLTAzLTIzICBEZXZpbiBSb3Vzc28gIDxkcm91c3Nv QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OKHIyNTc3OTEp OiBldmVudCBicmVha3BvaW50IGljb24gc2hvdWxkIGJlIFtFXQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25CYXIuanMK aW5kZXggODNhZmI5MmY2OGUuLjYwOTY4ZDJkN2Q3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25CYXIuanMKQEAg LTM2OCwzMiArMzY4LDMyIEBAIFdJLk5hdmlnYXRpb25CYXIgPSBjbGFzcyBOYXZpZ2F0aW9uQmFy IGV4dGVuZHMgV0kuVmlldwogCiAgICAgX2tleURvd24oZXZlbnQpCiAgICAgewotICAgICAgICBp ZiAoZXZlbnQua2V5SWRlbnRpZmllciAhPT0gIkxlZnQiICYmIGV2ZW50LmtleUlkZW50aWZpZXIg IT09ICJSaWdodCIpCisgICAgICAgIGxldCBpc0xlZnRBcnJvdyA9IGV2ZW50LmNvZGUgPT09ICJB cnJvd0xlZnQiOworICAgICAgICBpZiAoIWlzTGVmdEFycm93ICYmIGV2ZW50LmNvZGUgIT09ICJB cnJvd1JpZ2h0IikKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBldmVudC5wcmV2ZW50 RGVmYXVsdCgpOwogICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKIAotICAgICAgICB2 YXIgc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4ID0gdGhpcy5fbmF2aWdhdGlvbkl0ZW1zLmlu ZGV4T2YodGhpcy5fc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbSk7CisgICAgICAgIGxldCBkZWx0YSA9 IGlzTGVmdEFycm93ID8gLTEgOiAxOworICAgICAgICBpZiAoV0kucmVzb2x2ZUxheW91dERpcmVj dGlvbkZvckVsZW1lbnQodGhpcy5fZWxlbWVudCkgPT09IFdJLkxheW91dERpcmVjdGlvbi5SVEwp CisgICAgICAgICAgICBkZWx0YSAqPSAtMTsKIAotICAgICAgICBpZiAoZXZlbnQua2V5SWRlbnRp ZmllciA9PT0gIkxlZnQiKSB7Ci0gICAgICAgICAgICBpZiAoc2VsZWN0ZWROYXZpZ2F0aW9uSXRl bUluZGV4ID09PSAtMSkKLSAgICAgICAgICAgICAgICBzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5k ZXggPSB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMubGVuZ3RoOworICAgICAgICBsZXQgc2VsZWN0ZWRJ bmRleCA9IHRoaXMuX25hdmlnYXRpb25JdGVtcy5pbmRleE9mKHRoaXMuX3NlbGVjdGVkTmF2aWdh dGlvbkl0ZW0pOwogCi0gICAgICAgICAgICBkbyB7Ci0gICAgICAgICAgICAgICAgc2VsZWN0ZWRO YXZpZ2F0aW9uSXRlbUluZGV4ID0gTWF0aC5tYXgoMCwgc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUlu ZGV4IC0gMSk7Ci0gICAgICAgICAgICB9IHdoaWxlIChzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5k ZXggJiYgISh0aGlzLl9uYXZpZ2F0aW9uSXRlbXNbc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4 XSBpbnN0YW5jZW9mIFdJLlJhZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0pKTsKLSAgICAgICAgfSBl bHNlIGlmIChldmVudC5rZXlJZGVudGlmaWVyID09PSAiUmlnaHQiKSB7Ci0gICAgICAgICAgICBk byB7Ci0gICAgICAgICAgICAgICAgc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4ID0gTWF0aC5t aW4oc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4ICsgMSwgdGhpcy5fbmF2aWdhdGlvbkl0ZW1z Lmxlbmd0aCAtIDEpOwotICAgICAgICAgICAgfSB3aGlsZSAoc2VsZWN0ZWROYXZpZ2F0aW9uSXRl bUluZGV4IDwgdGhpcy5fbmF2aWdhdGlvbkl0ZW1zLmxlbmd0aCAtIDEgJiYgISh0aGlzLl9uYXZp Z2F0aW9uSXRlbXNbc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4XSBpbnN0YW5jZW9mIFdJLlJh ZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0pKTsKLSAgICAgICAgfQorICAgICAgICB3aGlsZSAodHJ1 ZSkgeworICAgICAgICAgICAgc2VsZWN0ZWRJbmRleCArPSBkZWx0YTsKIAotICAgICAgICBpZiAo ISh0aGlzLl9uYXZpZ2F0aW9uSXRlbXNbc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4XSBpbnN0 YW5jZW9mIFdJLlJhZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0pKQotICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgaWYgKHNlbGVjdGVkSW5kZXggPCAwIHx8IHNlbGVjdGVkSW5kZXggPj0g dGhpcy5fbmF2aWdhdGlvbkl0ZW1zLmxlbmd0aCkKKyAgICAgICAgICAgICAgICBicmVhazsKIAot ICAgICAgICB0aGlzLnNlbGVjdGVkTmF2aWdhdGlvbkl0ZW0gPSB0aGlzLl9uYXZpZ2F0aW9uSXRl bXNbc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4XTsKLSAgICAgICAgdGhpcy5zZWxlY3RlZE5h dmlnYXRpb25JdGVtPy5lbGVtZW50LmZvY3VzKCk7CisgICAgICAgICAgICBsZXQgc2VsZWN0ZWRJ dGVtQ2FuZGlkYXRlID0gdGhpcy5fbmF2aWdhdGlvbkl0ZW1zW3NlbGVjdGVkSW5kZXhdOworICAg ICAgICAgICAgaWYgKHNlbGVjdGVkSXRlbUNhbmRpZGF0ZSBpbnN0YW5jZW9mIFdJLlJhZGlvQnV0 dG9uTmF2aWdhdGlvbkl0ZW0pIHsKKyAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGVkTmF2aWdh dGlvbkl0ZW0gPSBzZWxlY3RlZEl0ZW1DYW5kaWRhdGU7CisgICAgICAgICAgICAgICAgdGhpcy5z ZWxlY3RlZE5hdmlnYXRpb25JdGVtLmVsZW1lbnQuZm9jdXMoKTsKKyAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogICAgIH0KIAogICAgIF9jYWxjdWxhdGVN aW5pbXVtV2lkdGgoKQo= 394675 2020-03-26 16:40:09 -0700 2020-03-26 17:11:37 -0700 Patch patch.txt text/plain 3571 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU1ZWVlMTk1ZjY5Li5jNTJjMWVjYzYxMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDMtMjYgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUlRMOiBBcnJvd0xlZnQgYW5kIEFycm93UmlnaHQga2V5cyBzZWxlY3Qgd3JvbmcgbmF2aWdh dGlvbiBiYXIgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwOTYxNworCisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5qczoKKyAgICAgICAgKFdJ Lk5hdmlnYXRpb25CYXIucHJvdG90eXBlLl9rZXlEb3duKToKKyAgICAgICAgUmV2ZXJzZSBkaXJl Y3Rpb24gZm9yIFJUTCBtb2RlLgorCiAyMDIwLTAzLTIzICBEZXZpbiBSb3Vzc28gIDxkcm91c3Nv QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OKHIyNTc3OTEp OiBldmVudCBicmVha3BvaW50IGljb24gc2hvdWxkIGJlIFtFXQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmF2aWdhdGlvbkJhci5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25CYXIuanMK aW5kZXggODNhZmI5MmY2OGUuLjkyMzZlMDlmMmJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OYXZpZ2F0aW9uQmFyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05hdmlnYXRpb25CYXIuanMKQEAg LTM2OCwzMiArMzY4LDM1IEBAIFdJLk5hdmlnYXRpb25CYXIgPSBjbGFzcyBOYXZpZ2F0aW9uQmFy IGV4dGVuZHMgV0kuVmlldwogCiAgICAgX2tleURvd24oZXZlbnQpCiAgICAgewotICAgICAgICBp ZiAoZXZlbnQua2V5SWRlbnRpZmllciAhPT0gIkxlZnQiICYmIGV2ZW50LmtleUlkZW50aWZpZXIg IT09ICJSaWdodCIpCisgICAgICAgIGxldCBpc0xlZnRBcnJvdyA9IGV2ZW50LmNvZGUgPT09ICJB cnJvd0xlZnQiOworICAgICAgICBpZiAoIWlzTGVmdEFycm93ICYmIGV2ZW50LmNvZGUgIT09ICJB cnJvd1JpZ2h0IikKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBldmVudC5wcmV2ZW50 RGVmYXVsdCgpOwogICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKIAotICAgICAgICB2 YXIgc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4ID0gdGhpcy5fbmF2aWdhdGlvbkl0ZW1zLmlu ZGV4T2YodGhpcy5fc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbSk7CisgICAgICAgIGxldCBkZWx0YSA9 IGlzTGVmdEFycm93ID8gLTEgOiAxOworICAgICAgICBpZiAoV0kucmVzb2x2ZUxheW91dERpcmVj dGlvbkZvckVsZW1lbnQodGhpcy5fZWxlbWVudCkgPT09IFdJLkxheW91dERpcmVjdGlvbi5SVEwp CisgICAgICAgICAgICBkZWx0YSAqPSAtMTsKIAotICAgICAgICBpZiAoZXZlbnQua2V5SWRlbnRp ZmllciA9PT0gIkxlZnQiKSB7Ci0gICAgICAgICAgICBpZiAoc2VsZWN0ZWROYXZpZ2F0aW9uSXRl bUluZGV4ID09PSAtMSkKLSAgICAgICAgICAgICAgICBzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5k ZXggPSB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMubGVuZ3RoOworICAgICAgICBsZXQgc2VsZWN0ZWRJ bmRleCA9IHRoaXMuX25hdmlnYXRpb25JdGVtcy5pbmRleE9mKHRoaXMuX3NlbGVjdGVkTmF2aWdh dGlvbkl0ZW0pOwogCi0gICAgICAgICAgICBkbyB7Ci0gICAgICAgICAgICAgICAgc2VsZWN0ZWRO YXZpZ2F0aW9uSXRlbUluZGV4ID0gTWF0aC5tYXgoMCwgc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUlu ZGV4IC0gMSk7Ci0gICAgICAgICAgICB9IHdoaWxlIChzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5k ZXggJiYgISh0aGlzLl9uYXZpZ2F0aW9uSXRlbXNbc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4 XSBpbnN0YW5jZW9mIFdJLlJhZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0pKTsKLSAgICAgICAgfSBl bHNlIGlmIChldmVudC5rZXlJZGVudGlmaWVyID09PSAiUmlnaHQiKSB7Ci0gICAgICAgICAgICBk byB7Ci0gICAgICAgICAgICAgICAgc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4ID0gTWF0aC5t aW4oc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4ICsgMSwgdGhpcy5fbmF2aWdhdGlvbkl0ZW1z Lmxlbmd0aCAtIDEpOwotICAgICAgICAgICAgfSB3aGlsZSAoc2VsZWN0ZWROYXZpZ2F0aW9uSXRl bUluZGV4IDwgdGhpcy5fbmF2aWdhdGlvbkl0ZW1zLmxlbmd0aCAtIDEgJiYgISh0aGlzLl9uYXZp Z2F0aW9uSXRlbXNbc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbUluZGV4XSBpbnN0YW5jZW9mIFdJLlJh ZGlvQnV0dG9uTmF2aWdhdGlvbkl0ZW0pKTsKLSAgICAgICAgfQorICAgICAgICBpZiAoc2VsZWN0 ZWRJbmRleCA9PT0gLTEpCisgICAgICAgICAgICBzZWxlY3RlZEluZGV4ID0gKHRoaXMuX25hdmln YXRpb25JdGVtcy5sZW5ndGggKyBkZWx0YSkgJSB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMubGVuZ3Ro OwogCi0gICAgICAgIGlmICghKHRoaXMuX25hdmlnYXRpb25JdGVtc1tzZWxlY3RlZE5hdmlnYXRp b25JdGVtSW5kZXhdIGluc3RhbmNlb2YgV0kuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbSkpCi0g ICAgICAgICAgICByZXR1cm47CisgICAgICAgIHdoaWxlICh0cnVlKSB7CisgICAgICAgICAgICBz ZWxlY3RlZEluZGV4ICs9IGRlbHRhOworCisgICAgICAgICAgICBpZiAoc2VsZWN0ZWRJbmRleCA8 IDAgfHwgc2VsZWN0ZWRJbmRleCA+PSB0aGlzLl9uYXZpZ2F0aW9uSXRlbXMubGVuZ3RoKQorICAg ICAgICAgICAgICAgIGJyZWFrOwogCi0gICAgICAgIHRoaXMuc2VsZWN0ZWROYXZpZ2F0aW9uSXRl bSA9IHRoaXMuX25hdmlnYXRpb25JdGVtc1tzZWxlY3RlZE5hdmlnYXRpb25JdGVtSW5kZXhdOwot ICAgICAgICB0aGlzLnNlbGVjdGVkTmF2aWdhdGlvbkl0ZW0/LmVsZW1lbnQuZm9jdXMoKTsKKyAg ICAgICAgICAgIGxldCBzZWxlY3RlZEl0ZW1DYW5kaWRhdGUgPSB0aGlzLl9uYXZpZ2F0aW9uSXRl bXNbc2VsZWN0ZWRJbmRleF07CisgICAgICAgICAgICBpZiAoc2VsZWN0ZWRJdGVtQ2FuZGlkYXRl IGluc3RhbmNlb2YgV0kuUmFkaW9CdXR0b25OYXZpZ2F0aW9uSXRlbSkgeworICAgICAgICAgICAg ICAgIHRoaXMuc2VsZWN0ZWROYXZpZ2F0aW9uSXRlbSA9IHNlbGVjdGVkSXRlbUNhbmRpZGF0ZTsK KyAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGVkTmF2aWdhdGlvbkl0ZW0uZWxlbWVudC5mb2N1 cygpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CiAg ICAgfQogCiAgICAgX2NhbGN1bGF0ZU1pbmltdW1XaWR0aCgpCg==