STR: * receive a SMS while the app is not displayed => you should get a notification * kill the app * click the notification Expected: * the app launches, the sms is displayed in the app Actual: * the sms is displayed like a class0 message The problem is that we incorrectly rely on a "type" param being either "sms" or "mms", whereas that type is only set for class0 messages.

--- apps/sms/js/activity_handler.js | 17 +++---- apps/sms/test/unit/activity_handler_test.js | 66 ++++++++++++++++++++++++++- apps/sms/test/unit/mock_utils.js | 1 + 3 files changed, 75 insertions(+), 9 deletions(-) Sorry, I can't open a PR because github seems done for my repository now :( This applies on top of patch for Bug 867885

asking leo+ on this because this is a regression from mms patches.

Comment on attachment 754913 [details] [diff] [review] patch v1 Review of attachment 754913 [details] [diff] [review]: ----------------------------------------------------------------- I still hate the async getSelf() - we should be able to mock that away with one of these, either way! r=me

carrying r=gnarf. removed the async part in the mozApps mock, added one test, and fixed one bug (I missed a return in the right place). opened PR https://github.com/mozilla-b2g/gaia/pull/10068 and waiting for travis

unrelated lint error on travis. master: 33abecaf661a4bb7440726c8809748368cc9af60

master: https://github.com/mozilla-b2g/gaia/commit/33abecaf661a4bb7440726c8809748368cc9af60

oops somehow forgot to resolve/fixed the bug, thanks ;)

I was not able to uplift this bug to v1-train. If this bug has dependencies which are not marked in this bug, please comment on this bug. If this bug depends on patches that aren't approved for v1-train, we need to re-evaluate the approval. Otherwise, if this is just a merge conflict, you might be able to resolve it with: git checkout v1-train git cherry-pick -x 33abecaf661a4bb7440726c8809748368cc9af60 <RESOLVE MERGE CONFLICTS> git commit

after applying the 872395 cherry pick, this picks clean

v1-train: a86878d4ac90b4cc2792c247d08455f6e4ee1769