Closed
Bug 1057310
Opened 11 years ago
Closed 11 years ago
[email/activesync] Duplicate case label in GELAM/js/activesfunc/folder.js
Categories
(Firefox OS Graveyard :: Gaia::E-Mail, defect)
Tracking
(Not tracked)
RESOLVED
FIXED
People
(Reporter: max, Assigned: kgrandon)
Details
Attachments
(2 files)
There is a case for 'asb.FileReference' both on line 1308 (https://github.com/mozilla-b2g/gaia/blob/master/apps/email/js/ext/mailapi/activesync/configurator.js#L1308) and on line 1322 (https://github.com/mozilla-b2g/gaia/blob/master/apps/email/js/ext/mailapi/activesync/configurator.js#L1322); the latter is unreachable.
Comment 1•11 years ago
|
||
Thanks for the report!
configurator.js is an optimized build-file, the true source code is: https://github.com/mozilla-b2g/gaia-email-libs-and-more/blob/master/data/lib/mailapi/activesync/folder.js#L782
It looks like this is harmless-ish, specifically, we have:
var attachDataText = attachData.children.length ? attachData.children[0].textContent : null;
case asb.FileReference:
case em.AttName:
attachment.part = attachDataText;
break;
case asb.FileReference:
case em.Att0Id:
attachment.part = attachData.children[0].textContent;
break;
These three distinct case clauses probably want to be consolidated.
Status: UNCONFIRMED → NEW
Ever confirmed: true
Summary: Duplicate case label in apps/email/js/ext/mailapi/activesync/configurator.js → [email/activesync] Duplicate case label in GELAM/data/lib/mailapi/activesync/folder.js
| Assignee | ||
Comment 2•11 years ago
|
||
It seems the linked files no longer exist, and the new configurator does not have this problem. I believe this was fixed in bug 885110.
Closing this out for now, but please re-open or file a new bug if this issue still exists. Thanks for the report.
Status: NEW → RESOLVED
Closed: 11 years ago
Resolution: --- → WORKSFORME
Comment 3•11 years ago
|
||
Thanks for looking into this, Kevin! Unfortunately the deficiency still exists. The gaia path is now apps/email/js/ext/activesync/folder.js. The GELAM path is now js/activesfunc/folder.js.
Status: RESOLVED → REOPENED
Resolution: WORKSFORME → ---
| Assignee | ||
Comment 4•11 years ago
|
||
Cool - thanks for the updated path :)
Summary: [email/activesync] Duplicate case label in GELAM/data/lib/mailapi/activesync/folder.js → [email/activesync] Duplicate case label in GELAM/js/activesfunc/folder.js
| Assignee | ||
Comment 5•11 years ago
|
||
Maybe I'll spin a quick patch here.
Assignee: nobody → kgrandon
Status: REOPENED → ASSIGNED
Comment 6•11 years ago
|
||
Comment 7•11 years ago
|
||
| Assignee | ||
Comment 8•11 years ago
|
||
Comment on attachment 8570642 [details] [review]
[gaia-email-libs-and-more] KevinGrandon:bug_1057310_consolidate_switch_statement > mozilla-b2g:master
Andrew - does this look ok? If so, am I good to update gaia as well? Thanks!
Attachment #8570642 -
Flags: review?(bugmail)
Comment 9•11 years ago
|
||
Comment on attachment 8570642 [details] [review]
[gaia-email-libs-and-more] KevinGrandon:bug_1057310_consolidate_switch_statement > mozilla-b2g:master
Yep, this is the right fix per my understanding of my comments in comment 1. Thanks very much to both you and Max (and semmle; I enjoyed the brownbag!)
Attachment #8570642 -
Flags: review?(bugmail) → review+
Comment 10•11 years ago
|
||
And a GELAM r+ is always good for propagation through to gaia. (We get into trouble if we don't propagate promptly. I am of course willing to cede the hassle of that to the great and powerful autolander, of course! :)
Comment 11•11 years ago
|
||
Comment on attachment 8570644 [details] [review]
[gaia] KevinGrandon:bug_1057310_update_gelam_folder > mozilla-b2g:master
and I guess autolander might need my explicit r+ here? just in case...
Attachment #8570644 -
Flags: review+
| Assignee | ||
Comment 12•11 years ago
|
||
Thanks Andrew. I'm going to try adding checkin-needed to see what happens with two pull requests from different repos here. I've never done this before, so I'm not sure what will happen.
Keywords: checkin-needed
Updated•11 years ago
|
Keywords: checkin-needed
Comment 13•11 years ago
|
||
Pull request has landed in master: https://github.com/mozilla-b2g/gaia-email-libs-and-more/commit/0107b93f3c72d99b82e2d56fd25cffb34722b836
Updated•11 years ago
|
Status: ASSIGNED → RESOLVED
Closed: 11 years ago → 11 years ago
Resolution: --- → FIXED
Comment 14•11 years ago
|
||
Pull request has landed in master: https://github.com/mozilla-b2g/gaia/commit/560f9866381a5ab96306aa7acc3ff257a9836169
| Assignee | ||
Comment 15•11 years ago
|
||
(In reply to Kevin Grandon :kgrandon from comment #12)
> Thanks Andrew. I'm going to try adding checkin-needed to see what happens
> with two pull requests from different repos here. I've never done this
> before, so I'm not sure what will happen.
Seemed to work ok. Probably would not be ideal if one pull request failed, but I'll deal with that later!
Comment 16•11 years ago
|
||
Yeah, it seems to work well enough that I think the parallel landing will be our new workflow. (Back when we checked the optimized byproducts into gaia, this would not have been safe, but now it should be pretty fine.) I recently checked in :lightsofapollo's patch that makes TC re-run things up to four times for GELAM to get a success, which should probably be sufficient to deal with mozTCPSocket's non-trivial probability of segfaulting the process.
| Assignee | ||
Comment 17•11 years ago
|
||
Sounds good. The case I am worried about is if the bug is marked as resolved but not all patches succeeded in landing.
Anyway, give it a shot and if you run into some weirdness/difficulty please file a bug for me.
You need to log in
before you can comment on or make changes to this bug.
Description
•