Commit Graph

741 Commits

Author SHA1 Message Date
Richard Newman
ae5fa5496d Merge m-c to s-c (including fixed conflict in Android Sync manifest).
--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml
rename : mobile/android/base/resources/drawable/tabs_button.xml.in => mobile/android/base/resources/drawable/tabs_button.xml
rename : mobile/android/base/resources/drawable/tabs_level.xml.in => mobile/android/base/resources/drawable/tabs_level.xml
2012-12-15 17:08:14 -08:00
Richard Newman
307f125357 Bug 819262 - Additional tests for bookmark application in Sync. r=gps 2012-12-14 14:00:40 -08:00
Richard Newman
9b3f517b2c Merge m-c to s-c. 2012-12-10 13:01:43 -08:00
Richard Newman
72aec78531 Merge m-c to s-c. 2012-12-05 23:59:56 -08:00
Richard Newman
94f98fa525 Bug 817232 - Don't apply incoming deletions for special folders. r=gps 2012-12-04 16:49:55 -08:00
Michal Jaskurzynski
565345c3a0 Bug 424712 - Server location needs a slash at the end. r=rnewman 2012-11-12 09:48:26 -08:00
Richard Newman
e2b248c2fe Bug 804479 - Intermittent test_password_tracker.js, test_history_tracker.js, test_bookmark_store.js, test_forms_tracker.js | test failed (with xpcshell return code: -2147483645), "ASSERTION: thread pool wasn't shutdown… " r=gps 2012-12-05 16:46:25 -08:00
Richard Newman
5098856c67 Bug 693427 - More logging and fixes for filelog cleanup. r=gps 2012-11-05 16:05:06 -08:00
Richard Newman
38d8a32d05 Bug 693427 - Intermittent TEST-UNEXPECTED-FAIL | xpcshell/tests/services/sync/tests/unit/test_errorhandler_filelog.js | test failed (with xpcshell return code: 0) | false == true. r=trivial 2012-10-31 17:07:16 -07:00
Richard Newman
741f79754f Bug 806460 - Part 2: more nuanced rejection of malformed records. r=me (fix bustage). 2012-10-29 17:47:04 -07:00
Richard Newman
717259d254 Bug 806460 - Part 1: NS_ERROR_ILLEGAL_VALUE in nsINavBookmarksService.insertBookmark while inserting query. r=gps 2012-10-29 15:24:52 -07:00
Richard Newman
2596e53835 Bug 806460 - Part 0: modernize test_bookmark_store.js. r=gps 2012-10-29 15:22:31 -07:00
Richard Newman
4981c7a585 Bug 795800 - Rework test_addons_store to be more robust. r=gps
* * *
Bug 804480 - Intermittent test_addons_store.js test_addons_store.js | test failed (with xpcshell return code: 0), | Error: 1 or more add-ons failed to install. r=gps
2012-10-25 16:51:32 -07:00
Richard Newman
85e271bf40 Bug 804480 - Intermittent test_addons_store.js test_addons_store.js | test failed (with xpcshell return code: 0), | Error: 1 or more add-ons failed to install. r=gps 2012-10-23 17:44:33 -07:00
Gregory Szorc
d80995d66c Merge mozilla-central into services-central 2012-09-25 11:00:01 -07:00
Gregory Szorc
57f832b750 Bug 792546 - Part 5: Clean up excessive imports; r=rnewman 2012-09-24 13:46:19 -07:00
Gregory Szorc
4fd177cc88 Bug 792546 - Part 4: Move utility functions to testing-only JS module; r=rnewman 2012-09-24 13:45:49 -07:00
Gregory Szorc
4738a22baf Bug 792546 - Part 2: Move fake services into testing-only JS module; r=rnewman
We still import these functions in head.js. This will be cleaned up
later once functionality from head.js that uses them is moved into a
testing-only JS module.
2012-09-24 13:42:54 -07:00
Gregory Szorc
421a02f52c Bug 792546 - Part 1: Move rotary engine to a testing-only JS module; r=rnewman 2012-09-24 13:42:31 -07:00
Gregory Szorc
3b76165d39 Bug 792990 - Properly handle add-ons when resetting Sync; r=rnewman
Due to a bug in the add-on sync implementation, resetting Sync would
cause all add-ons to be uninstalled and not replaced with the server
data.
2012-09-21 11:22:59 -07:00
Gregory Szorc
216e4ddfbc Merge mozilla-central into services-central 2012-09-18 11:37:04 -07:00
Gregory Szorc
187933e7d7 Bug 787273 - Part 7: Expose Status an an instance variable on Service; r=rnewman
The global Status is still there. But Service and its derived objects
avoid the singleton lookup.

There are likely a few lingering tests that reference Status when they
should reference Service.status. These will be dealt with when Status is
refactored.
2012-09-14 16:02:33 -07:00
Gregory Szorc
43c6e1d377 Bug 787273 - Part 6: Remove Weave export from service.js; r=rnewman
This is mostly minor cosmetic changes. Weave was being exported from
service.js for no apparent reason. It was mostly used by tests.

There was a reference to it in engines.js, which should have been caught
when the engines were associated with a service instance. engines.js now
does the right thing.

Weave is no longer exported by service.js. Tests and modules no longer
import main.js.

WeaveSvc was also renamed to Sync11Service because why not.

Weave continues to be the main public API.
2012-09-14 16:02:33 -07:00
Gregory Szorc
98dea330a4 Bug 787273 - Part 5: Remove the CollectionKeys singleton; r=rnewman
CollectionKeys is gone. Instead, we export CollectionKeyManager (the
underlying type) and an instance is available on the Service singleton.
2012-09-14 16:02:33 -07:00
Gregory Szorc
48db52e99d Bug 787273 - Part 4: Refactor Identity to not be a singleton; r=rnewman
Access to IdentityManager functionality now goes through the Service
singleton.
2012-09-14 16:02:33 -07:00
Gregory Szorc
d9a82c9c27 Bug 787273 - Part 3: Don't rely on Identity in SyncStorageRequest; r=rnewman
The Identity singleton is going away. This refactors SyncStorageRequest
to not use it. Behavior now works like Resource. Instances are obtained
from the Service singleton and have authentication functionality
attached.
2012-09-14 16:02:32 -07:00
Gregory Szorc
58bcd2801d Bug 787273 - Part 2: Refactor Resource and Record to not rely on singletons; r=rnewman
Resource currently relies on the Identity singleton to perform
authentication. This is bad magic behavior. Resource instances should
authenticate according to the service instance they are associated with.

This patch removes Identity magic from Resource. Everything using
Resource now explicitly assigns an authenticator which comes from
the service instance/singleton. This required API changes to Collection
and Record.

The preferred method to obtain a Resource instance is to call
getResource() on a service instance.

The end result of this patch looks a little weird, especially in test
code. You have things like Service.resource(Service.cryptoKeysURL).
This ugliness will go away when a unified storage service client is
used.
2012-09-14 16:02:32 -07:00
Gregory Szorc
c9586f34a5 Bug 787273 - Part 1: Remove Records singleton; r=rnewman
RecordManager is now an instance of the Service singleton and holds a
reference back to the service which is used to obtain needed "global"
state.
2012-09-14 16:02:32 -07:00
Benjamin Peterson
596c02ba13 Bug 782272 - Only clear the _lazySave timer if it's there. r=gps 2012-09-24 17:06:10 -04:00
Gregory Szorc
097529bf10 Bug 792990 - Properly handle add-ons when resetting Sync; r=rnewman
Due to a bug in the add-on sync implementation, resetting Sync would
cause all add-ons to be uninstalled and not replaced with the server
data.
2012-09-21 11:24:24 -07:00
Gregory Szorc
892b21e25b Bug 786489 - Part 2: Change username through Identity not prefs; r=rnewman
The preferred way to change the username is through the Identity
singleton, not by updating a pref and hoping the side-effect is what you
want.
2012-08-29 14:43:41 -07:00
Gregory Szorc
5f41f9020f Bug 786489 - Part 1: Update serverURL and clusterURL through Service; r=rnewman
The preferred method to update serverURL and clusterURL is by going
through the SyncService Service singleton, not by setting preferences.
2012-08-29 14:43:41 -07:00
Gregory Szorc
ae2a788f16 Bug 785225 - Part 11: Burninate trailing whitespace from tests; r=rnewman 2012-08-29 14:43:41 -07:00
Gregory Szorc
45d3f90cf3 Bug 785225 - Part 9: Refactor engines to not use singletons; r=rnewman
Engines now maintain a reference to the service they belong to. This
allows them to obtain references to other engine instances belonging to
that service and that service only.

Stores and trackers now maintain a reference to the engine they belong
to.

Engine managers now maintain a reference back to a service.

The clients singleton has been removed. It now exists as an instance
variable on Service. Parts of ClientsEngine do behave as singletons
(e.g. commands). This will be addressed in future refactoring.
2012-08-29 14:43:41 -07:00
Gregory Szorc
88f9794fe7 Bug 785225 - Part 8: Don't expose SyncScheduler as a singleton; r=rnewman 2012-08-29 14:43:41 -07:00
Gregory Szorc
db187465ed Bug 785225 - Part 7: Bind SendCredentialsController to a Service instance; r=rnewman 2012-08-29 14:43:40 -07:00
Gregory Szorc
5628a0cd3b Bug 785225 - Park 6: Move StorageCredentialsController to jpakeclient.js; r=rnewman
I'm not sure why it was in policies.js, as it has everything to do with
J-PAKE exchange.
2012-08-29 14:43:40 -07:00
Gregory Szorc
bb5d240869 Bug 785225 - Part 5: Partial removal of Clients singleton; r=rnewman
Clients was being exported and used as a singleton. We still use Clients
as a singleton in some places, but only in test code. The preferred
method to access Clients is now through a service instance.
Weave.Clients is no longer exposed. Callers go through Weave.Service
now.
2012-08-29 14:43:40 -07:00
Gregory Szorc
57684fd336 Bug 785225 - Part 4: Remove unused exports from Weave; change engine loading; r=rnewman
Lots of exports from the Weave global object weren't being used. This
also changes how engines are loaded. There is now a mapping in
service.js of engine name to filename. Before, it was looking at Weave.
2012-08-29 14:43:40 -07:00
Gregory Szorc
b11d37e791 Bug 785225 - Part 3: Don't expose ErrorHandler as a singleton; r=rnewman
Some tests still expect there to only be a single instance of
ErrorHandler for the life of the tests. And, ErrorHandler itself is
pretty tighly coupled with being a singleton because it writes out
changes to prefs, etc. But, it's a step in the right direction.
2012-08-29 14:43:40 -07:00
Gregory Szorc
512b106c9a Bug 783721 - Refactor User API service interaction; r=rnewman 2012-08-29 14:43:39 -07:00
Allison Naaktgeboren
a7be27abcd Bug 644734; r=gps 2012-09-12 15:08:07 -07:00
Jim Mathies
69aa589ced Bug 817076 - Update various services paths to point to the gre. r=gps 2012-12-05 16:36:27 -06:00
Gregory Szorc
78da7d80a6 Merge mozilla-central into services-central 2012-08-20 09:34:02 -07:00
Gregory Szorc
70ae3d2aef Bug 781952 - Part 3: Remove unused Service._updateCluster; r=rnewman 2012-08-14 11:34:28 -07:00
Gregory Szorc
46d44b7e4f Bug 781952 - Part 2: Move cluster management out of service.js; r=rnewman 2012-08-14 11:34:20 -07:00
Gregory Szorc
02c00a0d0b Bug 781952 - Part 1: Refactor engine syncing logic out of service.js; r=rnewman 2012-08-14 11:34:14 -07:00
Gregory Szorc
b2d302b359 Bug 618233 - Re-disable test_jpakeclient.js on Windows for oranges; r=rnewman 2012-08-13 10:29:28 -07:00
Gregory Szorc
ca4707e2b9 Bug 618233 - Enable test_jpakeclient.js on Windows; r=rnewman
May trigger intermittent oranges. Trying to reproduce so we can triage.
2012-08-08 16:43:05 -07:00
Gregory Szorc
cd1c493cc9 Bug 779391 - Move deepCopy into CommonUtils; r=rnewman 2012-08-01 12:05:29 -07:00