223463 2021-03-18 11:47:52 -0700 [iOS] Update strings and icons in the file upload panel 2021-03-18 19:56:08 -0700 1 1 1 Unclassified WebKit Forms Other iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 akeerthi akeerthi cdumez thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1741299 0 akeerthi 2021-03-18 11:47:52 -0700 ... 1741300 1 akeerthi 2021-03-18 11:48:03 -0700 <rdar://problem/74999459> 1741307 2 423628 akeerthi 2021-03-18 11:50:50 -0700 Created attachment 423628 Patch 1741320 3 akeerthi 2021-03-18 12:12:22 -0700 Thanks for the review! Will land once EWS finishes. 1741564 4 ews-feeder 2021-03-18 19:56:06 -0700 Committed r274698: <https://commits.webkit.org/r274698> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423628. 423628 2021-03-18 11:50:50 -0700 2021-03-18 19:56:07 -0700 Patch bug-223463-20210318145048.patch text/plain 13372 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E3YTE0Y2RkODkyZmUz OGNjNDNiMWZkOTNjNDYxOWJiNzYxZTViMC4uNzM2YTBiNDlhYzBlY2MzYTgzMWQ4ZWNmMTkwMjNj MmQyODI3MTkzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTE4ICBBZGl0 eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBVcGRhdGUg c3RyaW5ncyBhbmQgaWNvbnMgaW4gdGhlIGZpbGUgdXBsb2FkIHBhbmVsCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM0NjMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzc0OTk5NDU5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5nczoKKworICAgICAgICBS ZW1vdmVkIHVudXNlZCBzdHJpbmcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJp bmdzLmg6CisKKyAgICAgICAgV0VCQ09SRV9FWFBPUlQgdGhlICJDaG9vc2UgRmlsZSIgYW5kICJD aG9vc2UgRmlsZXMiIHN0cmluZ3Mgc28gdGhhdAorICAgICAgICB0aGV5IGNhbiBiZSB1c2VkIGlu IHRoZSBXZWJLaXQgbGF5ZXIuCisKIDIwMjEtMDMtMTcgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtp QGFwcGxlLmNvbT4KIAogICAgICAgICBtb2Rlcm4tbWVkaWEtY29udHJvbHMgc2NyaXB0IHNob3Vs ZCBub3QgYmUgYWxsb2NhdGVkIGluIGhlYXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZWE2YmQ0NDY4MjRkM2FlYjFi NmQ5YjVmMWU5NWRlMGJiYmRmYWQ1OS4uZWI1NGQ1ZGU2ZDM1YzUyOTU2MzQwZGU3OThkMGY3YWJi M2JiZjFiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMS0wMy0xOCAgQWRpdHlhIEtl ZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gVXBkYXRlIHN0cmlu Z3MgYW5kIGljb25zIGluIHRoZSBmaWxlIHVwbG9hZCBwYW5lbAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNDYzCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS83NDk5OTQ1OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW06CisgICAg ICAgICgtW1dLRmlsZVVwbG9hZFBhbmVsIGN1cnJlbnRBdmFpbGFibGVBY3Rpb25UaXRsZXNdKToK KworICAgICAgICBFeHBvc2UgdGhlIG5ldyBzdHJpbmcgZm9yIHRlc3RpbmcuCisKKyAgICAgICAg KC1bV0tGaWxlVXBsb2FkUGFuZWwgX2Nob29zZUZpbGVzQnV0dG9uTGFiZWxdKToKKyAgICAgICAg KC1bV0tGaWxlVXBsb2FkUGFuZWwgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25maWd1cmF0aW9u Rm9yTWVudUF0TG9jYXRpb246XSk6CisKKyAgICAgICAgVXNlIHRoZSAiZm9sZGVyIiBTRiBzeW1i b2wgYXMgdGhlIGljb24gZm9yIHRoZSAiQ2hvb3NlIEZpbGUiIGFjdGlvbi4KKwogMjAyMS0wMy0x NyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9T XSBSZWZhY3RvciBzb21lIGdlc3R1cmUgZGVmZXJyYWwgbG9naWMgdG8gYWNjb3VudCBmb3IgaW1h Z2UgZXh0cmFjdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxp emFibGUuc3RyaW5ncyBiL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmlu Z3MKaW5kZXggMTRjYmYzNjdhNjJhZTgzNzAzOTIwZDNlMjEwYTFhZGNlZTM5ODI1NS4uNjA0NTIw ZDI2MDVkNDcwYzZhNWNlNGExNDg1MzhkNmJiYzEyODc5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncworKysgYi9Tb3VyY2UvV2ViQ29yZS9l bi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCkBAIC0xOTAsOSArMTkwLDYgQEAKIC8qIExhYmVs IGZvciB0aGUgYm9vayB3aXRoIEFwcGxlIFBheSBidXR0b24uICovCiAiQm9vayB3aXRoIEFwcGxl IFBheSIgPSAiQm9vayB3aXRoIEFwcGxlIFBheSI7CiAKLS8qIEZpbGUgVXBsb2FkIGFsZXJ0IHNo ZWV0IGJ1dHRvbiBzdHJpbmcgZm9yIGNob29zaW5nIGFuIGV4aXN0aW5nIGZpbGUgZnJvbSB0aGUg ZmlsZSBicm93ZXIgKi8KLSJCcm93c2UgKGZpbGUgdXBsb2FkIGFjdGlvbiBzaGVldCkiID0gIkJy b3dzZSI7Ci0KIC8qIE9wdGlvbiBpbiBzZWdtZW50ZWQgY29udHJvbCBmb3IgaW5zZXJ0aW5nIGEg YnVsbGV0ZWQgbGlzdCBpbiB0ZXh0IGVkaXRpbmcgKi8KICJCdWxsZXRlZCBsaXN0IiA9ICJCdWxs ZXRlZCBsaXN0IjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxp emVkU3RyaW5ncy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5o CmluZGV4IDhmYjUxYTg5ZWQ0MmNjMTUzNjg3MDJlMjAzZWEwZTc0ODE3YWFhNzYuLjRhMjI0NWZl MTgxNmU1NGQ4YWMwZjNmMGI5ZDQzYWU3YzQ1NWQ4NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmgKQEAgLTQxLDggKzQxLDggQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgIFN0cmluZyByZXNldEJ1dHRvbkRlZmF1bHRMYWJlbCgpOwogICAgIFN0cmluZyBz ZWFyY2hhYmxlSW5kZXhJbnRyb2R1Y3Rpb24oKTsKICAgICBTdHJpbmcgc3VibWl0QnV0dG9uRGVm YXVsdExhYmVsKCk7Ci0gICAgU3RyaW5nIGZpbGVCdXR0b25DaG9vc2VGaWxlTGFiZWwoKTsKLSAg ICBTdHJpbmcgZmlsZUJ1dHRvbkNob29zZU11bHRpcGxlRmlsZXNMYWJlbCgpOworICAgIFdFQkNP UkVfRVhQT1JUIFN0cmluZyBmaWxlQnV0dG9uQ2hvb3NlRmlsZUxhYmVsKCk7CisgICAgV0VCQ09S RV9FWFBPUlQgU3RyaW5nIGZpbGVCdXR0b25DaG9vc2VNdWx0aXBsZUZpbGVzTGFiZWwoKTsKICAg ICBTdHJpbmcgZmlsZUJ1dHRvbk5vRmlsZVNlbGVjdGVkTGFiZWwoKTsKICAgICBTdHJpbmcgZmls ZUJ1dHRvbk5vRmlsZXNTZWxlY3RlZExhYmVsKCk7CiAgICAgU3RyaW5nIGRlZmF1bHREZXRhaWxz U3VtbWFyeVRleHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbQppbmRleCBkNDYwMWFjOTcxZTUzYzI1ZGQ4NWRlZTM4 YjY1NmQyOGU3YmNiODk2Li4xMTY2OTczZTVmZTdlNDI0Y2ZlNGVlYjc1Zjg0YjkxNjRlNTg4MTAx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBs b2FkUGFuZWwubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmls ZVVwbG9hZFBhbmVsLm1tCkBAIC0zNDAsNyArMzQwLDcgQEAgc3RhdGljIGJvb2wgc2V0Q29udGFp bnNVVElUaGF0Q29uZm9ybXNUbyhOU1NldDxOU1N0cmluZyAqPiAqdHlwZUlkZW50aWZpZXJzLCBV VFQKICAgICAgICAgZWxzZQogICAgICAgICAgICAgW2FjdGlvblRpdGxlcyBhZGRPYmplY3Q6QCJU YWtlIFBob3RvIl07CiAgICAgfQotICAgIFthY3Rpb25UaXRsZXMgYWRkT2JqZWN0OkAiQnJvd3Nl Il07CisgICAgW2FjdGlvblRpdGxlcyBhZGRPYmplY3Q6W3NlbGYgX2Nob29zZUZpbGVzQnV0dG9u TGFiZWxdXTsKICAgICByZXR1cm4gYWN0aW9uVGl0bGVzOwogfQogCkBAIC00MDUsOSArNDA1LDEy IEBAIHN0YXRpYyBOU1NldDxOU1N0cmluZyAqPiAqVVRJc0Zvck1JTUVUeXBlcyhOU0FycmF5ICpt aW1lVHlwZXMpCiAKICNwcmFnbWEgbWFyayAtIFNvdXJjZSBzZWxlY3Rpb24gbWVudQogCi0tIChO U1N0cmluZyAqKV9icm93c2VGaWxlc0J1dHRvbkxhYmVsCistIChOU1N0cmluZyAqKV9jaG9vc2VG aWxlc0J1dHRvbkxhYmVsCiB7Ci0gICAgcmV0dXJuIFdFQl9VSV9TVFJJTkdfS0VZKCJCcm93c2Ui LCAiQnJvd3NlIChmaWxlIHVwbG9hZCBhY3Rpb24gc2hlZXQpIiwgIkZpbGUgVXBsb2FkIGFsZXJ0 IHNoZWV0IGJ1dHRvbiBzdHJpbmcgZm9yIGNob29zaW5nIGFuIGV4aXN0aW5nIGZpbGUgZnJvbSB0 aGUgZmlsZSBicm93ZXIiKTsKKyAgICBpZiAoX2FsbG93TXVsdGlwbGVGaWxlcykKKyAgICAgICAg cmV0dXJuIFdlYkNvcmU6OmZpbGVCdXR0b25DaG9vc2VNdWx0aXBsZUZpbGVzTGFiZWwoKTsKKwor ICAgIHJldHVybiBXZWJDb3JlOjpmaWxlQnV0dG9uQ2hvb3NlRmlsZUxhYmVsKCk7CiB9CiAKIC0g KE5TU3RyaW5nICopX3Bob3RvTGlicmFyeUJ1dHRvbkxhYmVsCkBAIC00NTIsNyArNDU1LDcgQEAg c3RhdGljIE5TU2V0PE5TU3RyaW5nICo+ICpVVElzRm9yTUlNRVR5cGVzKE5TQXJyYXkgKm1pbWVU eXBlcykKICAgICAgICAgICAgIHJldHVybiBuaWw7CiAKICAgICAgICAgc2VsZi0+X2lzUHJlc2Vu dGluZ1N1Yk1lbnUgPSBOTzsKLSAgICAgICAgVUlBY3Rpb24gKmJyb3dzZUFjdGlvbiA9IFtVSUFj dGlvbiBhY3Rpb25XaXRoVGl0bGU6W3N0cm9uZ1NlbGYgX2Jyb3dzZUZpbGVzQnV0dG9uTGFiZWxd IGltYWdlOltVSUltYWdlIHN5c3RlbUltYWdlTmFtZWQ6QCJlbGxpcHNpcyJdIGlkZW50aWZpZXI6 QCJicm93c2UiIGhhbmRsZXI6XihfX2tpbmRvZiBVSUFjdGlvbiAqYWN0aW9uKSB7CisgICAgICAg IFVJQWN0aW9uICpjaG9vc2VBY3Rpb24gPSBbVUlBY3Rpb24gYWN0aW9uV2l0aFRpdGxlOltzdHJv bmdTZWxmIF9jaG9vc2VGaWxlc0J1dHRvbkxhYmVsXSBpbWFnZTpbVUlJbWFnZSBzeXN0ZW1JbWFn ZU5hbWVkOkAiZm9sZGVyIl0gaWRlbnRpZmllcjpAImNob29zZSIgaGFuZGxlcjpeKF9fa2luZG9m IFVJQWN0aW9uICphY3Rpb24pIHsKICAgICAgICAgICAgIHNlbGYtPl9pc1ByZXNlbnRpbmdTdWJN ZW51ID0gWUVTOwogICAgICAgICAgICAgW3NlbGYgc2hvd0ZpbGVQaWNrZXJNZW51XTsKICAgICAg ICAgfV07CkBAIC00NjksOSArNDcyLDkgQEAgc3RhdGljIE5TU2V0PE5TU3RyaW5nICo+ICpVVElz Rm9yTUlNRVR5cGVzKE5TQXJyYXkgKm1pbWVUeXBlcykKICAgICAgICAgICAgICAgICBzZWxmLT5f aXNQcmVzZW50aW5nU3ViTWVudSA9IFlFUzsKICAgICAgICAgICAgICAgICBbc2VsZiBfc2hvd1Bo b3RvUGlja2VyV2l0aFNvdXJjZVR5cGU6VUlJbWFnZVBpY2tlckNvbnRyb2xsZXJTb3VyY2VUeXBl Q2FtZXJhXTsKICAgICAgICAgICAgIH1dOwotICAgICAgICAgICAgYWN0aW9ucyA9IEBbcGhvdG9B Y3Rpb24sIGNhbWVyYUFjdGlvbiwgYnJvd3NlQWN0aW9uXTsKKyAgICAgICAgICAgIGFjdGlvbnMg PSBAW3Bob3RvQWN0aW9uLCBjYW1lcmFBY3Rpb24sIGNob29zZUFjdGlvbl07CiAgICAgICAgIH0g ZWxzZQotICAgICAgICAgICAgYWN0aW9ucyA9IEBbcGhvdG9BY3Rpb24sIGJyb3dzZUFjdGlvbl07 CisgICAgICAgICAgICBhY3Rpb25zID0gQFtwaG90b0FjdGlvbiwgY2hvb3NlQWN0aW9uXTsKIAog ICAgICAgICByZXR1cm4gW1VJTWVudSBtZW51V2l0aFRpdGxlOkAiIiBjaGlsZHJlbjphY3Rpb25z XTsKICAgICB9OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IDkxOTMxMmRjYTI4YTEwODk5NGI3OThhNGI1MzcwZTc3OWQ3YTQ1 YTUuLjZjOWMzNDc3OTkzYjI5M2IzOTU4OTlhYmQ2Y2I0YzkwNGNhYWFiYzEgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAyMS0wMy0xOCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5j b20+CisKKyAgICAgICAgW2lPU10gVXBkYXRlIHN0cmluZ3MgYW5kIGljb25zIGluIHRoZSBmaWxl IHVwbG9hZCBwYW5lbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIzNDYzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDk5OTQ1OT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGVkIGV4aXN0aW5n IHRlc3RzIHRvIHVzZSBhc3luYy9hd2FpdCByYXRoZXIgdGhhbiBwcm9taXNlIGNoYWluaW5nLAor ICAgICAgICBhbmQgYWRkZWQgbmV3IHRlc3RzIHRoYXQgZXhlcmNpc2UgdGhlICJtdWx0aXBsZSIg YXR0cmlidXRlIG9uIGZpbGUKKyAgICAgICAgaW5wdXRzLgorCisgICAgICAgICogZmFzdC9mb3Jt cy9pb3MvZmlsZS11cGxvYWQtcGFuZWwtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvZm9y bXMvaW9zL2ZpbGUtdXBsb2FkLXBhbmVsLmh0bWw6CisKIDIwMjEtMDMtMTcgIFJvYmVydCBKZW5u ZXIgIDxqZW5uZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNzQyNjQpOiBb IG1hY09TIHdrMiBdIGNvbXBvc2l0aW5nL3ZpZGVvL3ZpZGVvLWJvcmRlci1yYWRpdXMuaHRtbCBp cyBhIGZsYWtleSBpbWFnZSBmYWlsdXJlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL2lvcy9maWxlLXVwbG9hZC1wYW5lbC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0 L2Zvcm1zL2lvcy9maWxlLXVwbG9hZC1wYW5lbC1leHBlY3RlZC50eHQKaW5kZXggM2FmODQ5ZWFm ODdjMjBiZjIwZTc1MDFhMjJjMjY4NWY2ZDIxOTU1MC4uMmQwM2QxMjAwNzBiMGJhOTkyM2ZkZDA2 MTFiNjczNjg3NWM1NTYxZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pb3Mv ZmlsZS11cGxvYWQtcGFuZWwtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZm9y bXMvaW9zL2ZpbGUtdXBsb2FkLXBhbmVsLWV4cGVjdGVkLnR4dApAQCAtNCwzNCArNCw0MCBAQCBP biBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xs b3dlZCBieSAiVEVTVCBDT01QTEVURQogCiAKICogYWNjZXB0ID0KLVBBU1MgYXJlQXJyYXlzRXF1 YWwoaXRlbXMsIFsiUGhvdG8gTGlicmFyeSIsICJUYWtlIFBob3RvIG9yIFZpZGVvIiwgIkJyb3dz ZSJdKSBpcyB0cnVlCitQQVNTIGFyZUFycmF5c0VxdWFsKGl0ZW1zLCBbIlBob3RvIExpYnJhcnki LCAiVGFrZSBQaG90byBvciBWaWRlbyIsICJDaG9vc2UgRmlsZSJdKSBpcyB0cnVlCiAKICogYWNj ZXB0ID0gaW1hZ2UvKgotUEFTUyBhcmVBcnJheXNFcXVhbChpdGVtcywgWyJQaG90byBMaWJyYXJ5 IiwgIlRha2UgUGhvdG8iLCAiQnJvd3NlIl0pIGlzIHRydWUKK1BBU1MgYXJlQXJyYXlzRXF1YWwo aXRlbXMsIFsiUGhvdG8gTGlicmFyeSIsICJUYWtlIFBob3RvIiwgIkNob29zZSBGaWxlIl0pIGlz IHRydWUKIAogKiBhY2NlcHQgPSB2aWRlby8qCi1QQVNTIGFyZUFycmF5c0VxdWFsKGl0ZW1zLCBb IlBob3RvIExpYnJhcnkiLCAiVGFrZSBWaWRlbyIsICJCcm93c2UiXSkgaXMgdHJ1ZQorUEFTUyBh cmVBcnJheXNFcXVhbChpdGVtcywgWyJQaG90byBMaWJyYXJ5IiwgIlRha2UgVmlkZW8iLCAiQ2hv b3NlIEZpbGUiXSkgaXMgdHJ1ZQogCiAqIGFjY2VwdCA9IGltYWdlLyosIHZpZGVvLyoKLVBBU1Mg YXJlQXJyYXlzRXF1YWwoaXRlbXMsIFsiUGhvdG8gTGlicmFyeSIsICJUYWtlIFBob3RvIG9yIFZp ZGVvIiwgIkJyb3dzZSJdKSBpcyB0cnVlCitQQVNTIGFyZUFycmF5c0VxdWFsKGl0ZW1zLCBbIlBo b3RvIExpYnJhcnkiLCAiVGFrZSBQaG90byBvciBWaWRlbyIsICJDaG9vc2UgRmlsZSJdKSBpcyB0 cnVlCiAKICogYWNjZXB0ID0gLlBORywgLkdJRgotUEFTUyBhcmVBcnJheXNFcXVhbChpdGVtcywg WyJQaG90byBMaWJyYXJ5IiwgIlRha2UgUGhvdG8iLCAiQnJvd3NlIl0pIGlzIHRydWUKK1BBU1Mg YXJlQXJyYXlzRXF1YWwoaXRlbXMsIFsiUGhvdG8gTGlicmFyeSIsICJUYWtlIFBob3RvIiwgIkNo b29zZSBGaWxlIl0pIGlzIHRydWUKIAogKiBhY2NlcHQgPSAuUE5HLCAuR0lGLCAuTU9WCi1QQVNT IGFyZUFycmF5c0VxdWFsKGl0ZW1zLCBbIlBob3RvIExpYnJhcnkiLCAiVGFrZSBQaG90byBvciBW aWRlbyIsICJCcm93c2UiXSkgaXMgdHJ1ZQorUEFTUyBhcmVBcnJheXNFcXVhbChpdGVtcywgWyJQ aG90byBMaWJyYXJ5IiwgIlRha2UgUGhvdG8gb3IgVmlkZW8iLCAiQ2hvb3NlIEZpbGUiXSkgaXMg dHJ1ZQogCiAqIGFjY2VwdCA9IGF1ZGlvLyoKLVBBU1MgYXJlQXJyYXlzRXF1YWwoaXRlbXMsIFsi UGhvdG8gTGlicmFyeSIsICJUYWtlIFZpZGVvIiwgIkJyb3dzZSJdKSBpcyB0cnVlCitQQVNTIGFy ZUFycmF5c0VxdWFsKGl0ZW1zLCBbIlBob3RvIExpYnJhcnkiLCAiVGFrZSBWaWRlbyIsICJDaG9v c2UgRmlsZSJdKSBpcyB0cnVlCiAKICogYWNjZXB0ID0gLlRYVAotUEFTUyBhcmVBcnJheXNFcXVh bChpdGVtcywgWyJCcm93c2UiXSkgaXMgdHJ1ZQorUEFTUyBhcmVBcnJheXNFcXVhbChpdGVtcywg WyJDaG9vc2UgRmlsZSJdKSBpcyB0cnVlCiAKICogYWNjZXB0ID0gLlBERgotUEFTUyBhcmVBcnJh eXNFcXVhbChpdGVtcywgWyJCcm93c2UiXSkgaXMgdHJ1ZQorUEFTUyBhcmVBcnJheXNFcXVhbChp dGVtcywgWyJDaG9vc2UgRmlsZSJdKSBpcyB0cnVlCiAKICogYWNjZXB0ID0gLlBERiwgLlRYVAot UEFTUyBhcmVBcnJheXNFcXVhbChpdGVtcywgWyJCcm93c2UiXSkgaXMgdHJ1ZQorUEFTUyBhcmVB cnJheXNFcXVhbChpdGVtcywgWyJDaG9vc2UgRmlsZSJdKSBpcyB0cnVlCisKKyogbXVsdGlwbGUg PSBmYWxzZQorUEFTUyBhcmVBcnJheXNFcXVhbChpdGVtcywgWyJQaG90byBMaWJyYXJ5IiwgIlRh a2UgUGhvdG8gb3IgVmlkZW8iLCAiQ2hvb3NlIEZpbGUiXSkgaXMgdHJ1ZQorCisqIG11bHRpcGxl ID0gdHJ1ZQorUEFTUyBhcmVBcnJheXNFcXVhbChpdGVtcywgWyJQaG90byBMaWJyYXJ5IiwgIlRh a2UgUGhvdG8gb3IgVmlkZW8iLCAiQ2hvb3NlIEZpbGVzIl0pIGlzIHRydWUKIAogUEFTUyBzdWNj ZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL2lvcy9maWxlLXVwbG9hZC1wYW5lbC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9p b3MvZmlsZS11cGxvYWQtcGFuZWwuaHRtbAppbmRleCAwNmVhMzljYjAzNzM5NmIxYWFkZWM4Zjgx NzQ0NTdhYTkxNzBiZWQ4Li5mMzg0ZTZkODU5NDkyZWQwNDk5ZmIyNmMwN2VhMjUyODcwNWU5ZjFj IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2lvcy9maWxlLXVwbG9hZC1wYW5l bC5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW9zL2ZpbGUtdXBsb2FkLXBhbmVs Lmh0bWwKQEAgLTIxLDE2ICsyMSw2IEBAIGZ1bmN0aW9uIGdldEZpbGVVcGxvYWRQaWNrZXJNZW51 SXRlbXNTY3JpcHQoKQogICAgIH0pKCk7YAogfQogCi1mdW5jdGlvbiBkaXNtaXNzRmlsZVBpY2tl clNjcmlwdCgpCi17Ci0gICAgcmV0dXJuIGAKLSAgICAoZnVuY3Rpb24oKSB7Ci0gICAgICAgIHVp Q29udHJvbGxlci5kaXNtaXNzRmlsZVBpY2tlcihmdW5jdGlvbigpIHsKLSAgICAgICAgICAgIHVp Q29udHJvbGxlci51aVNjcmlwdENvbXBsZXRlKCk7Ci0gICAgICAgIH0pOwotICAgIH0pKCk7YAot fQotCiBmdW5jdGlvbiBnZXRGaWxlVXBsb2FkUGlja2VyTWVudUl0ZW1zKCkKIHsKICAgICByZXR1 cm4gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IHsKQEAgLTQwLDQ0ICszMCw1MCBAQCBmdW5jdGlv biBnZXRGaWxlVXBsb2FkUGlja2VyTWVudUl0ZW1zKCkKICAgICB9KTsKIH0KIAotZnVuY3Rpb24g ZGlzbWlzc0ZpbGVQaWNrZXIoKQotewotICAgIGNvbnN0IHVpU2NyaXB0ID0gYHVpQ29udHJvbGxl ci5kaXNtaXNzRmlsZVBpY2tlcigoKSA9PiB1aUNvbnRyb2xsZXIudWlTY3JpcHRDb21wbGV0ZSgp KWA7Ci0gICAgcmV0dXJuIG5ldyBQcm9taXNlKHJlc29sdmUgPT4gdGVzdFJ1bm5lci5ydW5VSVNj cmlwdCh1aVNjcmlwdCwgcmVzb2x2ZSkpOworYXN5bmMgZnVuY3Rpb24gdmVyaWZ5TWVudUl0ZW1z KGV4cGVjdGVkTWVudUl0ZW1zKSB7CisgICAgYXdhaXQgVUlIZWxwZXIuYWN0aXZhdGVFbGVtZW50 KHRlc3RJbnB1dCk7CisgICAgaXRlbXMgPSBhd2FpdCBnZXRGaWxlVXBsb2FkUGlja2VyTWVudUl0 ZW1zKCk7CisgICAgc2hvdWxkQmVUcnVlKCJhcmVBcnJheXNFcXVhbChpdGVtcywgIiArIGV4cGVj dGVkTWVudUl0ZW1zICsgIikiKTsKKworICAgIGRlYnVnKCIiKTsKKyAgICBhd2FpdCBVSUhlbHBl ci5kaXNtaXNzRmlsZVBpY2tlcigpOwogfQogCi1mdW5jdGlvbiBydW5BY2NlcHRUZXN0KGFjY2Vw dCwgZXhwZWN0ZWRNZW51SXRlbXMpCithc3luYyBmdW5jdGlvbiBydW5BY2NlcHRUZXN0KGFjY2Vw dCwgZXhwZWN0ZWRNZW51SXRlbXMpCiB7Ci0gICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZl KSA9PiB7Ci0gICAgICAgIGRlYnVnKCIqIGFjY2VwdCA9ICIgKyBhY2NlcHQpOwotICAgICAgICB0 ZXN0SW5wdXQuYWNjZXB0ID0gYWNjZXB0OworICAgIGRlYnVnKCIqIGFjY2VwdCA9ICIgKyBhY2Nl cHQpOworICAgIHRlc3RJbnB1dC5hY2NlcHQgPSBhY2NlcHQ7CisgICAgdGVzdElucHV0Lm11bHRp cGxlID0gZmFsc2U7CiAKLSAgICAgICAgVUlIZWxwZXIuYWN0aXZhdGVFbGVtZW50KHRlc3RJbnB1 dCkudGhlbigoKSA9PiB7Ci0gICAgICAgICAgICBnZXRGaWxlVXBsb2FkUGlja2VyTWVudUl0ZW1z KCkudGhlbigoX2l0ZW1zKSA9PiB7Ci0gICAgICAgICAgICAgICAgaXRlbXMgPSBfaXRlbXM7Ci0g ICAgICAgICAgICAgICAgc2hvdWxkQmVUcnVlKCJhcmVBcnJheXNFcXVhbChpdGVtcywgIiArIGV4 cGVjdGVkTWVudUl0ZW1zICsgIikiKTsKKyAgICBhd2FpdCB2ZXJpZnlNZW51SXRlbXMoZXhwZWN0 ZWRNZW51SXRlbXMpOworfQogCi0gICAgICAgICAgICAgICAgZGVidWcoIiIpOwotICAgICAgICAg ICAgICAgIGRpc21pc3NGaWxlUGlja2VyKCkudGhlbigoKSA9PiB7IHJlc29sdmUoKTsgfSk7Ci0g ICAgICAgICAgICB9KTsKLSAgICAgICAgfSk7Ci0gICAgfSk7Cithc3luYyBmdW5jdGlvbiBydW5N dWx0aXBsZVRlc3QobXVsdGlwbGUsIGV4cGVjdGVkTWVudUl0ZW1zKQoreworICAgIGRlYnVnKCIq IG11bHRpcGxlID0gIiArIG11bHRpcGxlKQorICAgIHRlc3RJbnB1dC5hY2NlcHQgPSAiIjsKKyAg ICB0ZXN0SW5wdXQubXVsdGlwbGUgPSBtdWx0aXBsZTsKKworICAgIGF3YWl0IHZlcmlmeU1lbnVJ dGVtcyhleHBlY3RlZE1lbnVJdGVtcyk7CiB9CiAKIGFzeW5jIGZ1bmN0aW9uIHJ1blRlc3RzKCkK IHsKICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZSIpLnN0eWxlID0gImRpc3Bs YXk6IG5vbmUiOwogCi0gICAgYXdhaXQgcnVuQWNjZXB0VGVzdCgiIiwgJ1siUGhvdG8gTGlicmFy eSIsICJUYWtlIFBob3RvIG9yIFZpZGVvIiwgIkJyb3dzZSJdJyk7Ci0gICAgYXdhaXQgcnVuQWNj ZXB0VGVzdCgiaW1hZ2UvKiIsICdbIlBob3RvIExpYnJhcnkiLCAiVGFrZSBQaG90byIsICJCcm93 c2UiXScpOwotICAgIGF3YWl0IHJ1bkFjY2VwdFRlc3QoInZpZGVvLyoiLCAnWyJQaG90byBMaWJy YXJ5IiwgIlRha2UgVmlkZW8iLCAiQnJvd3NlIl0nKTsKLSAgICBhd2FpdCBydW5BY2NlcHRUZXN0 KCJpbWFnZS8qLCB2aWRlby8qIiwgJ1siUGhvdG8gTGlicmFyeSIsICJUYWtlIFBob3RvIG9yIFZp ZGVvIiwgIkJyb3dzZSJdJyk7Ci0gICAgYXdhaXQgcnVuQWNjZXB0VGVzdCgiLlBORywgLkdJRiIs ICdbIlBob3RvIExpYnJhcnkiLCAiVGFrZSBQaG90byIsICJCcm93c2UiXScpOwotICAgIGF3YWl0 IHJ1bkFjY2VwdFRlc3QoIi5QTkcsIC5HSUYsIC5NT1YiLCAnWyJQaG90byBMaWJyYXJ5IiwgIlRh a2UgUGhvdG8gb3IgVmlkZW8iLCAiQnJvd3NlIl0nKTsKLSAgICBhd2FpdCBydW5BY2NlcHRUZXN0 KCJhdWRpby8qIiwgJ1siUGhvdG8gTGlicmFyeSIsICJUYWtlIFZpZGVvIiwgIkJyb3dzZSJdJyk7 Ci0gICAgYXdhaXQgcnVuQWNjZXB0VGVzdCgiLlRYVCIsICdbIkJyb3dzZSJdJyk7Ci0gICAgYXdh aXQgcnVuQWNjZXB0VGVzdCgiLlBERiIsICdbIkJyb3dzZSJdJyk7Ci0gICAgYXdhaXQgcnVuQWNj ZXB0VGVzdCgiLlBERiwgLlRYVCIsICdbIkJyb3dzZSJdJyk7CisgICAgYXdhaXQgcnVuQWNjZXB0 VGVzdCgiIiwgJ1siUGhvdG8gTGlicmFyeSIsICJUYWtlIFBob3RvIG9yIFZpZGVvIiwgIkNob29z ZSBGaWxlIl0nKTsKKyAgICBhd2FpdCBydW5BY2NlcHRUZXN0KCJpbWFnZS8qIiwgJ1siUGhvdG8g TGlicmFyeSIsICJUYWtlIFBob3RvIiwgIkNob29zZSBGaWxlIl0nKTsKKyAgICBhd2FpdCBydW5B Y2NlcHRUZXN0KCJ2aWRlby8qIiwgJ1siUGhvdG8gTGlicmFyeSIsICJUYWtlIFZpZGVvIiwgIkNo b29zZSBGaWxlIl0nKTsKKyAgICBhd2FpdCBydW5BY2NlcHRUZXN0KCJpbWFnZS8qLCB2aWRlby8q IiwgJ1siUGhvdG8gTGlicmFyeSIsICJUYWtlIFBob3RvIG9yIFZpZGVvIiwgIkNob29zZSBGaWxl Il0nKTsKKyAgICBhd2FpdCBydW5BY2NlcHRUZXN0KCIuUE5HLCAuR0lGIiwgJ1siUGhvdG8gTGli cmFyeSIsICJUYWtlIFBob3RvIiwgIkNob29zZSBGaWxlIl0nKTsKKyAgICBhd2FpdCBydW5BY2Nl cHRUZXN0KCIuUE5HLCAuR0lGLCAuTU9WIiwgJ1siUGhvdG8gTGlicmFyeSIsICJUYWtlIFBob3Rv IG9yIFZpZGVvIiwgIkNob29zZSBGaWxlIl0nKTsKKyAgICBhd2FpdCBydW5BY2NlcHRUZXN0KCJh dWRpby8qIiwgJ1siUGhvdG8gTGlicmFyeSIsICJUYWtlIFZpZGVvIiwgIkNob29zZSBGaWxlIl0n KTsKKyAgICBhd2FpdCBydW5BY2NlcHRUZXN0KCIuVFhUIiwgJ1siQ2hvb3NlIEZpbGUiXScpOwor ICAgIGF3YWl0IHJ1bkFjY2VwdFRlc3QoIi5QREYiLCAnWyJDaG9vc2UgRmlsZSJdJyk7CisgICAg YXdhaXQgcnVuQWNjZXB0VGVzdCgiLlBERiwgLlRYVCIsICdbIkNob29zZSBGaWxlIl0nKTsKKwor ICAgIGF3YWl0IHJ1bk11bHRpcGxlVGVzdChmYWxzZSwgJ1siUGhvdG8gTGlicmFyeSIsICJUYWtl IFBob3RvIG9yIFZpZGVvIiwgIkNob29zZSBGaWxlIl0nKTsKKyAgICBhd2FpdCBydW5NdWx0aXBs ZVRlc3QodHJ1ZSwgJ1siUGhvdG8gTGlicmFyeSIsICJUYWtlIFBob3RvIG9yIFZpZGVvIiwgIkNo b29zZSBGaWxlcyJdJyk7CiAKICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZSIp LnN0eWxlID0gIiI7CiAgICAgZmluaXNoSlNUZXN0KCk7Cg==