Merge lp://qastaging/~mikemc/ubuntuone-ios-files/use-asset-ids-everywhere into lp://qastaging/ubuntuone-ios-files
Proposed by
Mike McCracken
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 102 |
Merged at revision: | 102 |
Proposed branch: | lp://qastaging/~mikemc/ubuntuone-ios-files/use-asset-ids-everywhere |
Merge into: | lp://qastaging/ubuntuone-ios-files |
Prerequisite: | lp://qastaging/~mikemc/ubuntuone-ios-files/quiet-crashlytics |
Diff against target: |
709 lines (+175/-143) 14 files modified
Files/U1AssetRepresenationDataProvider.h (+2/-3) Files/U1AssetRepresenationDataProvider.m (+11/-4) Files/U1AutoUploadOperation.h (+1/-2) Files/U1AutoUploadOperation.m (+20/-23) Files/U1AutoUploadsManager.m (+33/-31) Files/U1FilesClient.h (+2/-2) Files/U1FilesClient.m (+44/-45) Files/U1FilesService.h (+3/-2) Files/U1FilesService.m (+13/-3) Files/U1FolderViewController.m (+1/-3) Files/U1MagicUploadDataProvider.h (+2/-2) Files/U1MagicUploadDataProvider.m (+12/-5) Files/U1UploadOperation.h (+2/-4) Files/U1UploadOperation.m (+29/-14) |
To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-ios-files/use-asset-ids-everywhere |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Approve | ||
Review via email:
|
Commit message
- Simplify concurrent operation interfaces
Description of the change
- Simplify concurrent operation interfaces
Pass asset IDs instead of non-threadsafe asset objects to NSOperation subclasses to ease verifying the thread-safety of accesses.
In some cases it was OK to pass the asset objects, as they may have been created on the same thread that the operation accesses them on, but the operation itself is intended to be concurrent and it should be OK to assume that you can run an NSoperation object anywhere without thread safety issues - you shouldn't have to carefully inspect the operation code every time you change how you run it.
To post a comment you must log in.
6 -// Copyright 2011 Canonical Ltd.
7 +// Copyright 2013 Canonical Ltd.
2011-2013 instead, and more of same changes.