267171 2011-02-25 20:37:30 +0000 Version state in details-view with expandable folders not shown 2013-09-29 16:08:59 +0000 1 1 2 Applications dolphin plugins: git 2.1 Chakra Linux RESOLVED FIXED NOR normal --- 1 peter.penz19 dolphin-bugs-null adrian emmanuelpescosta099 maciejkacperjagiello rap http://commits.kde.org/kde-baseapps/bbbfeb28c54badce6e4643854bfe15a8705f5ad5 4.11.3 0 oldest_to_newest 1091347 0 peter.penz19 2011-02-25 20:37:30 +0000 Version: unspecified (using KDE 4.6.0) OS: Linux When using the git-plugin with the details-view where "expandable-folders" is enabled (context-menu -> [x] Expandable Folders), no correct version state is shown for the items below an expanded folder. Reproducible: Always Steps to Reproduce: - Assure that the details-view with expandable folders is enabled - Go to a git-repository that has sub-directories and where items of a sub-directories have been modified - Open the sub-directory with the modifications by clicking on the expand-button left from the directory icon Actual Results: No version state is shown at all Expected Results: Version state of the items in the sub-directory is shown 1291231 1 vanmeeuwen 2012-08-24 16:21:30 +0000 Resetting assignee to default as per bug #305719 1310283 2 adrian 2012-10-28 17:47:55 +0000 I can confirm the version-control-status-icon of the files in the expanded folder does not provide the status information. It does work, however, when you actually enter the expanded folder. 1396252 3 emmanuelpescosta099 2013-09-10 15:46:35 +0000 The problem is in UpdateItemStatesThread::run(). We use the directory url of the first item to retrieve the item version states of all items, which makes it impossible to get the infos for expanded items. plugin->beginRetrieval(directory) foreach item in items plugin->itemVersion(item) plugin->endRetrieval() I haven't found any simple and good solution yet to fix this problem. 1396542 4 82281 emmanuelpescosta099 2013-09-11 18:38:16 +0000 Created attachment 82281 POC show the right version state for expanded items With this patch the right version states for expanded items are shown. The only problem so far: The "root folder" must be under version control. 1396765 5 frank78ac 2013-09-12 16:02:44 +0000 Thanks for looking into the problem, Emmanuel! (In reply to comment #4) > The only problem so far: > The "root folder" must be under version control. If we tried to fix this problem, then we would always have to let the plugins run when expanding any folder, right? I'm not sure if we really want that. Note that the bug description mentions only the case that the "root folder" is version-controlled. 1397325 6 emmanuelpescosta099 2013-09-14 20:22:57 +0000 > If we tried to fix this problem, then we would always have to let the plugins run when expanding > any folder, right? Yes, we must check if every opened/expanded folder is under version control. 1400318 7 emmanuelpescosta099 2013-09-29 16:08:59 +0000 Git commit bbbfeb28c54badce6e4643854bfe15a8705f5ad5 by Emmanuel Pescosta. Committed on 29/09/2013 at 16:08. Pushed by emmanuelp into branch 'KDE/4.11'. Show the right version states for expanded items. FIXED-IN: 4.11.3 REVIEW: 112980 M +19 -17 dolphin/src/views/versioncontrol/updateitemstatesthread.cpp M +3 -3 dolphin/src/views/versioncontrol/updateitemstatesthread.h M +47 -16 dolphin/src/views/versioncontrol/versioncontrolobserver.cpp M +16 -0 dolphin/src/views/versioncontrol/versioncontrolobserver.h http://commits.kde.org/kde-baseapps/bbbfeb28c54badce6e4643854bfe15a8705f5ad5 82281 2013-09-11 18:38:16 +0000 2013-09-11 18:38:16 +0000 POC show the right version state for expanded items 0001-Show-the-right-version-state-for-expanded-items.patch text/plain 8843 emmanuelpescosta099 RnJvbSBhNzA5MTQ2NTYyMDAwMTU1ODMxMjg0ZTE4YjIwYzA3YjhkMDY5MmQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFbW1hbnVlbCBQZXNjb3N0YSA8ZW1tYW51ZWxwZXNjb3N0YTA5 OUBnbWFpbC5jb20+CkRhdGU6IFdlZCwgMTEgU2VwIDIwMTMgMjA6MTQ6MzAgKzAyMDAKU3ViamVj dDogW1BBVENIXSBTaG93IHRoZSByaWdodCB2ZXJzaW9uIHN0YXRlIGZvciBleHBhbmRlZCBpdGVt cy4KCkJVRzogMjY3MTcxCkZJWEVELUlOOiA0LjExLjIKLS0tCiAuLi4vdmVyc2lvbmNvbnRyb2wv dXBkYXRlaXRlbXN0YXRlc3RocmVhZC5jcHAgICAgICB8IDM3ICsrKysrKystLS0tLS0KIC4uLi92 aWV3cy92ZXJzaW9uY29udHJvbC91cGRhdGVpdGVtc3RhdGVzdGhyZWFkLmggIHwgIDYgKy0tCiAu Li4vdmVyc2lvbmNvbnRyb2wvdmVyc2lvbmNvbnRyb2xvYnNlcnZlci5jcHAgICAgICB8IDYyICsr KysrKysrKysrKysrKystLS0tLS0KIC4uLi92aWV3cy92ZXJzaW9uY29udHJvbC92ZXJzaW9uY29u dHJvbG9ic2VydmVyLmggIHwgIDQgKysKIDQgZmlsZXMgY2hhbmdlZCwgNzMgaW5zZXJ0aW9ucygr KSwgMzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9scGhpbi9zcmMvdmlld3MvdmVyc2lv bmNvbnRyb2wvdXBkYXRlaXRlbXN0YXRlc3RocmVhZC5jcHAgYi9kb2xwaGluL3NyYy92aWV3cy92 ZXJzaW9uY29udHJvbC91cGRhdGVpdGVtc3RhdGVzdGhyZWFkLmNwcAppbmRleCBmYTAwNWY4Li44 ZmEzM2YxIDEwMDY0NAotLS0gYS9kb2xwaGluL3NyYy92aWV3cy92ZXJzaW9uY29udHJvbC91cGRh dGVpdGVtc3RhdGVzdGhyZWFkLmNwcAorKysgYi9kb2xwaGluL3NyYy92aWV3cy92ZXJzaW9uY29u dHJvbC91cGRhdGVpdGVtc3RhdGVzdGhyZWFkLmNwcApAQCAtMjIsOSArMjIsMTAgQEAKICNpbmNs dWRlIDxrdmVyc2lvbmNvbnRyb2xwbHVnaW4yLmg+CiAKICNpbmNsdWRlIDxRTXV0ZXhMb2NrZXI+ CisjaW5jbHVkZSA8UURlYnVnPgogCiBVcGRhdGVJdGVtU3RhdGVzVGhyZWFkOjpVcGRhdGVJdGVt U3RhdGVzVGhyZWFkKEtWZXJzaW9uQ29udHJvbFBsdWdpbiogcGx1Z2luLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFFMaXN0PFZlcnNpb25Db250cm9sT2JzZXJ2 ZXI6Okl0ZW1TdGF0ZT4mIGl0ZW1TdGF0ZXMpIDoKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgUU1hcDxRU3RyaW5nLCBRVmVjdG9yPFZlcnNpb25D b250cm9sT2JzZXJ2ZXI6Okl0ZW1TdGF0ZT4gPiYgaXRlbVN0YXRlcykgOgogICAgIFFUaHJlYWQo KSwKICAgICBtX2dsb2JhbFBsdWdpbk11dGV4KDApLAogICAgIG1fcGx1Z2luKHBsdWdpbiksCkBA IC00NywyNyArNDgsMjkgQEAgdm9pZCBVcGRhdGVJdGVtU3RhdGVzVGhyZWFkOjpydW4oKQogICAg IFFfQVNTRVJUKCFtX2l0ZW1TdGF0ZXMuaXNFbXB0eSgpKTsKICAgICBRX0FTU0VSVChtX3BsdWdp bik7CiAKLSAgICBjb25zdCBRU3RyaW5nIGRpcmVjdG9yeSA9IG1faXRlbVN0YXRlcy5maXJzdCgp Lml0ZW0udXJsKCkuZGlyZWN0b3J5KEtVcmw6OkFwcGVuZFRyYWlsaW5nU2xhc2gpOwogICAgIG1f cmV0cmlldmVkSXRlbXMgPSBmYWxzZTsKIAogICAgIFFNdXRleExvY2tlciBwbHVnaW5Mb2NrZXIo bV9nbG9iYWxQbHVnaW5NdXRleCk7Ci0gICAgaWYgKG1fcGx1Z2luLT5iZWdpblJldHJpZXZhbChk aXJlY3RvcnkpKSB7Ci0gICAgICAgIGNvbnN0IGludCBjb3VudCA9IG1faXRlbVN0YXRlcy5jb3Vu dCgpOworICAgIGZvcmVhY2ggKGNvbnN0IFFTdHJpbmcmIGRpcmVjdG9yeSwgbV9pdGVtU3RhdGVz LmtleXMoKSkgeworICAgICAgICBpZiAobV9wbHVnaW4tPmJlZ2luUmV0cmlldmFsKGRpcmVjdG9y eSkpIHsKKyAgICAgICAgICAgIFFWZWN0b3I8VmVyc2lvbkNvbnRyb2xPYnNlcnZlcjo6SXRlbVN0 YXRlPiYgaXRlbXMgPSBtX2l0ZW1TdGF0ZXNbZGlyZWN0b3J5XTsKKyAgICAgICAgICAgIGNvbnN0 IGludCBjb3VudCA9IGl0ZW1zLmNvdW50KCk7CiAKLSAgICAgICAgS1ZlcnNpb25Db250cm9sUGx1 Z2luMiogcGx1Z2luVjIgPSBxb2JqZWN0X2Nhc3Q8S1ZlcnNpb25Db250cm9sUGx1Z2luMio+KG1f cGx1Z2luKTsKLSAgICAgICAgaWYgKHBsdWdpblYyKSB7Ci0gICAgICAgICAgICBmb3IgKGludCBp ID0gMDsgaSA8IGNvdW50OyArK2kpIHsKLSAgICAgICAgICAgICAgICBtX2l0ZW1TdGF0ZXNbaV0u dmVyc2lvbiA9IHBsdWdpblYyLT5pdGVtVmVyc2lvbihtX2l0ZW1TdGF0ZXNbaV0uaXRlbSk7Cisg ICAgICAgICAgICBLVmVyc2lvbkNvbnRyb2xQbHVnaW4yKiBwbHVnaW5WMiA9IHFvYmplY3RfY2Fz dDxLVmVyc2lvbkNvbnRyb2xQbHVnaW4yKj4obV9wbHVnaW4pOworICAgICAgICAgICAgaWYgKHBs dWdpblYyKSB7CisgICAgICAgICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBjb3VudDsgKytp KSB7CisgICAgICAgICAgICAgICAgICAgIGl0ZW1zW2ldLnZlcnNpb24gPSBwbHVnaW5WMi0+aXRl bVZlcnNpb24oaXRlbXNbaV0uaXRlbSk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IGNvdW50OyArK2kp IHsKKyAgICAgICAgICAgICAgICAgICAgY29uc3QgS1ZlcnNpb25Db250cm9sUGx1Z2luOjpWZXJz aW9uU3RhdGUgc3RhdGUgPSBtX3BsdWdpbi0+dmVyc2lvblN0YXRlKGl0ZW1zW2ldLml0ZW0pOwor ICAgICAgICAgICAgICAgICAgICBpdGVtc1tpXS52ZXJzaW9uID0gc3RhdGljX2Nhc3Q8S1ZlcnNp b25Db250cm9sUGx1Z2luMjo6SXRlbVZlcnNpb24+KHN0YXRlKTsKKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBmb3IgKGludCBp ID0gMDsgaSA8IGNvdW50OyArK2kpIHsKLSAgICAgICAgICAgICAgICBjb25zdCBLVmVyc2lvbkNv bnRyb2xQbHVnaW46OlZlcnNpb25TdGF0ZSBzdGF0ZSA9IG1fcGx1Z2luLT52ZXJzaW9uU3RhdGUo bV9pdGVtU3RhdGVzW2ldLml0ZW0pOwotICAgICAgICAgICAgICAgIG1faXRlbVN0YXRlc1tpXS52 ZXJzaW9uID0gc3RhdGljX2Nhc3Q8S1ZlcnNpb25Db250cm9sUGx1Z2luMjo6SXRlbVZlcnNpb24+ KHN0YXRlKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQogCi0gICAgICAgIG1fcGx1Z2luLT5l bmRSZXRyaWV2YWwoKTsKLSAgICAgICAgbV9yZXRyaWV2ZWRJdGVtcyA9IHRydWU7CisgICAgICAg ICAgICBtX3BsdWdpbi0+ZW5kUmV0cmlldmFsKCk7CisgICAgICAgICAgICBtX3JldHJpZXZlZEl0 ZW1zID0gdHJ1ZTsKKyAgICAgICAgfQogICAgIH0KIH0KIApAQCAtODEsNyArODQsNyBAQCB2b2lk IFVwZGF0ZUl0ZW1TdGF0ZXNUaHJlYWQ6OnVubG9ja1BsdWdpbigpCiAgICAgbV9nbG9iYWxQbHVn aW5NdXRleC0+dW5sb2NrKCk7CiB9CiAKLVFMaXN0PFZlcnNpb25Db250cm9sT2JzZXJ2ZXI6Okl0 ZW1TdGF0ZT4gVXBkYXRlSXRlbVN0YXRlc1RocmVhZDo6aXRlbVN0YXRlcygpIGNvbnN0CitRTWFw PFFTdHJpbmcsIFFWZWN0b3I8VmVyc2lvbkNvbnRyb2xPYnNlcnZlcjo6SXRlbVN0YXRlPiA+IFVw ZGF0ZUl0ZW1TdGF0ZXNUaHJlYWQ6Oml0ZW1TdGF0ZXMoKSBjb25zdAogewogICAgIHJldHVybiBt X2l0ZW1TdGF0ZXM7CiB9CmRpZmYgLS1naXQgYS9kb2xwaGluL3NyYy92aWV3cy92ZXJzaW9uY29u dHJvbC91cGRhdGVpdGVtc3RhdGVzdGhyZWFkLmggYi9kb2xwaGluL3NyYy92aWV3cy92ZXJzaW9u Y29udHJvbC91cGRhdGVpdGVtc3RhdGVzdGhyZWFkLmgKaW5kZXggYTI4MTY5Ny4uMjkxNGJjMiAx MDA2NDQKLS0tIGEvZG9scGhpbi9zcmMvdmlld3MvdmVyc2lvbmNvbnRyb2wvdXBkYXRlaXRlbXN0 YXRlc3RocmVhZC5oCisrKyBiL2RvbHBoaW4vc3JjL3ZpZXdzL3ZlcnNpb25jb250cm9sL3VwZGF0 ZWl0ZW1zdGF0ZXN0aHJlYWQuaApAQCAtNDcsNyArNDcsNyBAQCBwdWJsaWM6CiAgICAgICogQHBh cmFtIGl0ZW1TdGF0ZXMgTGlzdCBvZiBpdGVtcywgd2hlcmUgdGhlIHN0YXRlcyBnZXQgdXBkYXRl ZC4KICAgICAgKi8KICAgICBVcGRhdGVJdGVtU3RhdGVzVGhyZWFkKEtWZXJzaW9uQ29udHJvbFBs dWdpbiogcGx1Z2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUUxpc3Q8VmVy c2lvbkNvbnRyb2xPYnNlcnZlcjo6SXRlbVN0YXRlPiYgaXRlbVN0YXRlcyk7CisgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBRTWFwPFFTdHJpbmcsIFFWZWN0b3I8VmVyc2lvbkNvbnRy b2xPYnNlcnZlcjo6SXRlbVN0YXRlPiA+JiBpdGVtU3RhdGVzKTsKICAgICB2aXJ0dWFsIH5VcGRh dGVJdGVtU3RhdGVzVGhyZWFkKCk7CiAKICAgICAvKioKQEAgLTYzLDcgKzYzLDcgQEAgcHVibGlj OgogICAgICAqLwogICAgIHZvaWQgdW5sb2NrUGx1Z2luKCk7CiAKLSAgICBRTGlzdDxWZXJzaW9u Q29udHJvbE9ic2VydmVyOjpJdGVtU3RhdGU+IGl0ZW1TdGF0ZXMoKSBjb25zdDsKKyAgICBRTWFw PFFTdHJpbmcsIFFWZWN0b3I8VmVyc2lvbkNvbnRyb2xPYnNlcnZlcjo6SXRlbVN0YXRlPiA+IGl0 ZW1TdGF0ZXMoKSBjb25zdDsKIAogICAgIGJvb2wgcmV0cmlldmVkSXRlbXMoKSBjb25zdDsKIApA QCAtNzUsNyArNzUsNyBAQCBwcml2YXRlOgogICAgIEtWZXJzaW9uQ29udHJvbFBsdWdpbiogbV9w bHVnaW47CiAKICAgICBib29sIG1fcmV0cmlldmVkSXRlbXM7Ci0gICAgUUxpc3Q8VmVyc2lvbkNv bnRyb2xPYnNlcnZlcjo6SXRlbVN0YXRlPiBtX2l0ZW1TdGF0ZXM7CisgICAgUU1hcDxRU3RyaW5n LCBRVmVjdG9yPFZlcnNpb25Db250cm9sT2JzZXJ2ZXI6Okl0ZW1TdGF0ZT4gPiBtX2l0ZW1TdGF0 ZXM7CiB9OwogCiAjZW5kaWYgLy8gVVBEQVRFSVRFTVNUQVRFU1RIUkVBRF9ICmRpZmYgLS1naXQg YS9kb2xwaGluL3NyYy92aWV3cy92ZXJzaW9uY29udHJvbC92ZXJzaW9uY29udHJvbG9ic2VydmVy LmNwcCBiL2RvbHBoaW4vc3JjL3ZpZXdzL3ZlcnNpb25jb250cm9sL3ZlcnNpb25jb250cm9sb2Jz ZXJ2ZXIuY3BwCmluZGV4IDQwMmEyZGUuLjE0N2YxMjIgMTAwNjQ0Ci0tLSBhL2RvbHBoaW4vc3Jj L3ZpZXdzL3ZlcnNpb25jb250cm9sL3ZlcnNpb25jb250cm9sb2JzZXJ2ZXIuY3BwCisrKyBiL2Rv bHBoaW4vc3JjL3ZpZXdzL3ZlcnNpb25jb250cm9sL3ZlcnNpb25jb250cm9sb2JzZXJ2ZXIuY3Bw CkBAIC0yMDQsMTEgKzIwNCwxNSBAQCB2b2lkIFZlcnNpb25Db250cm9sT2JzZXJ2ZXI6OnNsb3RU aHJlYWRGaW5pc2hlZCgpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBjb25zdCBRTGlz dDxJdGVtU3RhdGU+IGl0ZW1TdGF0ZXMgPSB0aHJlYWQtPml0ZW1TdGF0ZXMoKTsKLSAgICBmb3Jl YWNoIChjb25zdCBJdGVtU3RhdGUmIGl0ZW1TdGF0ZSwgaXRlbVN0YXRlcykgewotICAgICAgICBR SGFzaDxRQnl0ZUFycmF5LCBRVmFyaWFudD4gdmFsdWVzOwotICAgICAgICB2YWx1ZXMuaW5zZXJ0 KCJ2ZXJzaW9uIiwgUVZhcmlhbnQoaXRlbVN0YXRlLnZlcnNpb24pKTsKLSAgICAgICAgbV9tb2Rl bC0+c2V0RGF0YShpdGVtU3RhdGUuaW5kZXgsIHZhbHVlcyk7CisgICAgY29uc3QgUU1hcDxRU3Ry aW5nLCBRVmVjdG9yPEl0ZW1TdGF0ZT4gPiYgaXRlbVN0YXRlcyA9IHRocmVhZC0+aXRlbVN0YXRl cygpOworICAgIGZvcmVhY2ggKGNvbnN0IFFTdHJpbmcmIGRpcmVjdG9yeSwgaXRlbVN0YXRlcy5r ZXlzKCkpIHsKKyAgICAgICAgY29uc3QgUVZlY3RvcjxJdGVtU3RhdGU+JiBpdGVtcyA9IGl0ZW1T dGF0ZXMudmFsdWUoZGlyZWN0b3J5KTsKKworICAgICAgICBmb3JlYWNoIChjb25zdCBJdGVtU3Rh dGUmIGl0ZW0sIGl0ZW1zKSB7CisgICAgICAgICAgICBRSGFzaDxRQnl0ZUFycmF5LCBRVmFyaWFu dD4gdmFsdWVzOworICAgICAgICAgICAgdmFsdWVzLmluc2VydCgidmVyc2lvbiIsIFFWYXJpYW50 KGl0ZW0udmVyc2lvbikpOworICAgICAgICAgICAgbV9tb2RlbC0+c2V0RGF0YShpdGVtLmluZGV4 LCB2YWx1ZXMpOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKCFtX3NpbGVudFVwZGF0ZSkg ewpAQCAtMjMzLDE4ICsyMzcsOSBAQCB2b2lkIFZlcnNpb25Db250cm9sT2JzZXJ2ZXI6OnVwZGF0 ZUl0ZW1TdGF0ZXMoKQogICAgICAgICBtX3BlbmRpbmdJdGVtU3RhdGVzVXBkYXRlID0gdHJ1ZTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBRTGlzdDxJdGVtU3RhdGU+IGl0ZW1TdGF0ZXM7 Ci0gICAgY29uc3QgaW50IGl0ZW1Db3VudCA9IG1fbW9kZWwtPmNvdW50KCk7Ci0gICAgaXRlbVN0 YXRlcy5yZXNlcnZlKGl0ZW1Db3VudCk7CiAKLSAgICBmb3IgKGludCBpID0gMDsgaSA8IGl0ZW1D b3VudDsgKytpKSB7Ci0gICAgICAgIEl0ZW1TdGF0ZSBpdGVtU3RhdGU7Ci0gICAgICAgIGl0ZW1T dGF0ZS5pbmRleCA9IGk7Ci0gICAgICAgIGl0ZW1TdGF0ZS5pdGVtID0gbV9tb2RlbC0+ZmlsZUl0 ZW0oaSk7Ci0gICAgICAgIGl0ZW1TdGF0ZS52ZXJzaW9uID0gS1ZlcnNpb25Db250cm9sUGx1Z2lu Mjo6VW52ZXJzaW9uZWRWZXJzaW9uOwotCi0gICAgICAgIGl0ZW1TdGF0ZXMuYXBwZW5kKGl0ZW1T dGF0ZSk7Ci0gICAgfQorICAgIFFNYXA8UVN0cmluZywgUVZlY3RvcjxJdGVtU3RhdGU+ID4gaXRl bVN0YXRlczsKKyAgICBjcmVhdGVJdGVtc1N0YXRlTGlzdChpdGVtU3RhdGVzKTsKIAogICAgIGlm ICghaXRlbVN0YXRlcy5pc0VtcHR5KCkpIHsKICAgICAgICAgaWYgKCFtX3NpbGVudFVwZGF0ZSkg ewpAQCAtMjYwLDYgKzI1NSw0MSBAQCB2b2lkIFZlcnNpb25Db250cm9sT2JzZXJ2ZXI6OnVwZGF0 ZUl0ZW1TdGF0ZXMoKQogICAgIH0KIH0KIAoraW50IFZlcnNpb25Db250cm9sT2JzZXJ2ZXI6OmNy ZWF0ZUl0ZW1zU3RhdGVMaXN0KFFNYXA8UVN0cmluZywgUVZlY3RvcjxJdGVtU3RhdGU+ID4mIGl0 ZW1TdGF0ZXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgaW50IGZpcnN0SW5kZXgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgaW50IGN1cnJlbnRFeHBhbnNpb25MZXZlbCkKK3sKKyAg ICBjb25zdCBpbnQgaXRlbUNvdW50ID0gbV9tb2RlbC0+Y291bnQoKTsKKworICAgIFFWZWN0b3I8 SXRlbVN0YXRlPiBpdGVtczsKKyAgICBpdGVtcy5yZXNlcnZlKGl0ZW1Db3VudCAtIGZpcnN0SW5k ZXgpOworCisgICAgaW50IGk7CisgICAgZm9yIChpID0gZmlyc3RJbmRleDsgaSA8IGl0ZW1Db3Vu dDsgKytpKSB7CisgICAgICAgIGNvbnN0IGludCBleHBhbnNpb25MZXZlbCA9IG1fbW9kZWwtPmV4 cGFuZGVkUGFyZW50c0NvdW50KGkpOworCisgICAgICAgIGlmIChleHBhbnNpb25MZXZlbCA9PSBj dXJyZW50RXhwYW5zaW9uTGV2ZWwpIHsKKyAgICAgICAgICAgIEl0ZW1TdGF0ZSBpdGVtU3RhdGU7 CisgICAgICAgICAgICBpdGVtU3RhdGUuaW5kZXggPSBpOworICAgICAgICAgICAgaXRlbVN0YXRl Lml0ZW0gPSBtX21vZGVsLT5maWxlSXRlbShpKTsKKyAgICAgICAgICAgIGl0ZW1TdGF0ZS52ZXJz aW9uID0gS1ZlcnNpb25Db250cm9sUGx1Z2luMjo6VW52ZXJzaW9uZWRWZXJzaW9uOworCisgICAg ICAgICAgICBpdGVtcy5hcHBlbmQoaXRlbVN0YXRlKTsKKyAgICAgICAgfSBlbHNlIGlmIChleHBh bnNpb25MZXZlbCA+IGN1cnJlbnRFeHBhbnNpb25MZXZlbCkgeworICAgICAgICAgICAgaSArPSBj cmVhdGVJdGVtc1N0YXRlTGlzdChpdGVtU3RhdGVzLCBpLCBleHBhbnNpb25MZXZlbCkgLSAxOwor ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CisK KyAgICBpZiAoaXRlbXMuY291bnQoKSA+IDApIHsKKyAgICAgICAgY29uc3QgS1VybCYgdXJsID0g aXRlbXMuZmlyc3QoKS5pdGVtLnVybCgpOworICAgICAgICBpdGVtU3RhdGVzLmluc2VydCh1cmwu ZGlyZWN0b3J5KEtVcmw6OkFwcGVuZFRyYWlsaW5nU2xhc2gpLCBpdGVtcyk7CisgICAgfQorCisg ICAgcmV0dXJuIGkgLSBmaXJzdEluZGV4OworfQorCiBLVmVyc2lvbkNvbnRyb2xQbHVnaW4qIFZl cnNpb25Db250cm9sT2JzZXJ2ZXI6OnNlYXJjaFBsdWdpbihjb25zdCBLVXJsJiBkaXJlY3Rvcnkp IGNvbnN0CiB7CiAgICAgc3RhdGljIGJvb2wgcGx1Z2luc0F2YWlsYWJsZSA9IHRydWU7CmRpZmYg LS1naXQgYS9kb2xwaGluL3NyYy92aWV3cy92ZXJzaW9uY29udHJvbC92ZXJzaW9uY29udHJvbG9i c2VydmVyLmggYi9kb2xwaGluL3NyYy92aWV3cy92ZXJzaW9uY29udHJvbC92ZXJzaW9uY29udHJv bG9ic2VydmVyLmgKaW5kZXggNTAxYWY3ZC4uOTQzMTUzNyAxMDA2NDQKLS0tIGEvZG9scGhpbi9z cmMvdmlld3MvdmVyc2lvbmNvbnRyb2wvdmVyc2lvbmNvbnRyb2xvYnNlcnZlci5oCisrKyBiL2Rv bHBoaW4vc3JjL3ZpZXdzL3ZlcnNpb25jb250cm9sL3ZlcnNpb25jb250cm9sb2JzZXJ2ZXIuaApA QCAtMTA5LDYgKzEwOSwxMCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCB1cGRhdGVJdGVtU3RhdGVz KCk7CiAKKyAgICBpbnQgY3JlYXRlSXRlbXNTdGF0ZUxpc3QoUU1hcDxRU3RyaW5nLCBRVmVjdG9y PEl0ZW1TdGF0ZT4gPiYgaXRlbVN0YXRlcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgaW50IGZpcnN0SW5kZXggPSAwLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBpbnQgY3VycmVudEV4cGFuc2lvbkxldmVsID0gMCk7CisKICAgICAvKioKICAgICAgKiBS ZXR1cm5zIGEgbWF0Y2hpbmcgcGx1Z2luIGZvciB0aGUgZ2l2ZW4gZGlyZWN0b3J5LgogICAgICAq IDAgaXMgcmV0dXJuZWQsIGlmIG5vIG1hdGNoaW5nIHBsdWdpbiBoYXMgYmVlbiBmb3VuZC4KLS0g CjEuOC40Cgo=