539299 unknown 2010-01-12 12:34:55 -0800 Build an experimental add-on to author emails with a third-party web composition toolkit editor 2022-10-10 15:48:06 -0700 1 1 2 Client Software Thunderbird Message Compose Window Trunk All All enhancement ASSIGNED [patchlove] -- S3 --- 361619 1 davida jonathan.protzenko alex amla70 andreamonni arivald bugzilla chris clokep ehsan.akhgari fabien fredck jeff joachim.herb jonathan.protzenko joyride-avid-sworn jsabash laurent.bauvens malix0 mkmelin+mozilla mnyromyr nth10sd Peter rain rsx11m.pub rtanglao tps125 u331436 vseerror --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- 6 4484356 davida 2010-01-12 12:34:55 -0800 There are plenty of Javascript-implemented toolkits which have been authored for blog and wiki editing, some of which could be used in an add-on to provide an alternative authoring tool compared to the built-in editor code. It'd be really interesting to have an add-on that: 1) used one of these editors (CKeditor, or other -- license issues TBD) 2) hooked into the appropriate bits of Thunderbird to be invoked by composition commands (new, reply, forward, etc.) and that various folks could give comments on. Maybe this doesn't belong in this component, but I'm not sure where else to track this. 4491094 amla70 2010-01-17 00:56:15 -0800 I integrated FCKeditor (the previous version of CKEditor) in an Add-on for Firefox: https://addons.mozilla.org/en-US/firefox/addon/6147 I planned to update the editor to the new version as soon as I have time and I can verify that there are no big issues with the new code, this might not be too helpful to integrate into Thunderbird, but this is a really interesting idea. 4903244 470719 jonathan.protzenko 2010-08-30 23:55:10 -0700 Created attachment 470719 WIP David, the situation is as follows: I'm using a CKEditor instance inside a tab, and the code from nsMsgSend.cpp needs to prepare the message properly before sending. This implies getting the list of DOM Nodes that are images/objects/whatever in the editor, and creating inline MIME attachments to send them alongside with the message. nsMsgSend relies on a nsIEditorMailSupport to pass it a list of image/object/whatever DOM Nodes from the compose window, so that it can get their contents, encode them as attachments, and replace the associated hrefs with src="cid:PART-ID" URLs. The regular code does this through nsMsgCompose.cpp. It is initialized with an associated compose window, and nsMsgCompose.cpp makes the assumption that that window is the "classic" compose window, gets the associated editor, runs whole sorts of dark voodoo on the editor regarding encodings and stuff, and finally, when the time has come to send the message, it passes the associated nsIEditor instance to nsMsgSend.cpp. The function that passes the control from nsMsgCompose.cpp over to nsMsgSend.cpp is CreateAndSendMessage. As you probably guessed already, I don't want/need to pass the nsIEditor to nsMsgCompose.cpp as I'm using a totally different editor. However, I do want nsMsgSend.cpp to query me so that I can pass it a list of DOM nodes that need processing. I figured out the simplest way to do that would be to patch somehow these two files to allow a "fake editor" to be passed to nsMsgSend.cpp, by adding an extra argument to CreateAndSendMessage (from nsMsgCompose.cpp). Any thoughts? 4903266 davida 2010-08-31 00:24:56 -0700 minor comment: you'd need to rev the ID of the interface you change. 4903667 arivald 2010-08-31 06:22:46 -0700 (In reply to comment #2) > > I figured out the simplest way to do that would be to patch somehow these two > files to allow a "fake editor" to be passed to nsMsgSend.cpp, by adding an > extra argument to CreateAndSendMessage (from nsMsgCompose.cpp). > I think any <editor> should supports nsIEditor (and all other interfaces like selection, etc), for compatibility. Otherwise many extensions will stop working. CKEditor may be used as implementation, but existing interfaces should be not changed. BTW, "Javascript-implemented" sounds a bit slow... I hope it will not hang application with larger documents. 4903979 470719 mozilla 2010-08-31 09:15:09 -0700 Comment on attachment 470719 WIP an other option would be to add the ability to set the editor directly in nsIMsgCompose.idl as an attribute. 4903991 jonathan.protzenko 2010-08-31 09:17:59 -0700 Even if I only change a readonly attribute to a readwrite one, I still need to renew the UUID of the interface, right? I had hoped I could do this without changing interfaces but it looks kinda hard right now. Your solution has the advantage of not breaking everyone who uses SendMsg, I'll try to use that instead. 4904239 gNeandr 2010-08-31 10:48:05 -0700 @comment #1 The mentioned XPI seems to be valid for FX/SM only. Any idea how to add it to Thunderbird? NB: This bug is for Product: Thunderbird / Version 3.1 If I didn't missed anything ... Günter 4907548 vseerror 2010-09-01 10:53:31 -0700 let's put this where more people care about compose 4912169 malix0 2010-09-02 22:15:42 -0700 Ehsan Akhgari is working on a fix to the editor. https://bugzilla.mozilla.org/show_bug.cgi?id=590640 May be this bug depends on that. 4913831 jonathan.protzenko 2010-09-03 13:54:54 -0700 This bug seems to have gotten a lot of attention, probably due to Timo Pietilä's post on m.d.a.t. First of all, thanks for your interest, I'm glad so many of you care about this feature! I've blogged about this http://mozillalabs.com/messaging/2010/09/03/2756-bugs-found/ so for all of you who are interested in discussing this feature, I suggest we all chat about it over at Mozilla Labs' blog. This will allow us to keep this bug focused on the technical discussion about the patches I'm working on. Thanks! 5118959 malix0 2010-12-02 19:45:54 -0800 I think that this bug will never get solved. After getting some attention back in august and september, now everything is again sleeping. Work Jonathan Protzenko is at a standstill since September 10 https://github.com/protz/Compose -- https://bugzilla.mozilla.org/show_bug.cgi?id=539299 And the same happen to Ehsan Akhgari https://bugzilla.mozilla.org/show_bug.cgi?id=590640 5120322 dmosedale 2010-12-03 11:05:22 -0800 Malix: I understand that you're frustrated that some bugs aren't fixed as quickly as you might hope. That's entirely valid, and I suspect that frustration is shared by others as well. That said, both Protz and Ehsan are doing (and have done) a lot of great work for Thunderbird. Personally singling them out to vent your frustration is inappropriate, and is certain to make them less inspired to volunteer their own time to fix Thunderbird bugs (neither of them are being paid for the help they're so kindly extending). I believe you owe them both an apology. Please review <https://bugzilla.mozilla.org/page.cgi?id=etiquette.html> before commenting further in Bugzilla bugs. 5303576 malix0 2011-02-24 22:46:06 -0800 When next version of this plug-in is planned? I'm waiting for ending my test with Ehsan Akhgari patch https://bugzilla.mozilla.org/show_bug.cgi?id=590640#c19 Thanks Massimo 5303677 jonathan.protzenko 2011-02-25 00:55:38 -0800 Sometime in the upcoming week. I've been busy with other extensions and different areas of Thunderbird, but I'm about to release a better version of the addon, that's compatible with the upcoming 3.3a3, and possibly better. I insist that this is an experiment, so this is not bound to replace the editor anytime soon. So this experiment is not related to the fix in bug 590640. Ehsan is probably busy fixing Firefox 4 blockers, but we might see some action on bug 590640 after Firefox 4 is release, I guess. 5303704 malix0 2011-02-25 01:31:55 -0800 (In reply to comment #14) > Sometime in the upcoming week. I've been busy with other extensions and > different areas of Thunderbird, but I'm about to release a better version of > the addon, that's compatible with the upcoming 3.3a3, and possibly better. > > I insist that this is an experiment, so this is not bound to replace the editor > anytime soon. So this experiment is not related to the fix in bug 590640. Ehsan > is probably busy fixing Firefox 4 blockers, but we might see some action on bug > 590640 after Firefox 4 is release, I guess. Hi Jonathan, thanks for your timely and accurate response. I hope that we can get a quick solution to this bug. Although by the time I temporarily fix the problem using the QuoteAndComposeManager. extension Kind regards Massimo 5305352 ehsan.akhgari 2011-02-25 15:42:55 -0800 (In reply to comment #14) > I insist that this is an experiment, so this is not bound to replace the editor > anytime soon. So this experiment is not related to the fix in bug 590640. Ehsan > is probably busy fixing Firefox 4 blockers, but we might see some action on bug > 590640 after Firefox 4 is release, I guess. I've added bug 590640 to the to-do list I have for things after Firefox 4. 5391408 jonathan.protzenko 2011-04-05 11:48:19 -0700 For all of you following this topic, I've posted an update to https://groups.google.com/forum/#!topic/mozilla-labs/0MGAJQLtzKc/discussion 470719 2010-08-30 23:55:10 -0700 2010-08-31 09:15:09 -0700 WIP composehtml text/plain 5423 jonathan.protzenko IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBQYXJlbnQgYWQwODdiODBlMDMyZjZlYTU4NmYwYmM5MWFj NTM0MjcwMGNhZTIzNQoKZGlmZiAtLWdpdCBhL21haWwvY29tcG9uZW50cy9jb21wb3NlL2NvbnRl bnQvTXNnQ29tcG9zZUNvbW1hbmRzLmpzIGIvbWFpbC9jb21wb25lbnRzL2NvbXBvc2UvY29udGVu dC9Nc2dDb21wb3NlQ29tbWFuZHMuanMKLS0tIGEvbWFpbC9jb21wb25lbnRzL2NvbXBvc2UvY29u dGVudC9Nc2dDb21wb3NlQ29tbWFuZHMuanMKKysrIGIvbWFpbC9jb21wb25lbnRzL2NvbXBvc2Uv Y29udGVudC9Nc2dDb21wb3NlQ29tbWFuZHMuanMKQEAgLTIxMTEsNyArMjExMSw3IEBACiAgICAg ICAgIH0KICAgICAgICAgbXNnV2luZG93LmRvbVdpbmRvdyA9IHdpbmRvdzsKICAgICAgICAgbXNn V2luZG93LnJvb3REb2NTaGVsbC5hbGxvd0F1dGggPSB0cnVlOwotICAgICAgICBnTXNnQ29tcG9z ZS5TZW5kTXNnKG1zZ1R5cGUsIGdldEN1cnJlbnRJZGVudGl0eSgpLCBjdXJyZW50QWNjb3VudEtl eSwgbXNnV2luZG93LCBwcm9ncmVzcyk7CisgICAgICAgIGdNc2dDb21wb3NlLlNlbmRNc2cobXNn VHlwZSwgZ2V0Q3VycmVudElkZW50aXR5KCksIGN1cnJlbnRBY2NvdW50S2V5LCBtc2dXaW5kb3cs IHByb2dyZXNzLCBudWxsKTsKICAgICAgIH0KICAgICAgIGNhdGNoIChleCkgewogICAgICAgICBk dW1wKCJmYWlsZWQgdG8gU2VuZE1zZzogIiArIGV4ICsgIlxuIik7CmRpZmYgLS1naXQgYS9tYWls bmV3cy9jb21wb3NlL3B1YmxpYy9uc0lNc2dDb21wb3NlLmlkbCBiL21haWxuZXdzL2NvbXBvc2Uv cHVibGljL25zSU1zZ0NvbXBvc2UuaWRsCi0tLSBhL21haWxuZXdzL2NvbXBvc2UvcHVibGljL25z SU1zZ0NvbXBvc2UuaWRsCisrKyBiL21haWxuZXdzL2NvbXBvc2UvcHVibGljL25zSU1zZ0NvbXBv c2UuaWRsCkBAIC0xNDgsNyArMTQ4LDcgQEAKICAgdm9pZCBVbnJlZ2lzdGVyU3RhdGVMaXN0ZW5l cihpbiBuc0lNc2dDb21wb3NlU3RhdGVMaXN0ZW5lciBzdGF0ZUxpc3RlbmVyKTsKIAogICAvKiAu Li4gKi8KLSAgdm9pZCBTZW5kTXNnKGluIE1TR19EZWxpdmVyTW9kZSBkZWxpdmVyTW9kZSwgaW4g bnNJTXNnSWRlbnRpdHkgaWRlbnRpdHksIGluIHN0cmluZyBhY2NvdW50S2V5LCBpbiBuc0lNc2dX aW5kb3cgYU1zZ1dpbmRvdywgaW4gbnNJTXNnUHJvZ3Jlc3MgcHJvZ3Jlc3MpOworICB2b2lkIFNl bmRNc2coaW4gTVNHX0RlbGl2ZXJNb2RlIGRlbGl2ZXJNb2RlLCBpbiBuc0lNc2dJZGVudGl0eSBp ZGVudGl0eSwgaW4gc3RyaW5nIGFjY291bnRLZXksIGluIG5zSU1zZ1dpbmRvdyBhTXNnV2luZG93 LCBpbiBuc0lNc2dQcm9ncmVzcyBwcm9ncmVzcywgaW4gbnNJRWRpdG9yIGZha2VFZGl0b3IpOwog CiAgIC8qIC4uLiAqLwogICB2b2lkIENsb3NlV2luZG93KGluIGJvb2xlYW4gcmVjbHljbGVJdCk7 CkBAIC0yMTYsNyArMjE2LDcgQEAKICAgcmVhZG9ubHkgYXR0cmlidXRlIG5zSU1zZ0NvbXBGaWVs ZHMgY29tcEZpZWxkczsKICAgICAKIAkvKiAuLi4gKi8KLSAgcmVhZG9ubHkgYXR0cmlidXRlIGJv b2xlYW4gY29tcG9zZUhUTUw7CisgIGF0dHJpYnV0ZSBib29sZWFuIGNvbXBvc2VIVE1MOwogCiAJ LyogLi4uICovCiAgIGF0dHJpYnV0ZSBNU0dfQ29tcG9zZVR5cGUgdHlwZTsKZGlmZiAtLWdpdCBh L21haWxuZXdzL2NvbXBvc2Uvc3JjL25zTXNnQ29tcG9zZS5jcHAgYi9tYWlsbmV3cy9jb21wb3Nl L3NyYy9uc01zZ0NvbXBvc2UuY3BwCi0tLSBhL21haWxuZXdzL2NvbXBvc2Uvc3JjL25zTXNnQ29t cG9zZS5jcHAKKysrIGIvbWFpbG5ld3MvY29tcG9zZS9zcmMvbnNNc2dDb21wb3NlLmNwcApAQCAt MTA2OSwxMiArMTA2OSwxNyBAQAogICByZXR1cm4gcnY7CiB9CiAKLU5TX0lNRVRIT0RJTVAgbnNN c2dDb21wb3NlOjpTZW5kTXNnKE1TR19EZWxpdmVyTW9kZSBkZWxpdmVyTW9kZSwgbnNJTXNnSWRl bnRpdHkgKmlkZW50aXR5LCBjb25zdCBjaGFyICphY2NvdW50S2V5LCBuc0lNc2dXaW5kb3cgKmFN c2dXaW5kb3csIG5zSU1zZ1Byb2dyZXNzICpwcm9ncmVzcykKK05TX0lNRVRIT0RJTVAgbnNNc2dD b21wb3NlOjpTZW5kTXNnKE1TR19EZWxpdmVyTW9kZSBkZWxpdmVyTW9kZSwgbnNJTXNnSWRlbnRp dHkgKmlkZW50aXR5LCBjb25zdCBjaGFyICphY2NvdW50S2V5LCBuc0lNc2dXaW5kb3cgKmFNc2dX aW5kb3csIG5zSU1zZ1Byb2dyZXNzICpwcm9ncmVzcywgbnNJRWRpdG9yICpmYWtlRWRpdG9yKQog ewogICBuc3Jlc3VsdCBydiA9IE5TX09LOwogICBQUkJvb2wgZW50aXR5Q29udmVyc2lvbkRvbmUg PSBQUl9GQUxTRTsKICAgbnNDT01QdHI8bnNJUHJvbXB0PiBwcm9tcHQ7CiAKKyAgLy8gZm9yIHRo ZSBuZWVkcyBvZiBhbHRlcm5hdGl2ZSBjb21wb3NpdGlvbiB3aW5kb3dzLCBwb3RlbnRpYWxseSBy ZXBsYWNlIHRoZQorICAvLyBlZGl0b3Igd2l0aCBhIGZha2Ugb25lCisgIGlmIChmYWtlRWRpdG9y KQorICAgIG1fZWRpdG9yID0gZmFrZUVkaXRvcjsKKwogICAvLyBpJ20gYXNzdW1pbmcgdGhlIGNv bXBvc2Ugd2luZG93IGlzIHN0aWxsIHVwIGF0IHRoaXMgcG9pbnQuLi4KICAgaWYgKCFwcm9tcHQg JiYgbV93aW5kb3cpCiAgICAgIG1fd2luZG93LT5HZXRQcm9tcHRlcihnZXR0ZXJfQWRkUmVmcyhw cm9tcHQpKTsKQEAgLTE1NTMsNiArMTU1OCwxMiBAQAogICByZXR1cm4gTlNfT0s7CiB9CiAKK05T X0lNRVRIT0RJTVAgbnNNc2dDb21wb3NlOjpTZXRDb21wb3NlSFRNTChQUkJvb2wgYUNvbXBvc2VI VE1MKQoreworICBtX2NvbXBvc2VIVE1MID0gYUNvbXBvc2VIVE1MOworICByZXR1cm4gTlNfT0s7 Cit9CisKIE5TX0lNRVRIT0RJTVAgbnNNc2dDb21wb3NlOjpHZXRDb21wb3NlSFRNTChQUkJvb2wg KmFDb21wb3NlSFRNTCkKIHsKICAgKmFDb21wb3NlSFRNTCA9IG1fY29tcG9zZUhUTUw7CmRpZmYg LS1naXQgYS9tYWlsbmV3cy9jb21wb3NlL3NyYy9uc01zZ0NvbXBvc2VTZXJ2aWNlLmNwcCBiL21h aWxuZXdzL2NvbXBvc2Uvc3JjL25zTXNnQ29tcG9zZVNlcnZpY2UuY3BwCi0tLSBhL21haWxuZXdz L2NvbXBvc2Uvc3JjL25zTXNnQ29tcG9zZVNlcnZpY2UuY3BwCisrKyBiL21haWxuZXdzL2NvbXBv c2Uvc3JjL25zTXNnQ29tcG9zZVNlcnZpY2UuY3BwCkBAIC0xMDUyLDcgKzEwNTIsNyBAQAogCiAg IFJlbGVhc2UoKTsKIAotICByZXR1cm4gcE1zZ0NvbXBvc2UtPlNlbmRNc2cobnNJTXNnU2VuZDo6 bnNNc2dEZWxpdmVyTm93LCBpZGVudGl0eSwgbnNudWxsLCBuc251bGwsIG5zbnVsbCkgOworICBy ZXR1cm4gcE1zZ0NvbXBvc2UtPlNlbmRNc2cobnNJTXNnU2VuZDo6bnNNc2dEZWxpdmVyTm93LCBp ZGVudGl0eSwgbnNudWxsLCBuc251bGwsIG5zbnVsbCwgbnNudWxsKTsKIH0KIAogTlNfSU1FVEhP RElNUApAQCAtMTI5Nyw3ICsxMjk3LDcgQEAKICAgcnYgPSBwTXNnQ29tcG9zZS0+SW5pdGlhbGl6 ZShwYXJlbnRXaW5kb3csIHBNc2dDb21wb3NlUGFyYW1zKSA7CiAgIE5TX0VOU1VSRV9TVUNDRVNT KHJ2LHJ2KTsKIAotICBydiA9IHBNc2dDb21wb3NlLT5TZW5kTXNnKG5zSU1zZ1NlbmQ6Om5zTXNn RGVsaXZlck5vdywgaWRlbnRpdHksIG5zbnVsbCwgbnNudWxsLCBuc251bGwpOworICBydiA9IHBN c2dDb21wb3NlLT5TZW5kTXNnKG5zSU1zZ1NlbmQ6Om5zTXNnRGVsaXZlck5vdywgaWRlbnRpdHks IG5zbnVsbCwgbnNudWxsLCBuc251bGwsIG5zbnVsbCk7CiAgIE5TX0VOU1VSRV9TVUNDRVNTKHJ2 LCBydik7CiAKICAgLy8gbnNNc2dDb21wb3NlOjpQcm9jZXNzUmVwbHlGbGFncyB1c3VhbGx5IHRh a2VzIGNhcmUgb2YgbWFya2luZyBtZXNzYWdlcwpkaWZmIC0tZ2l0IGEvbWFpbG5ld3MvY29tcG9z ZS90ZXN0L3VuaXQvdGVzdF9hdHRhY2htZW50LmpzIGIvbWFpbG5ld3MvY29tcG9zZS90ZXN0L3Vu aXQvdGVzdF9hdHRhY2htZW50LmpzCi0tLSBhL21haWxuZXdzL2NvbXBvc2UvdGVzdC91bml0L3Rl c3RfYXR0YWNobWVudC5qcworKysgYi9tYWlsbmV3cy9jb21wb3NlL3Rlc3QvdW5pdC90ZXN0X2F0 dGFjaG1lbnQuanMKQEAgLTEzMCw3ICsxMzAsNyBAQAogICAgICAgICAgICAgICAgICAgIC5jcmVh dGVJbnN0YW5jZShDaS5uc0lNc2dQcm9ncmVzcyk7CiAgIHByb2dyZXNzLnJlZ2lzdGVyTGlzdGVu ZXIocHJvZ3Jlc3NMaXN0ZW5lcik7CiAgIG1zZ0NvbXBvc2UuU2VuZE1zZyhDaS5uc0lNc2dTZW5k Lm5zTXNnU2F2ZUFzRHJhZnQsIGlkZW50aXR5LCAiIiwgbnVsbCwKLSAgICAgICAgICAgICAgICAg ICAgIHByb2dyZXNzKTsKKyAgICAgICAgICAgICAgICAgICAgIHByb2dyZXNzLCBudWxsKTsKIH0K IAogZnVuY3Rpb24gY2hlY2tBdHRhY2htZW50KGV4cGVjdGVkQ0QsIGV4cGVjdGVkQ1QpIHsKZGlm ZiAtLWdpdCBhL21haWxuZXdzL21pbWUvc3JjL21pbWVkcmZ0LmNwcCBiL21haWxuZXdzL21pbWUv c3JjL21pbWVkcmZ0LmNwcAotLS0gYS9tYWlsbmV3cy9taW1lL3NyYy9taW1lZHJmdC5jcHAKKysr IGIvbWFpbG5ld3MvbWltZS9zcmMvbWltZWRyZnQuY3BwCkBAIC0zMDksNyArMzA5LDcgQEAKICAg cnYgPSBwTXNnQ29tcG9zZS0+SW5pdGlhbGl6ZShuc251bGwsIHBNc2dDb21wb3NlUGFyYW1zKSA7 CiAgIE5TX0VOU1VSRV9TVUNDRVNTKHJ2LHJ2KTsKIAotICByZXR1cm4gcE1zZ0NvbXBvc2UtPlNl bmRNc2cobnNJTXNnU2VuZDo6bnNNc2dEZWxpdmVyTm93LCBpZGVudGl0eSwgbnNudWxsLCBuc251 bGwsIG5zbnVsbCkgOworICByZXR1cm4gcE1zZ0NvbXBvc2UtPlNlbmRNc2cobnNJTXNnU2VuZDo6 bnNNc2dEZWxpdmVyTm93LCBpZGVudGl0eSwgbnNudWxsLCBuc251bGwsIG5zbnVsbCwgbnNudWxs KSA7CiB9CiAKIG5zcmVzdWx0CmRpZmYgLS1naXQgYS9zdWl0ZS9tYWlsbmV3cy9jb21wb3NlL01z Z0NvbXBvc2VDb21tYW5kcy5qcyBiL3N1aXRlL21haWxuZXdzL2NvbXBvc2UvTXNnQ29tcG9zZUNv bW1hbmRzLmpzCi0tLSBhL3N1aXRlL21haWxuZXdzL2NvbXBvc2UvTXNnQ29tcG9zZUNvbW1hbmRz LmpzCisrKyBiL3N1aXRlL21haWxuZXdzL2NvbXBvc2UvTXNnQ29tcG9zZUNvbW1hbmRzLmpzCkBA IC0xODcxLDcgKzE4NzEsNyBAQAogICAgICAgICB9CiAgICAgICAgIG1zZ1dpbmRvdy5kb21XaW5k b3cgPSB3aW5kb3c7CiAgICAgICAgIG1zZ1dpbmRvdy5yb290RG9jU2hlbGwuYWxsb3dBdXRoID0g dHJ1ZTsKLSAgICAgICAgZ01zZ0NvbXBvc2UuU2VuZE1zZyhtc2dUeXBlLCBnZXRDdXJyZW50SWRl bnRpdHkoKSwgY3VycmVudEFjY291bnRLZXksIG1zZ1dpbmRvdywgcHJvZ3Jlc3MpOworICAgICAg ICBnTXNnQ29tcG9zZS5TZW5kTXNnKG1zZ1R5cGUsIGdldEN1cnJlbnRJZGVudGl0eSgpLCBjdXJy ZW50QWNjb3VudEtleSwgbXNnV2luZG93LCBwcm9ncmVzcywgbnVsbCk7CiAgICAgICB9CiAgICAg ICBjYXRjaCAoZXgpIHsKICAgICAgICAgZHVtcCgiZmFpbGVkIHRvIFNlbmRNc2c6ICIgKyBleCAr ICJcbiIpOwo=