412750 2019-10-09 07:17:35 +0000 No xml export for reports 2024-10-22 17:50:40 +0000 1 1 2 Applications kmymoney exporter unspecified unspecified All RESOLVED FIXED NOR wishlist 5.2 488491 1 ralf.habacker kmymoney-devel https://invent.kde.org/office/kmymoney/-/commit/6db271cc70923a2ad40bd586ffa07e3891d5ef37 5.2 0 oldest_to_newest 1884442 0 ralf.habacker 2019-10-09 07:17:35 +0000 The kmymoney report engine allows the export of reports in csv and html format, what is currently missing is an export in XML format. STEPS TO REPRODUCE 1. start kmymoney 2. open a file 3. open a report 4. click on 'export' 5. Inspect the list of extensions OBSERVED RESULT There are entries for csv and html, but not xml. EXPECTED RESULT There should be an entry for xml too ADDITIONAL INFORMATION XML is used as an exchange format in many applications and supports more complex exports than csv allows. 1884448 1 123098 ralf.habacker 2019-10-09 08:33:50 +0000 Created attachment 123098 related patch based on 4.8 branch The appended patch implements this feature (based on 4.8 branch), but does not match implementation on 5.0/master branch 2368196 2 bug-janitor 2024-10-22 11:33:10 +0000 A possibly relevant merge request was started @ https://invent.kde.org/office/kmymoney/-/merge_requests/236 2368211 3 bug-janitor 2024-10-22 12:40:53 +0000 A possibly relevant merge request was started @ https://invent.kde.org/office/kmymoney/-/merge_requests/237 2368323 4 ralf.habacker 2024-10-22 17:50:40 +0000 Git commit 6db271cc70923a2ad40bd586ffa07e3891d5ef37 by Ralf Habacker. Committed on 22/10/2024 at 11:31. Pushed by habacker into branch 'master'. Add xml export to the report user interface FIXED-IN:5.2 M +1 -1 kmymoney/plugins/views/reports/kreportsview.cpp M +3 -1 kmymoney/plugins/views/reports/kreportsview_p.h https://invent.kde.org/office/kmymoney/-/commit/6db271cc70923a2ad40bd586ffa07e3891d5ef37 123098 2019-10-09 08:33:50 +0000 2019-10-09 08:33:50 +0000 related patch based on 4.8 branch 0004-Add-support-for-saving-reports-to-and-loading-from-x.patch text/plain 12884 ralf.habacker RnJvbSBiM2M5YTJhMTQ3OTg3OGU1YWQ3NzMyNTliZDA5Nzc0ZWEzZDFhNTUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWxmIEhhYmFja2VyIDxyYWxmLmhhYmFja2VyQGZyZWVuZXQu ZGU+CkRhdGU6IFR1ZSwgMjcgTm92IDIwMTggMDA6NDc6MDYgKzAxMDAKU3ViamVjdDogW1BBVENI IDA0LzEwXSBBZGQgc3VwcG9ydCBmb3Igc2F2aW5nIHJlcG9ydHMgdG8gYW5kIGxvYWRpbmcgZnJv bSB4bWwKIGZpbGVzCgpTYXZpbmcgaXMgY3VycmVudGx5IG9ubHkgaW1wbGVtZW50ZWQgZm9yIExp c3RUYWJsZS4KCkNDQlVHOjM5NTMyNwotLS0KIGtteW1vbmV5L3JlcG9ydHMvbGlzdHRhYmxlLmNw cCAgfCAxMzggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwoga215bW9u ZXkvcmVwb3J0cy9saXN0dGFibGUuaCAgICB8ICAgNCArKwoga215bW9uZXkvcmVwb3J0cy9waXZv dGdyaWQuY3BwICB8ICA1NSArKysrKysrKysrKysrKysrCiBrbXltb25leS9yZXBvcnRzL3Bpdm90 Z3JpZC5oICAgIHwgICA1ICsrCiBrbXltb25leS9yZXBvcnRzL3Bpdm90dGFibGUuY3BwIHwgIDI2 ICsrKysrKysrCiBrbXltb25leS9yZXBvcnRzL3Bpdm90dGFibGUuaCAgIHwgICA0ICsrCiBrbXlt b25leS9yZXBvcnRzL3JlcG9ydHRhYmxlLmggIHwgICA0ICsrCiBrbXltb25leS92aWV3cy9rcmVw b3J0c3ZpZXcuY3BwIHwgIDIxICsrKystLQogOCBmaWxlcyBjaGFuZ2VkLCAyNTMgaW5zZXJ0aW9u cygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9rbXltb25leS9yZXBvcnRzL2xpc3R0 YWJsZS5jcHAgYi9rbXltb25leS9yZXBvcnRzL2xpc3R0YWJsZS5jcHAKaW5kZXggOGNiYWVjNWI4 Li5lNzRmZGIyZTEgMTAwNjQ0Ci0tLSBhL2tteW1vbmV5L3JlcG9ydHMvbGlzdHRhYmxlLmNwcAor KysgYi9rbXltb25leS9yZXBvcnRzL2xpc3R0YWJsZS5jcHAKQEAgLTYzNSw2ICs2MzUsMTQ0IEBA IHZvaWQgTGlzdFRhYmxlOjpkdW1wKGNvbnN0IFFTdHJpbmcmIGZpbGUsIGNvbnN0IFFTdHJpbmcm IGNvbnRleHQpIGNvbnN0CiAgIGcuY2xvc2UoKTsKIH0KIAorYm9vbCBMaXN0VGFibGU6OnNhdmVU b1htbChjb25zdCBRU3RyaW5nICZmaWxlKQoreworICBRRmlsZSBvdXQoZmlsZSk7CisgIGlmICgh b3V0Lm9wZW4oUUlPRGV2aWNlOjpXcml0ZU9ubHkpKQorICAgIHJldHVybiBmYWxzZTsKKyAgUVRl eHRTdHJlYW0gc3RyZWFtKCZvdXQpOworICBzdHJlYW0gPDwgdG9YbWwoKTsKKyAgcmV0dXJuIHRy dWU7Cit9CisKK2Jvb2wgTGlzdFRhYmxlOjpsb2FkRnJvbVhtbChjb25zdCBRU3RyaW5nICZmaWxl KQoreworICBRRmlsZSBpbihmaWxlKTsKKyAgaWYgKCFpbi5vcGVuKFFJT0RldmljZTo6UmVhZE9u bHkpKQorICAgIHJldHVybiBmYWxzZTsKKworICBRRG9tRG9jdW1lbnQgZG9jOworICBkb2Muc2V0 Q29udGVudChpbi5yZWFkQWxsKCkpOworICBRRG9tRWxlbWVudCBkb2NFbGVtID0gZG9jLmRvY3Vt ZW50RWxlbWVudCgpOworICBRRG9tTm9kZSBuID0gZG9jRWxlbS5maXJzdENoaWxkKCk7CisgIG1f cm93cy5jbGVhcigpOworICBpbnQgbGluZSA9IDA7CisgIHdoaWxlKCFuLmlzTnVsbCgpKSB7Cisg ICAgUURvbUVsZW1lbnQgZSA9IG4udG9FbGVtZW50KCk7IC8vIHRyeSB0byBjb252ZXJ0IHRoZSBu b2RlIHRvIGFuIGVsZW1lbnQuCisgICAgaWYoIWUuaXNOdWxsKCkpIHsKKyAgICAgIGxpbmUrKzsK KyAgICAgIExpc3RUYWJsZTo6VGFibGVSb3cgcm93OworICAgICAgUURvbU5hbWVkTm9kZU1hcCBh dHRyaWJ1dGVzID0gZS5hdHRyaWJ1dGVzKCk7CisgICAgICBmb3IgKGludCBpID0gMDsgaSA8IGF0 dHJpYnV0ZXMuY291bnQoKTsgKytpKSB7CisgICAgICAgIGNvbnN0IFFEb21BdHRyJiBhdHRyID0g YXR0cmlidXRlcy5pdGVtKGkpLnRvQXR0cigpOworICAgICAgICAvL3FEZWJ1ZygpIDw8IGxpbmUg PDwgYXR0ci5uYW1lKCkgPDwgIGF0dHIudmFsdWUoKTsKKyAgICAgICAgcm93W2F0dHIubmFtZSgp XSA9IGF0dHIudmFsdWUoKTsKKyAgICAgIH0KKyAgICAgIG1fcm93cy5hcHBlbmQocm93KTsKKyAg ICB9CisgICAgbiA9IG4ubmV4dFNpYmxpbmcoKTsKKyAgfQorICByZXR1cm4gdHJ1ZTsKK30KKwor LyoqCisgKiBUaGUgY2xhc3MgS0RvbUVsZW1lbnQgaXMgYSByZXBsYWNlbWVudCBmb3IgUURvbUVs ZW1lbnQKKyAqIHdpdGggdGhlIHBvc3NpYmlsaXR5IHRvIHN0b3JlIGF0dHJpYnV0ZXMgc29ydGVk LgorICoKKyAqIFNvcnRlZCBhdHRyaWJ1dGVzIGFyZSBpbXBvcnRhbnQgZm9yIGEgdGV4dHVhbCBj b21wYXJpc29uLgorICoKKyAqIEBhdXRob3IgUmFsZiBIYWJhY2tlciA8cmFsZi5oYWJhY2tlckBm cmVlbmV0LmRlPgorICovCitjbGFzcyBLRG9tRWxlbWVudCB7CitwdWJsaWM6CisgIEtEb21FbGVt ZW50KGNvbnN0IFFTdHJpbmcgJm5hbWUgPSBRU3RyaW5nKCkpIDogbV90YWcobmFtZSkge30KKyAg dm9pZCBzZXRBdHRyaWJ1dGUoY29uc3QgUVN0cmluZyAmbmFtZSwgY29uc3QgUVN0cmluZyAmdmFs dWUpCisgIHsKKyAgICBtX2F0dHJpYnV0ZXMuYXBwZW5kKFFTdHJpbmcoIiUxPVwiJTJcIiIpLmFy ZyhuYW1lLCB2YWx1ZSkpOworICB9CisKKyAgdmlydHVhbCB+S0RvbUVsZW1lbnQoKQorICB7Cisg IH0KKworICB2b2lkIGFwcGVuZENoaWxkKEtEb21FbGVtZW50ICZlbGVtZW50KQorICB7CisgICAg bV9jaGlsZHMuYXBwZW5kKGVsZW1lbnQpOworICB9CisKKyAgdmlydHVhbCBRU3RyaW5nIHRvU3Ry aW5nKCkgY29uc3QKKyAgeworICAgIGlmIChtX2NoaWxkcy5zaXplKCkgPiAwKSB7CisgICAgICBR U3RyaW5nIHMgPSAhbV90YWcuaXNFbXB0eSgpID8gUVN0cmluZygiPCUxICUyPlxuIikuYXJnKG1f dGFnLCBtX2F0dHJpYnV0ZXMuam9pbigiICIpKSA6ICIiOworICAgICAgZm9yZWFjaChjb25zdCBL RG9tRWxlbWVudCAmY2hpbGQsIG1fY2hpbGRzKSB7CisgICAgICAgIHMgKz0gY2hpbGQudG9TdHJp bmcoKTsKKyAgICAgIH0KKyAgICAgIHMgKz0gIW1fdGFnLmlzRW1wdHkoKSA/IFFTdHJpbmcoIjwv JTE+XG4iKS5hcmcobV90YWcpIDogIiI7CisgICAgICByZXR1cm4gczsKKyAgICB9IGVsc2UKKyAg ICAgIHJldHVybiAhbV90YWcuaXNFbXB0eSgpID8gUVN0cmluZygiPCUxICUyIC8+XG4iKS5hcmco bV90YWcsIG1fYXR0cmlidXRlcy5qb2luKCIgIikpIDogIiI7CisgIH0KKworcHJvdGVjdGVkOgor ICBRU3RyaW5nIG1fdGFnOworICBRU3RyaW5nTGlzdCBtX2F0dHJpYnV0ZXM7CisgIFFMaXN0PEtE b21FbGVtZW50PiBtX2NoaWxkczsKK307CisKKy8qKgorICogVGhlIGNsYXNzIEtEb21Eb2N1bWVu dCBpcyBhIHNpbXBsZSByZXBsYWNlbWVudCBmb3IgUURvbURvY3VtZW50LgorICoKKyAqIEBhdXRo b3IgUmFsZiBIYWJhY2tlciA8cmFsZi5oYWJhY2tlckBmcmVlbmV0LmRlPgorICovCitjbGFzcyBL RG9tRG9jdW1lbnQgOiBwdWJsaWMgS0RvbUVsZW1lbnQgeworcHVibGljOgorICBLRG9tRG9jdW1l bnQoY29uc3QgUVN0cmluZyAmbmFtZT1RU3RyaW5nKCkpCisgICAgOiBLRG9tRWxlbWVudCgiIiks CisgICAgICBtX3R5cGUobmFtZSkKKyAgeworICB9CisKKyAgdmlydHVhbCB+S0RvbURvY3VtZW50 KCkKKyAgeworICB9CisKKyAgS0RvbUVsZW1lbnQgY3JlYXRlRWxlbWVudChjb25zdCBRU3RyaW5n ICZuYW1lKQorICB7CisgICAgcmV0dXJuIEtEb21FbGVtZW50KG5hbWUpOworICB9CisKKyAgUVN0 cmluZyB0b1N0cmluZygpIGNvbnN0CisgIHsKKyAgICBRU3RyaW5nIHMgPSAiPD94bWwgdmVyc2lv bj1cIjEuMFwiIGVuY29kaW5nPVwidXRmLThcIj8+XG4iOworICAgIGlmICghbV90eXBlLmlzRW1w dHkoKSkKKyAgICAgIHMuYXBwZW5kKFFTdHJpbmcoIjwhRE9DVFlQRSAlMT5cbiIpLmFyZyhtX3R5 cGUpKTsKKyAgICBzLmFwcGVuZChLRG9tRWxlbWVudDo6dG9TdHJpbmcoKSk7CisgICAgcmV0dXJu IHM7CisgIH0KKworICBRU3RyaW5nIG1fdHlwZTsKK307CisKK1FTdHJpbmcgTGlzdFRhYmxlOjp0 b1htbCgpCit7CisgIEtEb21Eb2N1bWVudCBkb2M7CisgIEtEb21FbGVtZW50IGVsID0gZG9jLmNy ZWF0ZUVsZW1lbnQoIkxpc3RUYWJsZSIpOworICBRU3RyaW5nIG5hbWUgPSByZXBvcnQoKS5uYW1l KCk7CisgIGVsLnNldEF0dHJpYnV0ZSgibmFtZSIsIG5hbWUpOworCisgIGZvcmVhY2goTGlzdFRh YmxlOjpUYWJsZVJvdyByb3csIG1fcm93cykgeworICAgIEtEb21FbGVtZW50IHIgPSBkb2MuY3Jl YXRlRWxlbWVudCgiVGFibGVSb3ciKTsKKyAgICBRU3RyaW5nTGlzdCBrZXlzID0gcm93LmtleXMo KTsKKyAgICBrZXlzLnNvcnQoKTsKKyAgICBmb3JlYWNoKGNvbnN0IFFTdHJpbmcgJmtleSwga2V5 cykgeworICAgICAgci5zZXRBdHRyaWJ1dGUoa2V5LCByb3dba2V5XSk7CisgICAgfQorICAgIGVs LmFwcGVuZENoaWxkKHIpOworICB9CisgIGRvYy5hcHBlbmRDaGlsZChlbCk7CisgIHJldHVybiBk b2MudG9TdHJpbmcoKTsKK30KKwogdm9pZCBMaXN0VGFibGU6OmluY2x1ZGVJbnZlc3RtZW50U3Vi QWNjb3VudHMoKQogewogICAvLyBpZiB3ZSdyZSBub3QgaW4gZXhwZXJ0IG1vZGUsIHdlIG5lZWQg dG8gbWFrZSBzdXJlCmRpZmYgLS1naXQgYS9rbXltb25leS9yZXBvcnRzL2xpc3R0YWJsZS5oIGIv a215bW9uZXkvcmVwb3J0cy9saXN0dGFibGUuaAppbmRleCBkN2E3YzQxNzQuLjY1YjhkOTQ2OSAx MDA2NDQKLS0tIGEva215bW9uZXkvcmVwb3J0cy9saXN0dGFibGUuaAorKysgYi9rbXltb25leS9y ZXBvcnRzL2xpc3R0YWJsZS5oCkBAIC01OCw2ICs1OCwxMCBAQCBwdWJsaWM6CiAgIFFTdHJpbmcg cmVuZGVyQ1NWKCkgY29uc3Q7CiAgIHZvaWQgZHJhd0NoYXJ0KEtSZXBvcnRDaGFydFZpZXcmKSBj b25zdCB7fQogICB2b2lkIGR1bXAoY29uc3QgUVN0cmluZyYgZmlsZSwgY29uc3QgUVN0cmluZyYg Y29udGV4dCA9IFFTdHJpbmcoKSkgY29uc3Q7CisgIGJvb2wgc2F2ZVRvWG1sKGNvbnN0IFFTdHJp bmcgJmZpbGUpOworICBib29sIGxvYWRGcm9tWG1sKGNvbnN0IFFTdHJpbmcgJmZpbGUpOworICBR U3RyaW5nIHRvWG1sKCk7CisKICAgdm9pZCBpbml0KCk7CiAKIHB1YmxpYzoKZGlmZiAtLWdpdCBh L2tteW1vbmV5L3JlcG9ydHMvcGl2b3RncmlkLmNwcCBiL2tteW1vbmV5L3JlcG9ydHMvcGl2b3Rn cmlkLmNwcAppbmRleCA0YjdmZWNlMjEuLmVkZDY5ODgyMyAxMDA2NDQKLS0tIGEva215bW9uZXkv cmVwb3J0cy9waXZvdGdyaWQuY3BwCisrKyBiL2tteW1vbmV5L3JlcG9ydHMvcGl2b3RncmlkLmNw cApAQCAtMjAsNiArMjAsOCBAQAogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAvLyBRVCBJbmNs dWRlcworI2luY2x1ZGUgPFFGaWxlPgorI2luY2x1ZGUgPFF0RGVidWc+CiAKIC8vIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIC8vIEtERSBJbmNsdWRlcwpAQCAtMTEwLDYgKzExMiwxNCBAQCBQaXZvdEdy aWRSb3dTZXQ6OlBpdm90R3JpZFJvd1NldCh1bnNpZ25lZCBfbnVtY29sdW1ucykKICAgaW5zZXJ0 KGVQcmljZSwgUGl2b3RHcmlkUm93KF9udW1jb2x1bW5zKSk7CiB9CiAKK2Jvb2wgUGl2b3RHcmlk Um93U2V0OjpzYXZlVG9YbWwoUURvbURvY3VtZW50ICZkb2MsIFFEb21FbGVtZW50ICZlbCkKK3sK KyAgZm9yZWFjaChFUm93VHlwZSB0eXBlLCBrZXlzKCkpIHsKKyAgICAoKnRoaXMpW3R5cGVdLnNh dmVUb1htbChkb2MsIGVsKTsKKyAgfQorICByZXR1cm4gdHJ1ZTsKK30KKwogUGl2b3RHcmlkUm93 U2V0IFBpdm90R3JpZDo6cm93U2V0KFFTdHJpbmcgaWQpCiB7CiAKQEAgLTEzMiw0ICsxNDIsNDkg QEAgUGl2b3RHcmlkUm93U2V0IFBpdm90R3JpZDo6cm93U2V0KFFTdHJpbmcgaWQpCiAgIHJldHVy biBQaXZvdEdyaWRSb3dTZXQoKTsKIH0KIAorYm9vbCBQaXZvdEdyaWQ6OnNhdmVUb1htbChRRG9t RG9jdW1lbnQgJmRvYywgUURvbUVsZW1lbnQgJnBhcmVudCkKK3sKKyAgUURvbUVsZW1lbnQgZWwg PSBkb2MuY3JlYXRlRWxlbWVudCgiUGl2b3RHcmlkIik7CisgIGZvcihQaXZvdEdyaWQ6Oml0ZXJh dG9yIGl0X291dGVyZ3JvdXAgPSBiZWdpbigpOyBpdF9vdXRlcmdyb3VwICE9IGVuZCgpOyBpdF9v dXRlcmdyb3VwKyspIHsKKyAgICBRRG9tRWxlbWVudCBwb2cgPSBkb2MuY3JlYXRlRWxlbWVudCgi UGl2b3RPdXRlckdyb3VwIik7CisgICAgZm9yKFBpdm90T3V0ZXJHcm91cDo6aXRlcmF0b3IgaXRf aW5uZXJncm91cCA9ICgqaXRfb3V0ZXJncm91cCkuYmVnaW4oKTsgaXRfaW5uZXJncm91cCAhPSAo Kml0X291dGVyZ3JvdXApLmVuZCgpOyBpdF9pbm5lcmdyb3VwKyspIHsKKyAgICAgIFFEb21FbGVt ZW50IHBpZyA9IGRvYy5jcmVhdGVFbGVtZW50KCJQaXZvdElubmVyR3JvdXAiKTsKKyAgICAgIGZv cihQaXZvdElubmVyR3JvdXA6Oml0ZXJhdG9yIGl0X3JvdyA9ICgqaXRfaW5uZXJncm91cCkuYmVn aW4oKTsgaXRfcm93ICE9ICgqaXRfaW5uZXJncm91cCkuZW5kKCk7IGl0X3JvdysrKSB7CisgICAg ICAgIHBpZy5zZXRBdHRyaWJ1dGUoImFjY291bnQiLCBpdF9yb3cua2V5KCkuaWQoKSk7CisgICAg ICAgIGl0X3Jvdy52YWx1ZSgpLnNhdmVUb1htbChkb2MsIHBpZyk7CisgICAgICB9CisgICAgICBw b2cuYXBwZW5kQ2hpbGQocGlnKTsKKyAgICB9CisgICAgZWwuYXBwZW5kQ2hpbGQocG9nKTsKKyAg fQorICBwYXJlbnQuYXBwZW5kQ2hpbGQoZWwpOworCisgIHJldHVybiB0cnVlOworfQorCitib29s IFBpdm90R3JpZDo6bG9hZEZyb21YbWwoUURvbURvY3VtZW50ICZkb2MsIFFEb21FbGVtZW50ICZw YXJlbnQpCit7CisgIFFfVU5VU0VEKGRvYyk7CisgIFFfVU5VU0VEKHBhcmVudCk7CisgIHJldHVy biBmYWxzZTsKK30KKworYm9vbCBQaXZvdElubmVyR3JvdXA6OnNhdmVUb1htbChRRG9tRG9jdW1l bnQgJmRvYywgUURvbUVsZW1lbnQgJnBhcmVudCkKK3sKKyAgUV9VTlVTRUQoZG9jKTsKKyAgUV9V TlVTRUQocGFyZW50KTsKKyAgcmV0dXJuIHRydWU7Cit9CisKK2Jvb2wgUGl2b3RHcmlkUm93Ojpz YXZlVG9YbWwoUURvbURvY3VtZW50ICZkb2MsIFFEb21FbGVtZW50ICZwYXJlbnQpCit7CisgIGZv cihpbnQgaT0wOyBpIDwgc2l6ZSgpOyBpKyspIHsKKyAgICBjb25zdCBQaXZvdENlbGwgJmNlbGwg PSBhdChpKTsKKyAgICBRRG9tRWxlbWVudCBlbCA9IGRvYy5jcmVhdGVFbGVtZW50KCJQaXZvdENl bGwiKTsKKyAgICBlbC5zZXRBdHRyaWJ1dGUoInZhbHVlIiwgY2VsbC50b0RvdWJsZSgpKTsKKyAg ICBwYXJlbnQuYXBwZW5kQ2hpbGQoZWwpOworICB9CisgcmV0dXJuIHRydWU7Cit9CisKIH0gLy8g bmFtZXNwYWNlCmRpZmYgLS1naXQgYS9rbXltb25leS9yZXBvcnRzL3Bpdm90Z3JpZC5oIGIva215 bW9uZXkvcmVwb3J0cy9waXZvdGdyaWQuaAppbmRleCAwMjBjYjUzZDUuLjQ0ZjZiMzFiZSAxMDA2 NDQKLS0tIGEva215bW9uZXkvcmVwb3J0cy9waXZvdGdyaWQuaAorKysgYi9rbXltb25leS9yZXBv cnRzL3Bpdm90Z3JpZC5oCkBAIC05Myw2ICs5Myw3IEBAIHB1YmxpYzoKICAgICBmb3IgKHVpbnQg aSA9IDA7IGkgPCBfbnVtY29sdW1uczsgaSsrKQogICAgICAgYXBwZW5kKFBpdm90Q2VsbCgpKTsK ICAgfQorICBib29sIHNhdmVUb1htbChRRG9tRG9jdW1lbnQgJmRvYywgUURvbUVsZW1lbnQgJnBh cmVudCk7CiAgIE15TW9uZXlNb25leSBtX3RvdGFsOwogfTsKIApAQCAtMTAwLDEyICsxMDEsMTQg QEAgY2xhc3MgUGl2b3RHcmlkUm93U2V0OiBwdWJsaWMgUU1hcDxFUm93VHlwZSwgUGl2b3RHcmlk Um93PgogewogcHVibGljOgogICBQaXZvdEdyaWRSb3dTZXQodW5zaWduZWQgX251bWNvbHVtbnMg PSAwKTsKKyAgYm9vbCBzYXZlVG9YbWwoUURvbURvY3VtZW50ICZkb2MsIFFEb21FbGVtZW50ICZl bCk7CiB9OwogCiBjbGFzcyBQaXZvdElubmVyR3JvdXA6IHB1YmxpYyBRTWFwPFJlcG9ydEFjY291 bnQsIFBpdm90R3JpZFJvd1NldD4KIHsKIHB1YmxpYzoKICAgUGl2b3RJbm5lckdyb3VwKHVuc2ln bmVkIF9udW1jb2x1bW5zID0gMCk6IG1fdG90YWwoX251bWNvbHVtbnMpIHt9CisgIGJvb2wgc2F2 ZVRvWG1sKFFEb21Eb2N1bWVudCAmZG9jLCBRRG9tRWxlbWVudCAmcGFyZW50KTsKIAogICBQaXZv dEdyaWRSb3dTZXQgbV90b3RhbDsKIH07CkBAIC0xNDYsNiArMTQ5LDggQEAgcHVibGljOgogICBQ aXZvdEdyaWRSb3dTZXQgcm93U2V0KFFTdHJpbmcgaWQpOwogCiAgIFBpdm90R3JpZFJvd1NldCBt X3RvdGFsOworICBib29sIHNhdmVUb1htbChRRG9tRG9jdW1lbnQgJmRvYywgUURvbUVsZW1lbnQg JnBhcmVudCk7CisgIGJvb2wgbG9hZEZyb21YbWwoUURvbURvY3VtZW50ICZkb2MsIFFEb21FbGVt ZW50ICZwYXJlbnQpOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEva215bW9uZXkvcmVwb3J0cy9waXZv dHRhYmxlLmNwcCBiL2tteW1vbmV5L3JlcG9ydHMvcGl2b3R0YWJsZS5jcHAKaW5kZXggZmU4M2Rk OGMxLi45ODBhYTVmNzcgMTAwNjQ0Ci0tLSBhL2tteW1vbmV5L3JlcG9ydHMvcGl2b3R0YWJsZS5j cHAKKysrIGIva215bW9uZXkvcmVwb3J0cy9waXZvdHRhYmxlLmNwcApAQCAtMjI5MSw0ICsyMjkx LDMwIEBAIGludCBQaXZvdFRhYmxlOjpjdXJyZW50RGF0ZUNvbHVtbigpCiAgIHJldHVybiBjb2x1 bW47CiB9CiAKK2Jvb2wgUGl2b3RUYWJsZTo6bG9hZEZyb21YbWwoY29uc3QgUVN0cmluZyAmZmls ZSkKK3sKKyAgUV9VTlVTRUQoZmlsZSk7CisgIHJldHVybiBmYWxzZTsKK30KKworYm9vbCBQaXZv dFRhYmxlOjpzYXZlVG9YbWwoY29uc3QgUVN0cmluZyAmZmlsZSkKK3sKKyAgUUZpbGUgb3V0KGZp bGUpOworICBpZiAoIW91dC5vcGVuKFFJT0RldmljZTo6V3JpdGVPbmx5KSkKKyAgICByZXR1cm4g ZmFsc2U7CisgIFFUZXh0U3RyZWFtIHN0cmVhbSgmb3V0KTsKKyAgc3RyZWFtIDw8IHRvWG1sKCk7 CisgIHJldHVybiB0cnVlOworfQorCitRU3RyaW5nIFBpdm90VGFibGU6OnRvWG1sKCkKK3sKKyAg UURvbURvY3VtZW50IGRvYzsKKyAgUURvbUVsZW1lbnQgZWwgPSBkb2MuY3JlYXRlRWxlbWVudCgi UGl2b3RUYWJsZSIpOworICBRU3RyaW5nIG5hbWUgPSBtX2NvbmZpZ19mLm5hbWUoKTsKKyAgZWwu c2V0QXR0cmlidXRlKCJuYW1lIiwgbmFtZSk7CisgIG1fZ3JpZC5zYXZlVG9YbWwoZG9jLCBlbCk7 CisgIGRvYy5hcHBlbmRDaGlsZChlbCk7CisgIHJldHVybiBkb2MudG9TdHJpbmcoKTsKK30KIH0g Ly8gbmFtZXNwYWNlCmRpZmYgLS1naXQgYS9rbXltb25leS9yZXBvcnRzL3Bpdm90dGFibGUuaCBi L2tteW1vbmV5L3JlcG9ydHMvcGl2b3R0YWJsZS5oCmluZGV4IGIzOTQ0YjdmMy4uMjAyMTFiZjM4 IDEwMDY0NAotLS0gYS9rbXltb25leS9yZXBvcnRzL3Bpdm90dGFibGUuaAorKysgYi9rbXltb25l eS9yZXBvcnRzL3Bpdm90dGFibGUuaApAQCAtMTA3LDYgKzEwNywxMCBAQCBwdWJsaWM6CiAgICAg Ki8KICAgdm9pZCBkdW1wKGNvbnN0IFFTdHJpbmcmIGZpbGUsIGNvbnN0IFFTdHJpbmcmIGNvbnRl eHQgPSBRU3RyaW5nKCkpIGNvbnN0OwogCisgIGJvb2wgbG9hZEZyb21YbWwoY29uc3QgUVN0cmlu ZyAmZmlsZSk7CisgIGJvb2wgc2F2ZVRvWG1sKGNvbnN0IFFTdHJpbmcgJmZpbGUpOworICBRU3Ry aW5nIHRvWG1sKCk7CisKICAgLyoqCiAgICAgKiBSZXR1cm5zIHRoZSBncmlkIGdlbmVyYXRlZCBi eSB0aGUgcmVwb3J0CiAgICAgKgpkaWZmIC0tZ2l0IGEva215bW9uZXkvcmVwb3J0cy9yZXBvcnR0 YWJsZS5oIGIva215bW9uZXkvcmVwb3J0cy9yZXBvcnR0YWJsZS5oCmluZGV4IGFjNWM0NWYwYy4u ZjY5MTRlOTkzIDEwMDY0NAotLS0gYS9rbXltb25leS9yZXBvcnRzL3JlcG9ydHRhYmxlLmgKKysr IGIva215bW9uZXkvcmVwb3J0cy9yZXBvcnR0YWJsZS5oCkBAIC0xNDMsNiArMTQzLDEwIEBAIHB1 YmxpYzoKICAgdmlydHVhbCB2b2lkIGRyYXdDaGFydChLUmVwb3J0Q2hhcnRWaWV3JiB2aWV3KSBj b25zdCA9IDA7CiAgIHZpcnR1YWwgdm9pZCBkdW1wKGNvbnN0IFFTdHJpbmcmIGZpbGUsIGNvbnN0 IFFTdHJpbmcmIGNvbnRleHQgPSBRU3RyaW5nKCkpIGNvbnN0ID0gMDsKIAorICB2aXJ0dWFsIGJv b2wgbG9hZEZyb21YbWwoY29uc3QgUVN0cmluZyAmZmlsZSkgPSAwOworICB2aXJ0dWFsIGJvb2wg c2F2ZVRvWG1sKGNvbnN0IFFTdHJpbmcgJmZpbGUpID0gMDsKKyAgdmlydHVhbCBRU3RyaW5nIHRv WG1sKCkgPSAwOworCiAgIC8qKgogICAgKiBDcmVhdGVzIHRoZSBjb21wbGV0ZSBodG1sIGRvY3Vt ZW50LgogICAgKgpkaWZmIC0tZ2l0IGEva215bW9uZXkvdmlld3Mva3JlcG9ydHN2aWV3LmNwcCBi L2tteW1vbmV5L3ZpZXdzL2tyZXBvcnRzdmlldy5jcHAKaW5kZXggNzY5YTM0YTgzLi5iNjg3NTlk YzQgMTAwNjQ0Ci0tLSBhL2tteW1vbmV5L3ZpZXdzL2tyZXBvcnRzdmlldy5jcHAKKysrIGIva215 bW9uZXkvdmlld3Mva3JlcG9ydHN2aWV3LmNwcApAQCAtMTgyLDE0ICsxODIsMTcgQEAgdm9pZCBL UmVwb3J0c1ZpZXc6OktSZXBvcnRUYWI6OnNhdmVBcyhjb25zdCBRU3RyaW5nJiBmaWxlbmFtZSwg Ym9vbCBpbmNsdWRlQ1NTKQogICBRRmlsZSBmaWxlKGZpbGVuYW1lKTsKIAogICBpZiAoZmlsZS5v cGVuKFFJT0RldmljZTo6V3JpdGVPbmx5KSkgewotICAgIGlmIChRRmlsZUluZm8oZmlsZW5hbWUp LnN1ZmZpeCgpLnRvTG93ZXIoKSA9PSAiY3N2IikgeworICAgIFFTdHJpbmcgc3VmZml4ID0gUUZp bGVJbmZvKGZpbGVuYW1lKS5zdWZmaXgoKS50b0xvd2VyKCk7CisgICAgaWYgKHN1ZmZpeCA9PSAi Y3N2IikgewogICAgICAgUVRleHRTdHJlYW0oJmZpbGUpIDw8IG1fdGFibGUtPnJlbmRlckNTVigp OwotICAgIH0gZWxzZSB7CisgICAgfSBlbHNlIGlmIChzdWZmaXggPT0gImh0bWwiKSB7CiAgICAg ICBRU3RyaW5nIHRhYmxlID0KICAgICAgICAgbV90YWJsZS0+cmVuZGVySFRNTChxb2JqZWN0X2Nh c3Q8UVdpZGdldCo+KHRoaXMpLCBtX2VuY29kaW5nLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1fcmVwb3J0Lm5hbWUoKSwgaW5jbHVkZUNTUyk7CiAgICAgICBRVGV4dFN0cmVhbSBzdHJl YW0oJmZpbGUpOwogICAgICAgc3RyZWFtIDw8IHRhYmxlOworICAgIH0gZWxzZSB7CisgICAgICBR VGV4dFN0cmVhbSgmZmlsZSkgPDwgbV90YWJsZS0+dG9YbWwoKTsKICAgICB9CiAgICAgZmlsZS5j bG9zZSgpOwogICB9CkBAIC0yOTksNiArMzAyLDcgQEAgcHVibGljOgogICAgICAgZmlsdGVyID0g IiouY3N2IjsKICAgICAgIGZpbHRDc3YgPSAiKi5jc3Z8IiArIGkxOG5jKCJDU1YgKEZpbGVmaWx0 ZXIpIiwgIkNTViBmaWxlcyIpOwogICAgICAgZmlsdEh0bWwgPSAiKi5odG1sfCIgKyBpMThuYygi SFRNTCAoRmlsZWZpbHRlcikiLCAiSFRNTCBmaWxlcyIpOworICAgICAgZmlsdFhtbCA9ICIqLnht bHwiICsgaTE4bmMoIlhNTCAoRmlsZWZpbHRlcikiLCAiWE1MIGZpbGVzIik7CiAgICAgfQogCiAg ICAgLyoqCkBAIC0zMzAsNiArMzM0LDEyIEBAIHB1YmxpYzoKICAgICAgKiBAc2VlIEtGaWxlRGlh bG9nOjpLRmlsZURpYWxvZwogICAgICAqLwogICAgIFFTdHJpbmcgZmlsdEh0bWw7CisgICAgLyoq CisgICAgICogWE1MIGZpbHRlcm5hbWUgYW5kIGRlc2NyaXB0aW9uLgorICAgICAqCisgICAgICog QHNlZSBLRmlsZURpYWxvZzo6S0ZpbGVEaWFsb2cKKyAgICAgKi8KKyAgICBRU3RyaW5nIGZpbHRY bWw7CiAgIH07CiAKICAgRmlsZVNhdmVQcm9wZXJ0aWVzKiBmU2F2UHJvcHM7CkBAIC03NTUsNyAr NzY1LDcgQEAgdm9pZCBLUmVwb3J0c1ZpZXc6OnNsb3RTYXZlVmlldygpCiAgICAgLy8gcmVzdG9y ZSBjaGVja2JveCBjaGVja2VkIHN0YXRlCiAgICAgZC0+ZlNhdlByb3BzLT5pbmNsdWRlQ3NzQ2hl Y2tCb3gtPnNldENoZWNrZWQoZC0+ZlNhdlByb3BzLT5jYklzQ2hlY2tlZCk7CiAKLSAgICBRU3Ry aW5nIGZpbHRlckxpc3QgPSBkLT5mU2F2UHJvcHMtPmZpbHRDc3YgKyAnXG4nICsgZC0+ZlNhdlBy b3BzLT5maWx0SHRtbDsKKyAgICBRU3RyaW5nIGZpbHRlckxpc3QgPSBkLT5mU2F2UHJvcHMtPmZp bHRDc3YgKyAnXG4nICsgZC0+ZlNhdlByb3BzLT5maWx0SHRtbCAgKyAnXG4nICsgZC0+ZlNhdlBy b3BzLT5maWx0WG1sOwogICAgIFFQb2ludGVyPEtGaWxlRGlhbG9nPiBkbGcgPQogICAgICAgbmV3 IEtGaWxlRGlhbG9nKEtVcmwoImtmaWxlZGlhbG9nOi8vL2tteW1vbmV5LWV4cG9ydCIpLCBmaWx0 ZXJMaXN0LCB0aGlzLAogICAgICAgICAgICAgICAgICAgICAgIHFvYmplY3RfY2FzdDxRV2lkZ2V0 Kj4oZC0+ZlNhdlByb3BzLT5pbmNsdWRlQ3NzQ2hlY2tCb3gpKTsKQEAgLTc3MSw5ICs3ODEsMTIg QEAgdm9pZCBLUmVwb3J0c1ZpZXc6OnNsb3RTYXZlVmlldygpCiAgICAgaWYgKGQtPmZTYXZQcm9w cy0+ZmlsdGVyID09ICIqLmNzdiIpIHsKICAgICAgIGNvbWJvLT5zZXRDdXJyZW50RmlsdGVyKGQt PmZTYXZQcm9wcy0+ZmlsdENzdik7CiAgICAgICBkLT5mU2F2UHJvcHMtPmluY2x1ZGVDc3NDaGVj a0JveC0+c2V0RW5hYmxlZChmYWxzZSk7Ci0gICAgfSBlbHNlIHsKKyAgICB9IGVsc2UgaWYgKGQt PmZTYXZQcm9wcy0+ZmlsdGVyID09ICIqLmh0bWwiKSB7CiAgICAgICBjb21iby0+c2V0Q3VycmVu dEZpbHRlcihkLT5mU2F2UHJvcHMtPmZpbHRIdG1sKTsKICAgICAgIGQtPmZTYXZQcm9wcy0+aW5j bHVkZUNzc0NoZWNrQm94LT5zZXRFbmFibGVkKHRydWUpOworICAgIH0gZWxzZSB7CisgICAgICBj b21iby0+c2V0Q3VycmVudEZpbHRlcihkLT5mU2F2UHJvcHMtPmZpbHRYbWwpOworICAgICAgZC0+ ZlNhdlByb3BzLT5pbmNsdWRlQ3NzQ2hlY2tCb3gtPnNldEVuYWJsZWQoZmFsc2UpOwogICAgIH0K IAogICAgIGlmIChkbGctPmV4ZWMoKSA9PSBRRGlhbG9nOjpBY2NlcHRlZCkgewotLSAKMi4xNi40 Cgo=