Commit Graph

16230 Commits

Author SHA1 Message Date
Wes Kocher
a2dfd3e7e0 Merge m-c to fx-team a=merge CLOSED TREE 2015-03-30 19:42:25 -07:00
Wes Kocher
1900a0add0 Merge fx-team to m-c a=merge 2015-03-30 14:30:57 -07:00
Richard Newman
7378c12a0d Bug 1148464 - Remove redundant addUploadedRecord method. 2015-03-30 11:56:24 -07:00
ffxbld
78dfbf6c8b Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2015-03-30 11:44:20 -07:00
Ryan VanderMeulen
8e01962094 Backed out changeset 7b1cb7256f0f (bug 1126048) for robocop failures. 2015-03-30 14:03:00 -04:00
Kartikaya Gupta
fe13e72933 Bug 1148857 - Use a valid property string for password prompt dialogs. r=liuche 2015-03-30 11:13:00 -04:00
Martyn Haigh
519700f411 Bug 1146589 - Ensure that tab opened with "open now" action is selected and visible when fennec loads (r=mcomella) 2015-03-30 10:45:03 +01:00
Martyn Haigh
5e872e15e3 Bug 1148007 - Show Queue Tab toast only if Tab Queue preference is enabled (r=mcomella) 2015-03-30 10:21:06 +01:00
vivek
c1d19dcaab Bug 1142528 - Decrease tappable area for +/- buttons. r=margaret 2015-03-27 19:37:07 +02:00
Sebastian Kaspari
b36b78391b Bug 1126048 - Add test to ensure state is correct when switching to loading pages. r=mcomella 2015-03-29 17:27:38 +02:00
Ehsan Akhgari
a4133ca9b9 Bug 1148787 - Ensure that the sessionstore properties exist on the browser object before reading them; r=bnicholson 2015-03-28 21:23:58 -04:00
Phil Ringnalda
ea054eea04 Merge m-c to m-i to m-c merge, a=mergemerge 2015-03-28 11:45:00 -07:00
Phil Ringnalda
870ac05194 Merge m-i to m-c, a=merge 2015-03-28 11:44:16 -07:00
Chenxia Liu
ea4ef29a33 Bug 1144385 - Strings for editing login in password doorhanger. r=MattN 2015-03-27 14:33:58 -07:00
Nick Alexander
555d7c3eaf Bug 1123388 - Enable reading list service on Nightly. r=rnewman,mfinkle 2015-03-27 18:01:02 -07:00
Nick Alexander
cba42d6ef0 Bug 1140813 - Schedule periodic Reading List syncs. r=rnewman
========

a249e77fd1
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1140813 - Schedule periodic Reading List syncs.
2015-03-27 17:05:15 -07:00
Nick Alexander
9228eca361 Bug 1140812 - React to Backoff and Retry-After headers from Reading List storage servers. r=rnewman
========

cd7edfa0b5
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1140812 - Part 3: React to Backoff and Retry-After headers.

========

8581f5a572
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Fri Mar 27 15:30:33 2015 -0700

    Bug 1140812 - Part 2: Include request in HTTP response observation callbacks.

    This allows to only handle responses from certain hosts.

========

05b50325db
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Fri Mar 27 14:47:38 2015 -0700

    Bug 1140812 - Part 1: Generalize from one to many HTTP response observers.

    CopyOnWriteArrayList is a reasonable choice here: we have few writes but
    many iterations.  See
    http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/CopyOnWriteArrayList.html

========

5950219343
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Fri Mar 27 16:04:07 2015 -0700

    Bug 1140812 - Pre: Modernize backoffInSeconds.

    Sync uses X-Backoff; newer services, including Reading List, use Backoff.
2015-03-27 16:01:36 -07:00
Richard Newman
034aad3db7 Bug 1148432 - Sync reading list deletions. r=nalexander 2015-03-27 11:54:16 -07:00
Nick Alexander
9eaa30d013 Bug 1148029 - Disable Reading List sync when using custom endpoints. r=rnewman
This tries to sync prod accounts against prod Reading List, stage
accounts against stage Reading List, and reject all other account
servers.  Custom Sync (Token) servers (not prod, not stage) should cause
us not to Sync Reading List, the intention being to avoid storing data
with Mozilla if the user has expressed a desire not to.

========

b69b097505
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1148029 - Disable Reading List sync when using custom endpoints.

    Custom is interpreted to mean neither Mozilla production nor Mozilla
    stage.  To ease the burden of testing stage, we sync the reading list
    against stage reading list storage when the account is authing against
    stage FxA.

    Messaging this in some way would be nice but will have to wait for
    follow-up.
2015-03-27 11:24:04 -07:00
Ryan VanderMeulen
9c0db5ac32 Merge m-c to inbound. a=merge
CLOSED TREE
2015-03-27 11:17:04 -04:00
Andrea Marchesini
b212600c95 Bug 1148527 - Indentation fix after bug 1145631, r=ehsan 2015-03-27 18:52:19 +00:00
Martyn Haigh
f76a6a0508 Bug 1145581 - Show tabs when opening fennec from the Tab Queue notification (r=mcomella) 2015-03-27 11:58:30 +00:00
Martyn Haigh
47cc454e04 Bug 1146325 - Convert loaded tab queue data to the required format and send to gecko to open (r=margaret) 2015-03-27 11:47:41 +00:00
Martyn Haigh
c815704be0 Bug 1145579 - Open tab queue file when fennec starts or resumes (r=mcomella) 2015-03-27 11:40:49 +00:00
Wes Kocher
dd8a8fcae7 Merge m-c to inbound a=merge CLOSED TREE 2015-03-26 17:46:35 -07:00
Michael Comella
306a540793 Bug 1147661 - Use new device icons in share overlay. r=liuche 2015-03-26 10:06:51 -07:00
Michael Comella
74c00f6576 Bug 1147661 - Add new device assets. r=liuche 2015-03-26 10:06:05 -07:00
Michael Comella
6f584fe969 Bug 1148197 - Move share overlay margins to child to properly align. r=liuche
When it's on the parent of the outermost container with
layout_width="match_parent", the margin adds to the parent's size
(i.e. the screen width). Adding the margin to the child ensures the width is
reduced and content centered.
2015-03-26 17:42:47 -07:00
Michael Comella
6de2a14a8a Bug 1148041 - Inherit from Gecko theme in share overlay. r=liuche 2015-03-26 17:31:34 -07:00
Chenxia Liu
1c1fe0512c Bug 1143939 - Add single-item delete to about:passwords context menu. r=ally 2015-03-26 10:42:34 -07:00
Chenxia Liu
e42468381a Bug 1088220 - Update tests with new strings. r=margaret 2015-03-25 17:29:01 -07:00
Chenxia Liu
d4ad90e9c2 Bug 1088220 - Add login doorhanger. r=margaret 2015-03-26 16:34:29 -07:00
Chenxia Liu
45d4382eea Bug 1088220 - Switch to using DoorhangerConfig. r=margaret 2015-03-23 20:34:58 -07:00
Chenxia Liu
4de91f73a1 Bug 1088220 - Add Config for Doorhangers. r=margaret 2015-03-23 20:27:21 -07:00
Chenxia Liu
00d8944097 Bug 1088220 - Add key icon resources. r=margaret 2015-03-23 20:20:53 -07:00
Richard Newman
cb73ae6464 Bug 1147473 - Follow-up: move ReadingListConstants to avoid build flag pain. 2015-03-27 13:11:08 -07:00
Nick Alexander
35c4d91d0e Bug 1148504 - Protect Firefox Account state with a critical section. r=rnewman
========

8b1d353ee8
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1148504 - Part 2: Make updating Firefox Account state happen in a critical section.

    It's worth noting that the two consumers of the shared state lock will
    only race for a very short window -- essentially only when creating or
    re-connecting an account.

    That's because Reading List oauth tokens are long-lived and do not
    expire (yet) in response to remote Account state changes, such as
    updating the Account password.  So Sync and RL will race to initialize
    the Account state; eventually RL will get an oauth token; and that token
    will be cached forever until RL produces a 401 for the token or Android
    expires the token.

    Since Sync requests a token server token at the start of every sync, the
    lock will be constantly exercised, but should never block.

========

d7a8611810
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Fri Mar 27 08:27:28 2015 -0700

    Bug 1148504 - Part 1: Reduce scope of section that may set Account state.

    The only place that might throw a TokenServerException is the token
    server client code itself.  By handling such an exception earlier, we
    reduce the scope of the section that may update the Firefox Account
    state.  (This comes at the cost of threading AndroidFxAccount into
    syncWithAssertion, but c'est la vie.)

    This does not interact with the exist handling of 401s that we might see
    from the storage endpoint.  Those 401s never generated
    TokenServerExceptions; in fact, they were (essentially) ignored.  Since
    we fetch a fresh token every Sync, what was (and is) expected is that
    such 401s would be transient and fixed by authenticating with a fresher
    token.

    Test plan: manually verify that remotely changing the Firefox Account's
    password while the device is in the Married state does the following:

    1) uses the cached certificate to generate a local assertion;
    2) the assertion produces a 401 from the TokenServerException, since the
    certificate is no longer fresh;
    3) the TokenServerException drives the Account state to Cohabiting;
    4) the state machine discovers it cannot /sign, driving the Account
    state to Separated.
2015-03-27 10:01:35 -07:00
Nick Alexander
32984be1dd Bug 1142596 - Use cached FxA OAuth tokens in Reading List sync. r=rnewman
========

9b406122ef
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1142596 - Post: Use production OAuth and Reading List endpoints.

========

9e5368b4aa
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 23:00:34 2015 -0700

    Bug 1142596 - Part 4: Make ReadingListSyncAdapter use oauth tokens produced and cached by the authenticator.

========

fbef93698d
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:49:52 2015 -0700

    Bug 1142596 - Part 3: Implement getAuthToken with token types of the form oauth::scope.

    Be aware that there are two levels of token invalidation relevant here.
    The first level is when a consumer uses an oauth token and gets a 401;
    in this case, the consumer *must* call Android's own
    invalidateAuthToken.  The second level is when the oauth client itself
    gets a 401 trying to fetch an oauth token; in this case, the internal
    state of the Firefox Account needs to be pushed back.

========

e4e2247b4e
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:43:26 2015 -0700

    Bug 1142596 - Part 2: Extract login state machine delegate encapsulating expirations.

========

f1f716cc88
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:14:47 2015 -0700

    Bug 1142596 - Part 1: Surface Reading List authentication errors.

========

5833cbbf71
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:01:46 2015 -0700

    Bug 1142596 - Pre: Add note about deleting cached oauth tokens.

    Deleting cached oauth tokens is tracked by Bug 1147245.

========

b0165a6c14
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 23:06:49 2015 -0700

    Bug 1142596 - Pre: Trim imports.
2015-03-26 14:13:58 -07:00
Nick Alexander
3b37971140 Bug 1147473 - Expose Firefox Account debug information from Settings activity. r=rnewman
========

afcbbba32c
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 1147473 - Part 2: Make it possible to toggle Firefox Accounts debug / PII logging at runtime.

    Tap the email address in the Firefox Account settings activity 5 times.
    Only available when:
    !defined(MOZILLA_OFFICIAL) || defined(NIGHTLY_BUILD) || defined(MOZ_DEBUG)

========

261f912d12
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:10:05 2015 -0700

    Bug 1147473 - Part 1: Add additional (dangerous!) debug commands.

    These make it easier to test oauth token authorization, especially using
    stage servers.

========

c1509baa77
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:06:43 2015 -0700

    Bug 1142596 - Pre: Move constants around.

========

2c676500c3
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu Mar 26 11:28:22 2015 -0700

    Bug 1142596 - Pre: Make it easier to construct intermediate states.
2015-03-24 23:24:27 -07:00
Chenxia Liu
dac369fe4b Bug 1088220 - Split DoorHanger to support other doorhangers. r=margaret 2015-03-18 15:51:10 -07:00
Richard Newman
320928c036 Bug 1147992 - Be paranoid when reading strings from intents, yet again. r=mfinkle 2015-03-26 16:55:45 -07:00
Nick Alexander
c48f0df56c Bug 1140810 - Upload material (non-status) Reading List modifications. r=rnewman
========

575d80fddb
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Mar 25 16:35:26 2015 -0700

    Bug 1140810 - Part 2: Upload material (non-status) modifications.

========

a86e734ef1
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Mar 25 10:56:07 2015 -0700

    Bug 1140810 - Part 1: Add storage test for material (non-status) modifications.

========

2259378d08
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Mar 25 13:33:13 2015 -0700

    Bug 1140810 - Part 0: Add and use HTTP PATCH.

========

0222d53d98
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Mar 25 14:49:19 2015 -0700

    Bug 1140810 - Pre: Don't fail in status upload when there are no failures.

========

7f2feede3b
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Mar 25 14:53:45 2015 -0700

    Bug 1140810 - Pre: convert 4 spaces to 2 spaces.

========

49e80d271e
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Mar 25 10:40:26 2015 -0700

    Bug 1140810 - Pre: Fix whitespace.
2015-03-26 15:47:20 -07:00
Margaret Leibovic
a4e342f9b6 Bug 1146373 - Don't resize reader view images in JS. r=Gijs 2015-03-23 16:55:26 -07:00
Michael Comella
7544e80fc8 Bug 1148041 - Have the ShareOverlay text styles inherit from the default TextAppearance. r=liuche 2015-03-26 12:06:24 -07:00
Ryan VanderMeulen
c24b7b2a62 Backed out 3 changesets (bug 1147473, bug 1148504, bug 1142596) for bustage.
Backed out changeset c4639723e721 (bug 1148504)
Backed out changeset 6c3fd5d5aa40 (bug 1142596)
Backed out changeset 24bf86f4b440 (bug 1147473)

DONTBUILD CLOSED TREE
2015-03-27 15:41:53 -04:00
Nick Alexander
ee16167a35 Bug 1148504 - Protect Firefox Account state with a critical section. r=rnewman
========

8b1d353ee8
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Fri Mar 27 10:01:35 2015 -0700

    Bug 1148504 - Part 2: Make updating Firefox Account state happen in a critical section.

    It's worth noting that the two consumers of the shared state lock will
    only race for a very short window -- essentially only when creating or
    re-connecting an account.

    That's because Reading List oauth tokens are long-lived and do not
    expire (yet) in response to remote Account state changes, such as
    updating the Account password.  So Sync and RL will race to initialize
    the Account state; eventually RL will get an oauth token; and that token
    will be cached forever until RL produces a 401 for the token or Android
    expires the token.

    Since Sync requests a token server token at the start of every sync, the
    lock will be constantly exercised, but should never block.

========

d7a8611810
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Fri Mar 27 08:27:28 2015 -0700

    Bug 1148504 - Part 1: Reduce scope of section that may set Account state.

    The only place that might throw a TokenServerException is the token
    server client code itself.  By handling such an exception earlier, we
    reduce the scope of the section that may update the Firefox Account
    state.  (This comes at the cost of threading AndroidFxAccount into
    syncWithAssertion, but c'est la vie.)

    This does not interact with the exist handling of 401s that we might see
    from the storage endpoint.  Those 401s never generated
    TokenServerExceptions; in fact, they were (essentially) ignored.  Since
    we fetch a fresh token every Sync, what was (and is) expected is that
    such 401s would be transient and fixed by authenticating with a fresher
    token.

    Test plan: manually verify that remotely changing the Firefox Account's
    password while the device is in the Married state does the following:

    1) uses the cached certificate to generate a local assertion;
    2) the assertion produces a 401 from the TokenServerException, since the
    certificate is no longer fresh;
    3) the TokenServerException drives the Account state to Cohabiting;
    4) the state machine discovers it cannot /sign, driving the Account
    state to Separated.
2015-03-27 12:16:46 -07:00
Nick Alexander
bafd49b0cf Bug 1142596 - Use cached FxA OAuth tokens in Reading List sync. r=rnewman
========

9b406122ef
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu Mar 26 14:13:58 2015 -0700

    Bug 1142596 - Post: Use production OAuth and Reading List endpoints.

========

9e5368b4aa
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 23:00:34 2015 -0700

    Bug 1142596 - Part 4: Make ReadingListSyncAdapter use oauth tokens produced and cached by the authenticator.

========

fbef93698d
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:49:52 2015 -0700

    Bug 1142596 - Part 3: Implement getAuthToken with token types of the form oauth::scope.

    Be aware that there are two levels of token invalidation relevant here.
    The first level is when a consumer uses an oauth token and gets a 401;
    in this case, the consumer *must* call Android's own
    invalidateAuthToken.  The second level is when the oauth client itself
    gets a 401 trying to fetch an oauth token; in this case, the internal
    state of the Firefox Account needs to be pushed back.

========

e4e2247b4e
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:43:26 2015 -0700

    Bug 1142596 - Part 2: Extract login state machine delegate encapsulating expirations.

========

f1f716cc88
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:14:47 2015 -0700

    Bug 1142596 - Part 1: Surface Reading List authentication errors.

========

5833cbbf71
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:01:46 2015 -0700

    Bug 1142596 - Pre: Add note about deleting cached oauth tokens.

    Deleting cached oauth tokens is tracked by Bug 1147245.

========

b0165a6c14
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 23:06:49 2015 -0700

    Bug 1142596 - Pre: Trim imports.
2015-03-27 12:16:42 -07:00
Nick Alexander
033e8220a8 Bug 1147473 - Expose Firefox Account debug information from Settings activity. r=rnewman
========

afcbbba32c
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 23:24:27 2015 -0700

    Bug 1147473 - Part 2: Make it possible to toggle Firefox Accounts debug / PII logging at runtime.

    Tap the email address in the Firefox Account settings activity 5 times.
    Only available when:
    !defined(MOZILLA_OFFICIAL) || defined(NIGHTLY_BUILD) || defined(MOZ_DEBUG)

========

261f912d12
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:10:05 2015 -0700

    Bug 1147473 - Part 1: Add additional (dangerous!) debug commands.

    These make it easier to test oauth token authorization, especially using
    stage servers.

========

c1509baa77
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Mar 24 22:06:43 2015 -0700

    Bug 1142596 - Pre: Move constants around.

========

2c676500c3
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu Mar 26 11:28:22 2015 -0700

    Bug 1142596 - Pre: Make it easier to construct intermediate states.
2015-03-27 12:16:38 -07:00
Jannis Pinter
02d2f6532d Bug 1142268 - Tweak layout size for doorhanger shadow. r=liuche 2015-03-22 12:08:35 +01:00
Michael Comella
15d03ac67f Bug 1137483 - Preland Strings for awesomescreen search engine bar. r=margaret 2015-03-26 09:56:24 -07:00