#31010: Rebase Tor Browser mobile/ patches for Firefox ESR 68 -------------------------------------------------+------------------------- Reporter: sysrqb | Owner: tbb- | team Type: defect | Status: | needs_review Priority: Medium | Milestone: Component: Applications/Tor Browser | Version: Severity: Normal | Resolution: Keywords: tbb-mobile, tbb-9.0-must-alpha, | Actual Points: TorBrowserTeam201909R | Parent ID: #30429 | Points: Reviewer: | Sponsor: -------------------------------------------------+-------------------------
Comment (by acat): > > b7abcc2f4062fd56869827ecc181e93782ea8127 - > > A couple of changes from the original patch were dropped, why? > > {{{ > > + result.isOnionHost = this.isOnionHost(); > > + result.hasCert = !!this._lastStatus; > > > > // Don't show identity data for pages with an unknown identity or if any > > // mixed content is loaded (mixed display content is loaded by default). > > @@ -5757,7 +5769,7 @@ var IdentityHandler = { > > // hasMatchingOverride does not handle that, so avoid calling it. > > // Updating the tooltip value in those cases isn't critical. > > // FIXME: Fixing bug 646690 would probably makes this check unnecessary > > - if (this._lastLocation.hostname && > > + if (this._lastLocation.hostname && iData.cert && > > }}} > > These were due to merge conflict. The first diff did not change, but I did miss the additional iData.cert check in the second. Good catch, thanks. > > }}} I think I missed to list the other change from the original patch that was dropped, which is https://gitweb.torproject.org/tor- browser.git/tree/mobile/android/chrome/content/browser.js?h=tor- browser-60.8.0esr-9.0-1&id=260599b2d1da147f420421c217f413f9bc50e23d#n5562. I also missed the fact that `this._lastStatus` is not there anymore. I think replacing `this._lastStatus` by `this._lastSecInfo` should work in both cases. I suspect this might be causing the issue of the onion icon with the fixup in https://gitweb.torproject.org/user/gk/tor- browser.git/log/?h=30429_test, so I'll try to do a build and check if this fixes it. -- Ticket URL: <https://trac.torproject.org/projects/tor/ticket/31010#comment:33> Tor Bug Tracker & Wiki <https://trac.torproject.org/> The Tor Project: anonymity online
_______________________________________________ tor-bugs mailing list tor-bugs@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs