191435 2018-11-08 13:25:06 -0800 Web Inspector: Styles: Command-A should select all properties 2018-11-13 10:40:09 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=190299 InRadar P2 Normal --- 191575 1 nvasilyev nvasilyev commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1476636 0 nvasilyev 2018-11-08 13:25:06 -0800 When focused on a property, Command-A should select all properties of the rule. 1476637 1 webkit-bug-importer 2018-11-08 13:25:22 -0800 <rdar://problem/45921373> 1476638 2 354267 nvasilyev 2018-11-08 13:26:16 -0800 Created attachment 354267 Patch 1476647 3 354271 nvasilyev 2018-11-08 13:55:19 -0800 Created attachment 354271 Patch 1476820 4 354271 hi 2018-11-08 23:30:08 -0800 Comment on attachment 354271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354271&action=review > Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js:553 > + if (!this._hasSelectedProperties() || this._propertyViews.length === 0) This makes me think that we would only respond to this event if something is selected. That doesn't make a lot of sense. I think what we want to do is bail if any property is currently being edited. > Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js:557 > + this.selectProperties(0, this._propertyViews.length - 1); It looks like every call to `selectProperties` is wrapped by `_suppressBlur`. Maybe move those lines inside the function, so future callers won't need to think about that. 1477006 5 354271 nvasilyev 2018-11-09 11:23:22 -0800 Comment on attachment 354271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354271&action=review >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js:557 >> + this.selectProperties(0, this._propertyViews.length - 1); > > It looks like every call to `selectProperties` is wrapped by `_suppressBlur`. Maybe move those lines inside the function, so future callers won't need to think about that. Good catch! One call in spreadsheetCSSStyleDeclarationEditorPropertyMouseEnter wasn't wrapped by `_suppressBlur` but it was safe to move those lines inside the function anyway. 1477009 6 354358 nvasilyev 2018-11-09 11:27:10 -0800 Created attachment 354358 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354271&action=review >> Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js:553 >> + if (!this._hasSelectedProperties() || this._propertyViews.length === 0) > > This makes me think that we would only respond to this event if something is selected. That doesn't make a lot of sense. I think what we want to do is bail if any property is currently being edited. I think it's fine as it is. Currently, I only want Command-A to work when at least one property is selected. Property can't be selected when I edit a name or value. I want to refactor `editing` getter because it isn't longer accurate but I don't want to do it in this patch. 1477759 7 354599 nvasilyev 2018-11-12 15:28:23 -0800 Created attachment 354599 Patch I created "Bug 191567 - Web Inspector: Styles: SpreadsheetCSSStyleDeclarationEditor.prototype.editing getter is inaccurate", and I left a comment in the code. I have a plan for refactoring, but it may break things and I'd hate to introduce a regression in the current style editor while working on the experimental feature. 1477810 8 354612 nvasilyev 2018-11-12 17:29:52 -0800 Created attachment 354612 Patch 1478029 9 354612 hi 2018-11-13 09:32:47 -0800 Comment on attachment 354612 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=354612&action=review r=me, nice refactoring :) > Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationEditor.js:559 > + if (!this._hasSelectedProperties() || this._propertyViews.length === 0) Style: `!this._propertyViews.length` 1478039 10 354678 nvasilyev 2018-11-13 10:02:35 -0800 Created attachment 354678 Patch 1478054 11 354678 commit-queue 2018-11-13 10:40:08 -0800 Comment on attachment 354678 Patch Clearing flags on attachment: 354678 Committed r238135: <https://trac.webkit.org/changeset/238135> 1478055 12 commit-queue 2018-11-13 10:40:09 -0800 All reviewed patches have been landed. Closing bug. 354267 2018-11-08 13:26:16 -0800 2018-11-08 13:55:19 -0800 Patch patch.txt text/plain 1738 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY3YjUzODY2NWUzLi40NWI2YWM0MmQ0YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTgtMTEtMDggIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBDb21tYW5kLUEgc2hvdWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxNDM1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NTkyMTM3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NT dHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHls ZURlY2xhcmF0aW9uRWRpdG9yLnByb3RvdHlwZS5faGFuZGxlS2V5RG93bik6CisKIDIwMTgtMTEt MDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIg SW5zcGVjdG9yOiBGaXggIkphdmFzY3JpcHQiID0+ICJKYXZhU2NyaXB0IiBlbnVtIGluIHByb3Rv Y29sIGdlbmVyYXRlZCBvYmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3Iu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVl dENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanMKaW5kZXggYjNlYzBkM2NkZWEuLjA1N2QwMzIz OGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xh cmF0aW9uRWRpdG9yLmpzCkBAIC01NDksNiArNTQ5LDE1IEBAIFdJLlNwcmVhZHNoZWV0Q1NTU3R5 bGVEZWNsYXJhdGlvbkVkaXRvciA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlv bkVkCiAKICAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiAKKyAgICAgICAgfSBl bHNlIGlmIChldmVudC5rZXkgPT09ICJhIiAmJiBldmVudC5tZXRhS2V5KSB7CisgICAgICAgICAg ICBpZiAoIXRoaXMuX2hhc1NlbGVjdGVkUHJvcGVydGllcygpIHx8IHRoaXMuX3Byb3BlcnR5Vmll d3MubGVuZ3RoID09PSAwKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAg dGhpcy5fc3VwcHJlc3NCbHVyID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuc2VsZWN0UHJvcGVy dGllcygwLCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0aCAtIDEpOworICAgICAgICAgICAgdGhp cy5fc3VwcHJlc3NCbHVyID0gZmFsc2U7CisgICAgICAgICAgICBldmVudC5zdG9wKCk7CisKICAg ICAgICAgfSBlbHNlIGlmIChldmVudC5rZXkgPT09ICJFc2MiKQogICAgICAgICAgICAgdGhpcy5k ZXNlbGVjdFByb3BlcnRpZXMoKTsKICAgICB9Cg== 354271 2018-11-08 13:55:19 -0800 2018-11-09 11:27:10 -0800 Patch patch.txt text/plain 3172 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY3YjUzODY2NWUzLi45YThlYTliZDdjMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMTEtMDggIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBDb21tYW5kLUEgc2hvdWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxNDM1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NTkyMTM3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGZvY3VzZWQgb24gYSBzdHlsZSBwcm9wZXJ0eSwgQ29t bWFuZC1BIG9uIE1hYyAoQ29udHJvbC1BIG9uIG90aGVyIHBsYXRmb3JtcykKKyAgICAgICAgc2hv dWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcyBvZiB0aGUgc3R5bGUgcnVsZS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAgIChLZXlib2FyZEV2ZW50 LnByb3RvdHlwZS5jb21tYW5kT3JDb250cm9sS2V5KQorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzOgorICAgICAgICAo V0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLnByb3RvdHlwZS5faGFuZGxl S2V5RG93bik6CisKIDIwMTgtMTEtMDcgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBGaXggIkphdmFzY3JpcHQiID0+ICJKYXZh U2NyaXB0IiBlbnVtIGluIHByb3RvY29sIGdlbmVyYXRlZCBvYmplY3RzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCmluZGV4 IDViOGE4MTU0OTZkLi5jMjIyYTA1YWVlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKQEAgLTQyMiw2ICs0MjIsMTQg QEAgT2JqZWN0LmRlZmluZVByb3BlcnR5KEV2ZW50LnByb3RvdHlwZSwgInN0b3AiLAogICAgIH0K IH0pOwogCitPYmplY3QuZGVmaW5lUHJvcGVydHkoS2V5Ym9hcmRFdmVudC5wcm90b3R5cGUsICJj b21tYW5kT3JDb250cm9sS2V5IiwKK3sKKyAgICBnZXQoKQorICAgIHsKKyAgICAgICAgcmV0dXJu IFdJLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiID8gdGhpcy5tZXRhS2V5IDogdGhpcy5jdHJsS2V5 OworICAgIH0KK30pOworCiBPYmplY3QuZGVmaW5lUHJvcGVydHkoQXJyYXksICJpc1R5cGVkQXJy YXkiLAogewogICAgIHZhbHVlKGFycmF5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRp dG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFk c2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzCmluZGV4IGIzZWMwZDNjZGVhLi4yODY1 NzdkMzhmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVE ZWNsYXJhdGlvbkVkaXRvci5qcwpAQCAtNTMyLDcgKzUzMiw3IEBAIFdJLlNwcmVhZHNoZWV0Q1NT U3R5bGVEZWNsYXJhdGlvbkVkaXRvciA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJh dGlvbkVkCiAKICAgICAgICAgICAgIGV2ZW50LnN0b3AoKTsKIAotICAgICAgICB9IGVsc2UgaWYg KChldmVudC5jb2RlID09PSAiU3BhY2UiICYmICFldmVudC5zaGlmdEtleSAmJiAhZXZlbnQubWV0 YUtleSAmJiAhZXZlbnQuY3RybEtleSkgfHwgKGV2ZW50LmtleSA9PT0gIi8iICYmIChldmVudC5t ZXRhS2V5IHx8IGV2ZW50LmN0cmxLZXkpICYmICFldmVudC5zaGlmdEtleSkpIHsKKyAgICAgICAg fSBlbHNlIGlmICgoZXZlbnQuY29kZSA9PT0gIlNwYWNlIiAmJiAhZXZlbnQuc2hpZnRLZXkgJiYg IWV2ZW50Lm1ldGFLZXkgJiYgIWV2ZW50LmN0cmxLZXkpIHx8IChldmVudC5rZXkgPT09ICIvIiAm JiBldmVudC5jb21tYW5kT3JDb250cm9sS2V5ICYmICFldmVudC5zaGlmdEtleSkpIHsKICAgICAg ICAgICAgIGlmICghdGhpcy5faGFzU2VsZWN0ZWRQcm9wZXJ0aWVzKCkpCiAgICAgICAgICAgICAg ICAgcmV0dXJuOwogCkBAIC01NDksNiArNTQ5LDE1IEBAIFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVE ZWNsYXJhdGlvbkVkaXRvciA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVk CiAKICAgICAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiAKKyAgICAgICAgfSBlbHNl IGlmIChldmVudC5rZXkgPT09ICJhIiAmJiBldmVudC5jb21tYW5kT3JDb250cm9sS2V5KSB7Cisg ICAgICAgICAgICBpZiAoIXRoaXMuX2hhc1NlbGVjdGVkUHJvcGVydGllcygpIHx8IHRoaXMuX3By b3BlcnR5Vmlld3MubGVuZ3RoID09PSAwKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAg ICAgICAgICAgdGhpcy5fc3VwcHJlc3NCbHVyID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuc2Vs ZWN0UHJvcGVydGllcygwLCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0aCAtIDEpOworICAgICAg ICAgICAgdGhpcy5fc3VwcHJlc3NCbHVyID0gZmFsc2U7CisgICAgICAgICAgICBldmVudC5zdG9w KCk7CisKICAgICAgICAgfSBlbHNlIGlmIChldmVudC5rZXkgPT09ICJFc2MiKQogICAgICAgICAg ICAgdGhpcy5kZXNlbGVjdFByb3BlcnRpZXMoKTsKICAgICB9Cg== 354358 2018-11-09 11:27:10 -0800 2018-11-12 15:28:23 -0800 Patch patch.txt text/plain 4499 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY3YjUzODY2NWUzLi5iYjY3MjExYWQxMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMTEtMDkgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBDb21tYW5kLUEgc2hvdWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxNDM1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NTkyMTM3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGZvY3VzZWQgb24gYSBzdHlsZSBwcm9wZXJ0eSwgQ29t bWFuZC1BIG9uIE1hYyAoQ29udHJvbC1BIG9uIG90aGVyIHBsYXRmb3JtcykKKyAgICAgICAgc2hv dWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcyBvZiB0aGUgc3R5bGUgcnVsZS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanM6CisgICAgICAg IChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IucHJvdG90eXBlLnNlbGVj dFByb3BlcnRpZXMpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yLnByb3RvdHlwZS5faGFuZGxlS2V5RG93bik6CisKIDIwMTgtMTEtMDcgIEpvc2VwaCBQ ZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBG aXggIkphdmFzY3JpcHQiID0+ICJKYXZhU2NyaXB0IiBlbnVtIGluIHByb3RvY29sIGdlbmVyYXRl ZCBvYmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvVXRpbGl0aWVzLmpzCmluZGV4IDViOGE4MTU0OTZkLi5jMjIyYTA1YWVlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRp ZXMuanMKQEAgLTQyMiw2ICs0MjIsMTQgQEAgT2JqZWN0LmRlZmluZVByb3BlcnR5KEV2ZW50LnBy b3RvdHlwZSwgInN0b3AiLAogICAgIH0KIH0pOwogCitPYmplY3QuZGVmaW5lUHJvcGVydHkoS2V5 Ym9hcmRFdmVudC5wcm90b3R5cGUsICJjb21tYW5kT3JDb250cm9sS2V5IiwKK3sKKyAgICBnZXQo KQorICAgIHsKKyAgICAgICAgcmV0dXJuIFdJLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiID8gdGhp cy5tZXRhS2V5IDogdGhpcy5jdHJsS2V5OworICAgIH0KK30pOworCiBPYmplY3QuZGVmaW5lUHJv cGVydHkoQXJyYXksICJpc1R5cGVkQXJyYXkiLAogewogICAgIHZhbHVlKGFycmF5KQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hl ZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpz CmluZGV4IGIzZWMwZDNjZGVhLi41MDk4ZDA2MWNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0 aW9uRWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5qcwpAQCAtMzQyLDggKzM0 MiwxMCBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IgPSBjbGFzcyBT cHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZAogICAgICAgICAgICAgcHJvcGVydHlWaWV3 LnNlbGVjdGVkID0gaXNTZWxlY3RlZDsKICAgICAgICAgfQogCisgICAgICAgIHRoaXMuX3N1cHBy ZXNzQmx1ciA9IHRydWU7CiAgICAgICAgIGxldCBwcm9wZXJ0eSA9IHRoaXMuX3Byb3BlcnR5Vmll d3NbZm9jdXNJbmRleF07CiAgICAgICAgIHByb3BlcnR5LmVsZW1lbnQuZm9jdXMoKTsKKyAgICAg ICAgdGhpcy5fc3VwcHJlc3NCbHVyID0gZmFsc2U7CiAgICAgfQogCiAgICAgZGVzZWxlY3RQcm9w ZXJ0aWVzKCkKQEAgLTUwMSwxMiArNTAzLDkgQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xh cmF0aW9uRWRpdG9yID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWQKICAg ICAgICAgICAgIGxldCBkZWx0YSA9IGV2ZW50LmtleSA9PT0gIkFycm93VXAiID8gLTEgOiAxOwog ICAgICAgICAgICAgbGV0IGZvY3VzSW5kZXggPSBOdW1iZXIuY29uc3RyYWluKHRoaXMuX2ZvY3Vz SW5kZXggKyBkZWx0YSwgMCwgdGhpcy5fcHJvcGVydHlWaWV3cy5sZW5ndGggLSAxKTsKIAotICAg ICAgICAgICAgLy8gQmx1ciBldmVudCBkZXNlbGVjdHMgYWxsIHByb3BlcnRpZXMuCi0gICAgICAg ICAgICB0aGlzLl9zdXBwcmVzc0JsdXIgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5zZWxlY3RQ cm9wZXJ0aWVzKGZvY3VzSW5kZXgsIGZvY3VzSW5kZXgpOwotICAgICAgICAgICAgdGhpcy5fc3Vw cHJlc3NCbHVyID0gZmFsc2U7Ci0KICAgICAgICAgICAgIGV2ZW50LnN0b3AoKTsKKwogICAgICAg ICB9IGVsc2UgaWYgKGV2ZW50LmtleSA9PT0gIkJhY2tzcGFjZSIpIHsKICAgICAgICAgICAgIGlm ICghdGhpcy5faGFzU2VsZWN0ZWRQcm9wZXJ0aWVzKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJu OwpAQCAtNTI0LDE1ICs1MjMsMTIgQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWQKICAgICAgICAg ICAgIGZvciAobGV0IGkgPSBlbmRJbmRleDsgaSA+PSBzdGFydEluZGV4OyBpLS0pCiAgICAgICAg ICAgICAgICAgdGhpcy5fcHJvcGVydHlWaWV3c1tpXS5yZW1vdmUoKTsKIAotICAgICAgICAgICAg aWYgKCFpc05hTihwcm9wZXJ0eUluZGV4VG9TZWxlY3QpKSB7Ci0gICAgICAgICAgICAgICAgdGhp cy5fc3VwcHJlc3NCbHVyID0gdHJ1ZTsKKyAgICAgICAgICAgIGlmICghaXNOYU4ocHJvcGVydHlJ bmRleFRvU2VsZWN0KSkKICAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdFByb3BlcnRpZXMocHJv cGVydHlJbmRleFRvU2VsZWN0LCBwcm9wZXJ0eUluZGV4VG9TZWxlY3QpOwotICAgICAgICAgICAg ICAgIHRoaXMuX3N1cHByZXNzQmx1ciA9IGZhbHNlOwotICAgICAgICAgICAgfQogCiAgICAgICAg ICAgICBldmVudC5zdG9wKCk7CiAKLSAgICAgICAgfSBlbHNlIGlmICgoZXZlbnQuY29kZSA9PT0g IlNwYWNlIiAmJiAhZXZlbnQuc2hpZnRLZXkgJiYgIWV2ZW50Lm1ldGFLZXkgJiYgIWV2ZW50LmN0 cmxLZXkpIHx8IChldmVudC5rZXkgPT09ICIvIiAmJiAoZXZlbnQubWV0YUtleSB8fCBldmVudC5j dHJsS2V5KSAmJiAhZXZlbnQuc2hpZnRLZXkpKSB7CisgICAgICAgIH0gZWxzZSBpZiAoKGV2ZW50 LmNvZGUgPT09ICJTcGFjZSIgJiYgIWV2ZW50LnNoaWZ0S2V5ICYmICFldmVudC5tZXRhS2V5ICYm ICFldmVudC5jdHJsS2V5KSB8fCAoZXZlbnQua2V5ID09PSAiLyIgJiYgZXZlbnQuY29tbWFuZE9y Q29udHJvbEtleSAmJiAhZXZlbnQuc2hpZnRLZXkpKSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMu X2hhc1NlbGVjdGVkUHJvcGVydGllcygpKQogICAgICAgICAgICAgICAgIHJldHVybjsKIApAQCAt NTQ5LDYgKzU0NSwxMyBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3Ig PSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZAogCiAgICAgICAgICAgICBl dmVudC5wcmV2ZW50RGVmYXVsdCgpOwogCisgICAgICAgIH0gZWxzZSBpZiAoZXZlbnQua2V5ID09 PSAiYSIgJiYgZXZlbnQuY29tbWFuZE9yQ29udHJvbEtleSkgeworICAgICAgICAgICAgaWYgKCF0 aGlzLl9oYXNTZWxlY3RlZFByb3BlcnRpZXMoKSB8fCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0 aCA9PT0gMCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIHRoaXMuc2Vs ZWN0UHJvcGVydGllcygwLCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0aCAtIDEpOworICAgICAg ICAgICAgZXZlbnQuc3RvcCgpOworCiAgICAgICAgIH0gZWxzZSBpZiAoZXZlbnQua2V5ID09PSAi RXNjIikKICAgICAgICAgICAgIHRoaXMuZGVzZWxlY3RQcm9wZXJ0aWVzKCk7CiAgICAgfQo= 354599 2018-11-12 15:28:23 -0800 2018-11-12 17:29:52 -0800 Patch patch.txt text/plain 4625 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY3YjUzODY2NWUzLi5kMzQ2ZmUyYjJlZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMTEtMTIgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBDb21tYW5kLUEgc2hvdWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxNDM1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NTkyMTM3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGZvY3VzZWQgb24gYSBzdHlsZSBwcm9wZXJ0eSwgQ29t bWFuZC1BIG9uIE1hYyAoQ29udHJvbC1BIG9uIG90aGVyIHBsYXRmb3JtcykKKyAgICAgICAgc2hv dWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcyBvZiB0aGUgc3R5bGUgcnVsZS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanM6CisgICAgICAg IChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IucHJvdG90eXBlLnNlbGVj dFByb3BlcnRpZXMpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yLnByb3RvdHlwZS5faGFuZGxlS2V5RG93bik6CisKIDIwMTgtMTEtMDcgIEpvc2VwaCBQ ZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBG aXggIkphdmFzY3JpcHQiID0+ICJKYXZhU2NyaXB0IiBlbnVtIGluIHByb3RvY29sIGdlbmVyYXRl ZCBvYmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1V0aWxpdGllcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvVXRpbGl0aWVzLmpzCmluZGV4IDViOGE4MTU0OTZkLi5jMjIyYTA1YWVlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRp ZXMuanMKQEAgLTQyMiw2ICs0MjIsMTQgQEAgT2JqZWN0LmRlZmluZVByb3BlcnR5KEV2ZW50LnBy b3RvdHlwZSwgInN0b3AiLAogICAgIH0KIH0pOwogCitPYmplY3QuZGVmaW5lUHJvcGVydHkoS2V5 Ym9hcmRFdmVudC5wcm90b3R5cGUsICJjb21tYW5kT3JDb250cm9sS2V5IiwKK3sKKyAgICBnZXQo KQorICAgIHsKKyAgICAgICAgcmV0dXJuIFdJLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiID8gdGhp cy5tZXRhS2V5IDogdGhpcy5jdHJsS2V5OworICAgIH0KK30pOworCiBPYmplY3QuZGVmaW5lUHJv cGVydHkoQXJyYXksICJpc1R5cGVkQXJyYXkiLAogewogICAgIHZhbHVlKGFycmF5KQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hl ZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpz CmluZGV4IGIzZWMwZDNjZGVhLi43MTI0OTUxYTY3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0 aW9uRWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvci5qcwpAQCAtMzQyLDggKzM0 MiwxMCBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IgPSBjbGFzcyBT cHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZAogICAgICAgICAgICAgcHJvcGVydHlWaWV3 LnNlbGVjdGVkID0gaXNTZWxlY3RlZDsKICAgICAgICAgfQogCisgICAgICAgIHRoaXMuX3N1cHBy ZXNzQmx1ciA9IHRydWU7CiAgICAgICAgIGxldCBwcm9wZXJ0eSA9IHRoaXMuX3Byb3BlcnR5Vmll d3NbZm9jdXNJbmRleF07CiAgICAgICAgIHByb3BlcnR5LmVsZW1lbnQuZm9jdXMoKTsKKyAgICAg ICAgdGhpcy5fc3VwcHJlc3NCbHVyID0gZmFsc2U7CiAgICAgfQogCiAgICAgZGVzZWxlY3RQcm9w ZXJ0aWVzKCkKQEAgLTUwMSwxMiArNTAzLDkgQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xh cmF0aW9uRWRpdG9yID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWQKICAg ICAgICAgICAgIGxldCBkZWx0YSA9IGV2ZW50LmtleSA9PT0gIkFycm93VXAiID8gLTEgOiAxOwog ICAgICAgICAgICAgbGV0IGZvY3VzSW5kZXggPSBOdW1iZXIuY29uc3RyYWluKHRoaXMuX2ZvY3Vz SW5kZXggKyBkZWx0YSwgMCwgdGhpcy5fcHJvcGVydHlWaWV3cy5sZW5ndGggLSAxKTsKIAotICAg ICAgICAgICAgLy8gQmx1ciBldmVudCBkZXNlbGVjdHMgYWxsIHByb3BlcnRpZXMuCi0gICAgICAg ICAgICB0aGlzLl9zdXBwcmVzc0JsdXIgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5zZWxlY3RQ cm9wZXJ0aWVzKGZvY3VzSW5kZXgsIGZvY3VzSW5kZXgpOwotICAgICAgICAgICAgdGhpcy5fc3Vw cHJlc3NCbHVyID0gZmFsc2U7Ci0KICAgICAgICAgICAgIGV2ZW50LnN0b3AoKTsKKwogICAgICAg ICB9IGVsc2UgaWYgKGV2ZW50LmtleSA9PT0gIkJhY2tzcGFjZSIpIHsKICAgICAgICAgICAgIGlm ICghdGhpcy5faGFzU2VsZWN0ZWRQcm9wZXJ0aWVzKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJu OwpAQCAtNTI0LDE1ICs1MjMsMTIgQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWQKICAgICAgICAg ICAgIGZvciAobGV0IGkgPSBlbmRJbmRleDsgaSA+PSBzdGFydEluZGV4OyBpLS0pCiAgICAgICAg ICAgICAgICAgdGhpcy5fcHJvcGVydHlWaWV3c1tpXS5yZW1vdmUoKTsKIAotICAgICAgICAgICAg aWYgKCFpc05hTihwcm9wZXJ0eUluZGV4VG9TZWxlY3QpKSB7Ci0gICAgICAgICAgICAgICAgdGhp cy5fc3VwcHJlc3NCbHVyID0gdHJ1ZTsKKyAgICAgICAgICAgIGlmICghaXNOYU4ocHJvcGVydHlJ bmRleFRvU2VsZWN0KSkKICAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdFByb3BlcnRpZXMocHJv cGVydHlJbmRleFRvU2VsZWN0LCBwcm9wZXJ0eUluZGV4VG9TZWxlY3QpOwotICAgICAgICAgICAg ICAgIHRoaXMuX3N1cHByZXNzQmx1ciA9IGZhbHNlOwotICAgICAgICAgICAgfQogCiAgICAgICAg ICAgICBldmVudC5zdG9wKCk7CiAKLSAgICAgICAgfSBlbHNlIGlmICgoZXZlbnQuY29kZSA9PT0g IlNwYWNlIiAmJiAhZXZlbnQuc2hpZnRLZXkgJiYgIWV2ZW50Lm1ldGFLZXkgJiYgIWV2ZW50LmN0 cmxLZXkpIHx8IChldmVudC5rZXkgPT09ICIvIiAmJiAoZXZlbnQubWV0YUtleSB8fCBldmVudC5j dHJsS2V5KSAmJiAhZXZlbnQuc2hpZnRLZXkpKSB7CisgICAgICAgIH0gZWxzZSBpZiAoKGV2ZW50 LmNvZGUgPT09ICJTcGFjZSIgJiYgIWV2ZW50LnNoaWZ0S2V5ICYmICFldmVudC5tZXRhS2V5ICYm ICFldmVudC5jdHJsS2V5KSB8fCAoZXZlbnQua2V5ID09PSAiLyIgJiYgZXZlbnQuY29tbWFuZE9y Q29udHJvbEtleSAmJiAhZXZlbnQuc2hpZnRLZXkpKSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMu X2hhc1NlbGVjdGVkUHJvcGVydGllcygpKQogICAgICAgICAgICAgICAgIHJldHVybjsKIApAQCAt NTQ5LDYgKzU0NSwxNCBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3Ig PSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZAogCiAgICAgICAgICAgICBl dmVudC5wcmV2ZW50RGVmYXVsdCgpOwogCisgICAgICAgIH0gZWxzZSBpZiAoZXZlbnQua2V5ID09 PSAiYSIgJiYgZXZlbnQuY29tbWFuZE9yQ29udHJvbEtleSkgeworICAgICAgICAgICAgLy8gRklY TUU6IENoZWNrIHRoaXMuZWRpdGluZyBpbnN0ZWFkIG9mIF9oYXNTZWxlY3RlZFByb3BlcnRpZXMo KSBvbmNlIDxodHRwczovL3dlYmtpdC5vcmcvYi8xOTE1Njc+IGlzIHJlc29sdmVkLgorICAgICAg ICAgICAgaWYgKCF0aGlzLl9oYXNTZWxlY3RlZFByb3BlcnRpZXMoKSB8fCB0aGlzLl9wcm9wZXJ0 eVZpZXdzLmxlbmd0aCA9PT0gMCkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAg ICAgIHRoaXMuc2VsZWN0UHJvcGVydGllcygwLCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0aCAt IDEpOworICAgICAgICAgICAgZXZlbnQuc3RvcCgpOworCiAgICAgICAgIH0gZWxzZSBpZiAoZXZl bnQua2V5ID09PSAiRXNjIikKICAgICAgICAgICAgIHRoaXMuZGVzZWxlY3RQcm9wZXJ0aWVzKCk7 CiAgICAgfQo= 354612 2018-11-12 17:29:52 -0800 2018-11-13 10:02:35 -0800 Patch patch.txt text/plain 4604 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQxMmM0ODgwZjQxLi5mYjU4MTQ4NTBmOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMTEtMTIgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBDb21tYW5kLUEgc2hvdWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxNDM1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NTkyMTM3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGZvY3VzZWQgb24gYSBzdHlsZSBwcm9wZXJ0eSwgQ29t bWFuZC1BIG9uIE1hYyAoQ29udHJvbC1BIG9uIG90aGVyIHBsYXRmb3JtcykKKyAgICAgICAgc2hv dWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcyBvZiB0aGUgc3R5bGUgcnVsZS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanM6CisgICAgICAg IChXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IucHJvdG90eXBlLnNlbGVj dFByb3BlcnRpZXMpOgorICAgICAgICAoV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yLnByb3RvdHlwZS5faGFuZGxlS2V5RG93bik6CisKIDIwMTgtMTEtMTIgIERvbiBPbG1z dGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAgICAgICBTaGlwcGVkIFBOR3MgaW5j bHVkZSBiYWQgcHJvZmlsZXM6IGlDQ1A6IGtub3duIGluY29ycmVjdCBzUkdCIHByb2ZpbGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0 aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRp ZXMuanMKaW5kZXggNWI4YTgxNTQ5NmQuLmMyMjJhMDVhZWU5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpAQCAtNDIy LDYgKzQyMiwxNCBAQCBPYmplY3QuZGVmaW5lUHJvcGVydHkoRXZlbnQucHJvdG90eXBlLCAic3Rv cCIsCiAgICAgfQogfSk7CiAKK09iamVjdC5kZWZpbmVQcm9wZXJ0eShLZXlib2FyZEV2ZW50LnBy b3RvdHlwZSwgImNvbW1hbmRPckNvbnRyb2xLZXkiLAoreworICAgIGdldCgpCisgICAgeworICAg ICAgICByZXR1cm4gV0kuUGxhdGZvcm0ubmFtZSA9PT0gIm1hYyIgPyB0aGlzLm1ldGFLZXkgOiB0 aGlzLmN0cmxLZXk7CisgICAgfQorfSk7CisKIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShBcnJheSwg ImlzVHlwZWRBcnJheSIsCiB7CiAgICAgdmFsdWUoYXJyYXkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVj bGFyYXRpb25FZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanMKaW5kZXggNTFjNDE0 ODJlYjguLmUyZGI0OGJkNWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hl ZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzCkBAIC0zNDIsOCArMzQyLDEwIEBAIFdJLlNw cmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvciA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NT U3R5bGVEZWNsYXJhdGlvbkVkCiAgICAgICAgICAgICBwcm9wZXJ0eVZpZXcuc2VsZWN0ZWQgPSBp c1NlbGVjdGVkOwogICAgICAgICB9CiAKKyAgICAgICAgdGhpcy5fc3VwcHJlc3NCbHVyID0gdHJ1 ZTsKICAgICAgICAgbGV0IHByb3BlcnR5ID0gdGhpcy5fcHJvcGVydHlWaWV3c1tmb2N1c0luZGV4 XTsKICAgICAgICAgcHJvcGVydHkuZWxlbWVudC5mb2N1cygpOworICAgICAgICB0aGlzLl9zdXBw cmVzc0JsdXIgPSBmYWxzZTsKICAgICB9CiAKICAgICBkZXNlbGVjdFByb3BlcnRpZXMoKQpAQCAt NTAxLDExICs1MDMsNyBAQCBXSS5TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3Ig PSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZAogICAgICAgICAgICAgbGV0 IGRlbHRhID0gZXZlbnQua2V5ID09PSAiQXJyb3dVcCIgPyAtMSA6IDE7CiAgICAgICAgICAgICBs ZXQgZm9jdXNJbmRleCA9IE51bWJlci5jb25zdHJhaW4odGhpcy5fZm9jdXNJbmRleCArIGRlbHRh LCAwLCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0aCAtIDEpOwogCi0gICAgICAgICAgICAvLyBC bHVyIGV2ZW50IGRlc2VsZWN0cyBhbGwgcHJvcGVydGllcy4KLSAgICAgICAgICAgIHRoaXMuX3N1 cHByZXNzQmx1ciA9IHRydWU7CiAgICAgICAgICAgICB0aGlzLnNlbGVjdFByb3BlcnRpZXMoZm9j dXNJbmRleCwgZm9jdXNJbmRleCk7Ci0gICAgICAgICAgICB0aGlzLl9zdXBwcmVzc0JsdXIgPSBm YWxzZTsKLQogICAgICAgICAgICAgZXZlbnQuc3RvcCgpOwogICAgICAgICB9IGVsc2UgaWYgKGV2 ZW50LmtleSA9PT0gIlRhYiIgfHwgZXZlbnQua2V5ID09PSAiRW50ZXIiKSB7CiAgICAgICAgICAg ICBpZiAoIXRoaXMuX2hhc1NlbGVjdGVkUHJvcGVydGllcygpKQpAQCAtNTM0LDE1ICs1MzIsMTIg QEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yID0gY2xhc3MgU3ByZWFk c2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWQKICAgICAgICAgICAgIGZvciAobGV0IGkgPSBlbmRJ bmRleDsgaSA+PSBzdGFydEluZGV4OyBpLS0pCiAgICAgICAgICAgICAgICAgdGhpcy5fcHJvcGVy dHlWaWV3c1tpXS5yZW1vdmUoKTsKIAotICAgICAgICAgICAgaWYgKCFpc05hTihwcm9wZXJ0eUlu ZGV4VG9TZWxlY3QpKSB7Ci0gICAgICAgICAgICAgICAgdGhpcy5fc3VwcHJlc3NCbHVyID0gdHJ1 ZTsKKyAgICAgICAgICAgIGlmICghaXNOYU4ocHJvcGVydHlJbmRleFRvU2VsZWN0KSkKICAgICAg ICAgICAgICAgICB0aGlzLnNlbGVjdFByb3BlcnRpZXMocHJvcGVydHlJbmRleFRvU2VsZWN0LCBw cm9wZXJ0eUluZGV4VG9TZWxlY3QpOwotICAgICAgICAgICAgICAgIHRoaXMuX3N1cHByZXNzQmx1 ciA9IGZhbHNlOwotICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBldmVudC5zdG9wKCk7CiAK LSAgICAgICAgfSBlbHNlIGlmICgoZXZlbnQuY29kZSA9PT0gIlNwYWNlIiAmJiAhZXZlbnQuc2hp ZnRLZXkgJiYgIWV2ZW50Lm1ldGFLZXkgJiYgIWV2ZW50LmN0cmxLZXkpIHx8IChldmVudC5rZXkg PT09ICIvIiAmJiAoZXZlbnQubWV0YUtleSB8fCBldmVudC5jdHJsS2V5KSAmJiAhZXZlbnQuc2hp ZnRLZXkpKSB7CisgICAgICAgIH0gZWxzZSBpZiAoKGV2ZW50LmNvZGUgPT09ICJTcGFjZSIgJiYg IWV2ZW50LnNoaWZ0S2V5ICYmICFldmVudC5tZXRhS2V5ICYmICFldmVudC5jdHJsS2V5KSB8fCAo ZXZlbnQua2V5ID09PSAiLyIgJiYgZXZlbnQuY29tbWFuZE9yQ29udHJvbEtleSAmJiAhZXZlbnQu c2hpZnRLZXkpKSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMuX2hhc1NlbGVjdGVkUHJvcGVydGll cygpKQogICAgICAgICAgICAgICAgIHJldHVybjsKIApAQCAtNTU5LDYgKzU1NCwxNCBAQCBXSS5T cHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IgPSBjbGFzcyBTcHJlYWRzaGVldENT U1N0eWxlRGVjbGFyYXRpb25FZAogCiAgICAgICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgp OwogCisgICAgICAgIH0gZWxzZSBpZiAoZXZlbnQua2V5ID09PSAiYSIgJiYgZXZlbnQuY29tbWFu ZE9yQ29udHJvbEtleSkgeworICAgICAgICAgICAgLy8gRklYTUU6IENoZWNrIHRoaXMuZWRpdGlu ZyBpbnN0ZWFkIG9mIF9oYXNTZWxlY3RlZFByb3BlcnRpZXMoKSBvbmNlIDxodHRwczovL3dlYmtp dC5vcmcvYi8xOTE1Njc+IGlzIHJlc29sdmVkLgorICAgICAgICAgICAgaWYgKCF0aGlzLl9oYXNT ZWxlY3RlZFByb3BlcnRpZXMoKSB8fCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0aCA9PT0gMCkK KyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIHRoaXMuc2VsZWN0UHJvcGVy dGllcygwLCB0aGlzLl9wcm9wZXJ0eVZpZXdzLmxlbmd0aCAtIDEpOworICAgICAgICAgICAgZXZl bnQuc3RvcCgpOworCiAgICAgICAgIH0gZWxzZSBpZiAoZXZlbnQua2V5ID09PSAiRXNjIikKICAg ICAgICAgICAgIHRoaXMuZGVzZWxlY3RQcm9wZXJ0aWVzKCk7CiAgICAgfQo= 354678 2018-11-13 10:02:35 -0800 2018-11-13 10:40:08 -0800 Patch patch.txt text/plain 4591 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGM0MTk4YWU2NGU1Li44MTA4M2ZhZjVhZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMTEtMTMgIE5pa2l0 YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogU3R5bGVzOiBDb21tYW5kLUEgc2hvdWxkIHNlbGVjdCBhbGwgcHJvcGVydGllcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxNDM1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NTkyMTM3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBEZXZpbiBS b3Vzc28uCisKKyAgICAgICAgV2hlbiBmb2N1c2VkIG9uIGEgc3R5bGUgcHJvcGVydHksIENvbW1h bmQtQSBvbiBNYWMgKENvbnRyb2wtQSBvbiBvdGhlciBwbGF0Zm9ybXMpCisgICAgICAgIHNob3Vs ZCBzZWxlY3QgYWxsIHByb3BlcnRpZXMgb2YgdGhlIHN0eWxlIHJ1bGUuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzOgorICAgICAgICAo V0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLnByb3RvdHlwZS5zZWxlY3RQ cm9wZXJ0aWVzKToKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVk aXRvci5wcm90b3R5cGUuX2hhbmRsZUtleURvd24pOgorCiAyMDE4LTExLTEyICBEZXZpbiBSb3Vz c28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3b3Jr OiBzaG93IHNlY3VyZSBjZXJ0aWZpY2F0ZSBkZXRhaWxzIHBlci1yZXF1ZXN0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCmlu ZGV4IDViOGE4MTU0OTZkLi5jMjIyYTA1YWVlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKQEAgLTQyMiw2ICs0MjIs MTQgQEAgT2JqZWN0LmRlZmluZVByb3BlcnR5KEV2ZW50LnByb3RvdHlwZSwgInN0b3AiLAogICAg IH0KIH0pOwogCitPYmplY3QuZGVmaW5lUHJvcGVydHkoS2V5Ym9hcmRFdmVudC5wcm90b3R5cGUs ICJjb21tYW5kT3JDb250cm9sS2V5IiwKK3sKKyAgICBnZXQoKQorICAgIHsKKyAgICAgICAgcmV0 dXJuIFdJLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiID8gdGhpcy5tZXRhS2V5IDogdGhpcy5jdHJs S2V5OworICAgIH0KK30pOworCiBPYmplY3QuZGVmaW5lUHJvcGVydHkoQXJyYXksICJpc1R5cGVk QXJyYXkiLAogewogICAgIHZhbHVlKGFycmF5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9u RWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3By ZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzCmluZGV4IDUxYzQxNDgyZWI4Li5i NDJhNDRjNTMxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5 bGVEZWNsYXJhdGlvbkVkaXRvci5qcwpAQCAtMzQyLDggKzM0MiwxMCBAQCBXSS5TcHJlYWRzaGVl dENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IgPSBjbGFzcyBTcHJlYWRzaGVldENTU1N0eWxlRGVj bGFyYXRpb25FZAogICAgICAgICAgICAgcHJvcGVydHlWaWV3LnNlbGVjdGVkID0gaXNTZWxlY3Rl ZDsKICAgICAgICAgfQogCisgICAgICAgIHRoaXMuX3N1cHByZXNzQmx1ciA9IHRydWU7CiAgICAg ICAgIGxldCBwcm9wZXJ0eSA9IHRoaXMuX3Byb3BlcnR5Vmlld3NbZm9jdXNJbmRleF07CiAgICAg ICAgIHByb3BlcnR5LmVsZW1lbnQuZm9jdXMoKTsKKyAgICAgICAgdGhpcy5fc3VwcHJlc3NCbHVy ID0gZmFsc2U7CiAgICAgfQogCiAgICAgZGVzZWxlY3RQcm9wZXJ0aWVzKCkKQEAgLTUwMSwxMSAr NTAzLDcgQEAgV0kuU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yID0gY2xhc3Mg U3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWQKICAgICAgICAgICAgIGxldCBkZWx0YSA9 IGV2ZW50LmtleSA9PT0gIkFycm93VXAiID8gLTEgOiAxOwogICAgICAgICAgICAgbGV0IGZvY3Vz SW5kZXggPSBOdW1iZXIuY29uc3RyYWluKHRoaXMuX2ZvY3VzSW5kZXggKyBkZWx0YSwgMCwgdGhp cy5fcHJvcGVydHlWaWV3cy5sZW5ndGggLSAxKTsKIAotICAgICAgICAgICAgLy8gQmx1ciBldmVu dCBkZXNlbGVjdHMgYWxsIHByb3BlcnRpZXMuCi0gICAgICAgICAgICB0aGlzLl9zdXBwcmVzc0Js dXIgPSB0cnVlOwogICAgICAgICAgICAgdGhpcy5zZWxlY3RQcm9wZXJ0aWVzKGZvY3VzSW5kZXgs IGZvY3VzSW5kZXgpOwotICAgICAgICAgICAgdGhpcy5fc3VwcHJlc3NCbHVyID0gZmFsc2U7Ci0K ICAgICAgICAgICAgIGV2ZW50LnN0b3AoKTsKICAgICAgICAgfSBlbHNlIGlmIChldmVudC5rZXkg PT09ICJUYWIiIHx8IGV2ZW50LmtleSA9PT0gIkVudGVyIikgewogICAgICAgICAgICAgaWYgKCF0 aGlzLl9oYXNTZWxlY3RlZFByb3BlcnRpZXMoKSkKQEAgLTUzNCwxNSArNTMyLDEyIEBAIFdJLlNw cmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvbkVkaXRvciA9IGNsYXNzIFNwcmVhZHNoZWV0Q1NT U3R5bGVEZWNsYXJhdGlvbkVkCiAgICAgICAgICAgICBmb3IgKGxldCBpID0gZW5kSW5kZXg7IGkg Pj0gc3RhcnRJbmRleDsgaS0tKQogICAgICAgICAgICAgICAgIHRoaXMuX3Byb3BlcnR5Vmlld3Nb aV0ucmVtb3ZlKCk7CiAKLSAgICAgICAgICAgIGlmICghaXNOYU4ocHJvcGVydHlJbmRleFRvU2Vs ZWN0KSkgewotICAgICAgICAgICAgICAgIHRoaXMuX3N1cHByZXNzQmx1ciA9IHRydWU7CisgICAg ICAgICAgICBpZiAoIWlzTmFOKHByb3BlcnR5SW5kZXhUb1NlbGVjdCkpCiAgICAgICAgICAgICAg ICAgdGhpcy5zZWxlY3RQcm9wZXJ0aWVzKHByb3BlcnR5SW5kZXhUb1NlbGVjdCwgcHJvcGVydHlJ bmRleFRvU2VsZWN0KTsKLSAgICAgICAgICAgICAgICB0aGlzLl9zdXBwcmVzc0JsdXIgPSBmYWxz ZTsKLSAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgZXZlbnQuc3RvcCgpOwogCi0gICAgICAg IH0gZWxzZSBpZiAoKGV2ZW50LmNvZGUgPT09ICJTcGFjZSIgJiYgIWV2ZW50LnNoaWZ0S2V5ICYm ICFldmVudC5tZXRhS2V5ICYmICFldmVudC5jdHJsS2V5KSB8fCAoZXZlbnQua2V5ID09PSAiLyIg JiYgKGV2ZW50Lm1ldGFLZXkgfHwgZXZlbnQuY3RybEtleSkgJiYgIWV2ZW50LnNoaWZ0S2V5KSkg eworICAgICAgICB9IGVsc2UgaWYgKChldmVudC5jb2RlID09PSAiU3BhY2UiICYmICFldmVudC5z aGlmdEtleSAmJiAhZXZlbnQubWV0YUtleSAmJiAhZXZlbnQuY3RybEtleSkgfHwgKGV2ZW50Lmtl eSA9PT0gIi8iICYmIGV2ZW50LmNvbW1hbmRPckNvbnRyb2xLZXkgJiYgIWV2ZW50LnNoaWZ0S2V5 KSkgewogICAgICAgICAgICAgaWYgKCF0aGlzLl9oYXNTZWxlY3RlZFByb3BlcnRpZXMoKSkKICAg ICAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTU1OSw2ICs1NTQsMTQgQEAgV0kuU3ByZWFkc2hl ZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yID0gY2xhc3MgU3ByZWFkc2hlZXRDU1NTdHlsZURl Y2xhcmF0aW9uRWQKIAogICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKIAorICAg ICAgICB9IGVsc2UgaWYgKGV2ZW50LmtleSA9PT0gImEiICYmIGV2ZW50LmNvbW1hbmRPckNvbnRy b2xLZXkpIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBDaGVjayB0aGlzLmVkaXRpbmcgaW5zdGVh ZCBvZiBfaGFzU2VsZWN0ZWRQcm9wZXJ0aWVzKCkgb25jZSA8aHR0cHM6Ly93ZWJraXQub3JnL2Iv MTkxNTY3PiBpcyByZXNvbHZlZC4KKyAgICAgICAgICAgIGlmICghdGhpcy5faGFzU2VsZWN0ZWRQ cm9wZXJ0aWVzKCkgfHwgIXRoaXMuX3Byb3BlcnR5Vmlld3MubGVuZ3RoKQorICAgICAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICAgICAgdGhpcy5zZWxlY3RQcm9wZXJ0aWVzKDAsIHRoaXMu X3Byb3BlcnR5Vmlld3MubGVuZ3RoIC0gMSk7CisgICAgICAgICAgICBldmVudC5zdG9wKCk7CisK ICAgICAgICAgfSBlbHNlIGlmIChldmVudC5rZXkgPT09ICJFc2MiKQogICAgICAgICAgICAgdGhp cy5kZXNlbGVjdFByb3BlcnRpZXMoKTsKICAgICB9Cg==