Merge lp:~rockstar/ubuntuone-ios-music/error-handling into lp:ubuntuone-ios-music
- error-handling
- Merge into trunk
Proposed by
Paul Hummer
| Status: | Superseded |
|---|---|
| Proposed branch: | lp:~rockstar/ubuntuone-ios-music/error-handling |
| Merge into: | lp:ubuntuone-ios-music |
| Diff against target: |
2427 lines (+585/-898) 30 files modified
Other Sources/U1MusicAppDelegate.h (+0/-4) Other Sources/U1MusicAppDelegate.m (+3/-20) Other Sources/main.m (+5/-5) U1Music.xcodeproj/project.pbxproj (+451/-369) categories/UIDevice+Hardware.m (+2/-1) categories/UIImage+Alpha.h (+1/-0) categories/UIImage+Alpha.m (+0/-5) categories/UIImage+Resize.h (+5/-1) categories/UIImage+Resize.m (+40/-58) utilities/AudioStreamer.m (+2/-0) utilities/Models/Generated/_U1CachedFile.h (+3/-3) utilities/U1LocalMusicServer.m (+1/-8) utilities/UOSSOMusicCredsFetchOperation.h (+0/-24) utilities/UOSSOMusicCredsFetchOperation.m (+0/-57) utilities/operations/AlbumArtLoader.h (+0/-2) utilities/operations/AlbumArtLoader.m (+0/-10) utilities/operations/UOJSONFetchOperation.h (+0/-25) utilities/operations/UOJSONFetchOperation.m (+0/-80) view_controllers/PullRefreshTableViewController.h (+0/-7) view_controllers/PullRefreshTableViewController.m (+0/-11) view_controllers/SettingsViewController.m (+2/-1) view_controllers/SubsonicIndexedTableViewController.m (+0/-2) view_controllers/SubsonicTableViewController.h (+1/-1) view_controllers/SubsonicTableViewController.m (+5/-20) view_controllers/SubsonicViewController.m (+0/-6) view_controllers/U1MigrationViewController.m (+0/-9) view_controllers/U1MigrationViewController.xib (+23/-16) view_controllers/UOMusicLoginController.m (+40/-131) view_controllers/UOSSOCredentialsViewController.h (+0/-7) view_controllers/UOSSOCredentialsViewController.m (+1/-15) |
| To merge this branch: | bzr merge lp:~rockstar/ubuntuone-ios-music/error-handling |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One iOS Client Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-09-19.
Commit message
Description of the change
Use the error handling in the new branch for UbuntuOneAuthKit
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'Other Sources/U1MusicAppDelegate.h' | |||
| 2 | --- Other Sources/U1MusicAppDelegate.h 2011-11-01 15:14:34 +0000 | |||
| 3 | +++ Other Sources/U1MusicAppDelegate.h 2012-09-19 03:34:23 +0000 | |||
| 4 | @@ -28,14 +28,10 @@ | |||
| 5 | 28 | // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | 28 | // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH |
| 6 | 29 | // DAMAGE. | 29 | // DAMAGE. |
| 7 | 30 | 30 | ||
| 8 | 31 | @class Reachability; | ||
| 9 | 32 | |||
| 10 | 33 | @interface U1MusicAppDelegate : NSObject <UIApplicationDelegate> { | 31 | @interface U1MusicAppDelegate : NSObject <UIApplicationDelegate> { |
| 11 | 34 | UIWindow *window; | 32 | UIWindow *window; |
| 12 | 35 | UITabBarController *tabBarController; | 33 | UITabBarController *tabBarController; |
| 13 | 36 | } | 34 | } |
| 14 | 37 | @property (nonatomic, retain) IBOutlet UIWindow *window; | ||
| 15 | 38 | @property (nonatomic, retain) IBOutlet UITabBarController *tabBarController; | ||
| 16 | 39 | 35 | ||
| 17 | 40 | extern NSString * const NOTIF_reloadAccountCredentials; | 36 | extern NSString * const NOTIF_reloadAccountCredentials; |
| 18 | 41 | @end | 37 | @end |
| 19 | 42 | 38 | ||
| 20 | === modified file 'Other Sources/U1MusicAppDelegate.m' | |||
| 21 | --- Other Sources/U1MusicAppDelegate.m 2012-09-13 17:35:26 +0000 | |||
| 22 | +++ Other Sources/U1MusicAppDelegate.m 2012-09-19 03:34:23 +0000 | |||
| 23 | @@ -55,8 +55,6 @@ | |||
| 24 | 55 | 55 | ||
| 25 | 56 | @implementation U1MusicAppDelegate | 56 | @implementation U1MusicAppDelegate |
| 26 | 57 | 57 | ||
| 27 | 58 | @synthesize window; | ||
| 28 | 59 | @synthesize tabBarController; | ||
| 29 | 60 | @synthesize loginController, musicServer; | 58 | @synthesize loginController, musicServer; |
| 30 | 61 | 59 | ||
| 31 | 62 | #pragma mark - | 60 | #pragma mark - |
| 32 | @@ -84,7 +82,6 @@ | |||
| 33 | 84 | }]; | 82 | }]; |
| 34 | 85 | 83 | ||
| 35 | 86 | [window.rootViewController presentModalViewController:migrationView animated:YES]; | 84 | [window.rootViewController presentModalViewController:migrationView animated:YES]; |
| 36 | 87 | [migrationView release]; | ||
| 37 | 88 | }); | 85 | }); |
| 38 | 89 | } | 86 | } |
| 39 | 90 | else if ([standardUserDefaults integerForKey:@"last_build_version"] < 54) // Version where we fixed the Songs view crasher. TODO: Find a better long-term migration strategy | 87 | else if ([standardUserDefaults integerForKey:@"last_build_version"] < 54) // Version where we fixed the Songs view crasher. TODO: Find a better long-term migration strategy |
| 40 | @@ -101,7 +98,6 @@ | |||
| 41 | 101 | { | 98 | { |
| 42 | 102 | [self startup]; | 99 | [self startup]; |
| 43 | 103 | } | 100 | } |
| 44 | 104 | [fileManager release]; | ||
| 45 | 105 | 101 | ||
| 46 | 106 | return YES; | 102 | return YES; |
| 47 | 107 | } | 103 | } |
| 48 | @@ -159,8 +155,6 @@ | |||
| 49 | 159 | { | 155 | { |
| 50 | 160 | [[Subsonic sharedSubsonic] storeUsername:user password:pass]; | 156 | [[Subsonic sharedSubsonic] storeUsername:user password:pass]; |
| 51 | 161 | } | 157 | } |
| 52 | 162 | |||
| 53 | 163 | [queryStringParser release]; | ||
| 54 | 164 | } | 158 | } |
| 55 | 165 | 159 | ||
| 56 | 166 | - (BOOL)configureUsernamePassword | 160 | - (BOOL)configureUsernamePassword |
| 57 | @@ -182,15 +176,15 @@ | |||
| 58 | 182 | 176 | ||
| 59 | 183 | - (void)presentLoginView; | 177 | - (void)presentLoginView; |
| 60 | 184 | { | 178 | { |
| 62 | 185 | self.loginController = [[[UOMusicLoginController alloc] init] autorelease]; | 179 | self.loginController = [[UOMusicLoginController alloc] init]; |
| 63 | 186 | self.loginController.delegate = self; | 180 | self.loginController.delegate = self; |
| 65 | 187 | [self.tabBarController presentModalViewController:self.loginController.loginViewController animated:YES]; | 181 | [tabBarController presentModalViewController:self.loginController.loginViewController animated:YES]; |
| 66 | 188 | } | 182 | } |
| 67 | 189 | 183 | ||
| 68 | 190 | - (void)loginControllerDidLoginWithUsername:(NSString *)username; | 184 | - (void)loginControllerDidLoginWithUsername:(NSString *)username; |
| 69 | 191 | { | 185 | { |
| 70 | 192 | [self configureUsernamePassword]; | 186 | [self configureUsernamePassword]; |
| 72 | 193 | [self.tabBarController dismissModalViewControllerAnimated:YES]; | 187 | [tabBarController dismissModalViewControllerAnimated:YES]; |
| 73 | 194 | self.loginController = nil; | 188 | self.loginController = nil; |
| 74 | 195 | [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_reloadAccountCredentials object:nil]; | 189 | [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_reloadAccountCredentials object:nil]; |
| 75 | 196 | } | 190 | } |
| 76 | @@ -215,15 +209,4 @@ | |||
| 77 | 215 | } | 209 | } |
| 78 | 216 | } | 210 | } |
| 79 | 217 | 211 | ||
| 80 | 218 | #pragma mark - | ||
| 81 | 219 | #pragma mark Memory management | ||
| 82 | 220 | |||
| 83 | 221 | - (void)dealloc | ||
| 84 | 222 | { | ||
| 85 | 223 | [tabBarController release]; | ||
| 86 | 224 | [window release]; | ||
| 87 | 225 | [musicServer release]; | ||
| 88 | 226 | [super dealloc]; | ||
| 89 | 227 | } | ||
| 90 | 228 | |||
| 91 | 229 | @end | 212 | @end |
| 92 | 230 | \ No newline at end of file | 213 | \ No newline at end of file |
| 93 | 231 | 214 | ||
| 94 | === modified file 'Other Sources/main.m' | |||
| 95 | --- Other Sources/main.m 2010-09-22 08:15:31 +0000 | |||
| 96 | +++ Other Sources/main.m 2012-09-19 03:34:23 +0000 | |||
| 97 | @@ -30,10 +30,10 @@ | |||
| 98 | 30 | 30 | ||
| 99 | 31 | #import <UIKit/UIKit.h> | 31 | #import <UIKit/UIKit.h> |
| 100 | 32 | 32 | ||
| 101 | 33 | #import "U1MusicAppDelegate.h" | ||
| 102 | 34 | |||
| 103 | 33 | int main(int argc, char *argv[]) { | 35 | int main(int argc, char *argv[]) { |
| 109 | 34 | 36 | @autoreleasepool { | |
| 110 | 35 | NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; | 37 | return UIApplicationMain(argc, argv, nil, NSStringFromClass([U1MusicAppDelegate class])); |
| 111 | 36 | int retVal = UIApplicationMain(argc, argv, nil, nil); | 38 | } |
| 107 | 37 | [pool release]; | ||
| 108 | 38 | return retVal; | ||
| 112 | 39 | } | 39 | } |
| 113 | 40 | 40 | ||
| 114 | === modified file 'U1Music.xcodeproj/project.pbxproj' | |||
| 115 | --- U1Music.xcodeproj/project.pbxproj 2012-08-30 20:58:16 +0000 | |||
| 116 | +++ U1Music.xcodeproj/project.pbxproj 2012-09-19 03:34:23 +0000 | |||
| 117 | @@ -18,7 +18,7 @@ | |||
| 118 | 18 | 52169CA215D95E2C00ED366D /* cancel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52169C9E15D95E2C00ED366D /* cancel@2x.png */; }; | 18 | 52169CA215D95E2C00ED366D /* cancel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52169C9E15D95E2C00ED366D /* cancel@2x.png */; }; |
| 119 | 19 | 52169CA315D95E2C00ED366D /* trash-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 52169C9F15D95E2C00ED366D /* trash-grey.png */; }; | 19 | 52169CA315D95E2C00ED366D /* trash-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 52169C9F15D95E2C00ED366D /* trash-grey.png */; }; |
| 120 | 20 | 52169CA415D95E2C00ED366D /* trash-grey@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52169CA015D95E2C00ED366D /* trash-grey@2x.png */; }; | 20 | 52169CA415D95E2C00ED366D /* trash-grey@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52169CA015D95E2C00ED366D /* trash-grey@2x.png */; }; |
| 122 | 21 | 523B3CDE15B4C42F004394F4 /* SongUITableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 523B3CDD15B4C42F004394F4 /* SongUITableView.m */; }; | 21 | 523B3CDE15B4C42F004394F4 /* SongUITableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 523B3CDD15B4C42F004394F4 /* SongUITableView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 123 | 22 | 523B3CE215B5D64F004394F4 /* grabber.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE015B5D64F004394F4 /* grabber.png */; }; | 22 | 523B3CE215B5D64F004394F4 /* grabber.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE015B5D64F004394F4 /* grabber.png */; }; |
| 124 | 23 | 523B3CE315B5D64F004394F4 /* grabber@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE115B5D64F004394F4 /* grabber@2x.png */; }; | 23 | 523B3CE315B5D64F004394F4 /* grabber@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE115B5D64F004394F4 /* grabber@2x.png */; }; |
| 125 | 24 | 523B3CE615B5D814004394F4 /* UOPullGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 523B3CE515B5D814004394F4 /* UOPullGestureRecognizer.m */; }; | 24 | 523B3CE615B5D814004394F4 /* UOPullGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 523B3CE515B5D814004394F4 /* UOPullGestureRecognizer.m */; }; |
| 126 | @@ -27,10 +27,58 @@ | |||
| 127 | 27 | 523B3CFB15B73BA0004394F4 /* download.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF715B73BA0004394F4 /* download.png */; }; | 27 | 523B3CFB15B73BA0004394F4 /* download.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF715B73BA0004394F4 /* download.png */; }; |
| 128 | 28 | 523B3CFC15B73BA0004394F4 /* download@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF815B73BA0004394F4 /* download@2x.png */; }; | 28 | 523B3CFC15B73BA0004394F4 /* download@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF815B73BA0004394F4 /* download@2x.png */; }; |
| 129 | 29 | 5279764915F00B2600F8435F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5279764815F00B2600F8435F /* libz.dylib */; }; | 29 | 5279764915F00B2600F8435F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5279764815F00B2600F8435F /* libz.dylib */; }; |
| 131 | 30 | 5305C2061157F4F800BC78F0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 5305C2051157F4F800BC78F0 /* Default.png */; }; | 30 | 528515991604F410004A1F7C /* UbuntuOneAuthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 528515941604F16D004A1F7C /* UbuntuOneAuthKit.a */; }; |
| 132 | 31 | 52A042FF1606D6C40000B4BC /* NSMutableURLRequest+Parameters.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042D71606D6C40000B4BC /* NSMutableURLRequest+Parameters.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 133 | 32 | 52A043001606D6C40000B4BC /* NSString+URLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042D91606D6C40000B4BC /* NSString+URLEncoding.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 134 | 33 | 52A043011606D6C40000B4BC /* NSURL+Base.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042DB1606D6C40000B4BC /* NSURL+Base.m */; }; | ||
| 135 | 34 | 52A043021606D6C40000B4BC /* Base64Transcoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 52A042DD1606D6C40000B4BC /* Base64Transcoder.c */; }; | ||
| 136 | 35 | 52A043031606D6C40000B4BC /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 52A042DF1606D6C40000B4BC /* hmac.c */; }; | ||
| 137 | 36 | 52A043041606D6C40000B4BC /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E11606D6C40000B4BC /* sha1.c */; }; | ||
| 138 | 37 | 52A043051606D6C40000B4BC /* OAAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E41606D6C40000B4BC /* OAAttachment.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 139 | 38 | 52A043061606D6C40000B4BC /* OACall.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E61606D6C40000B4BC /* OACall.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 140 | 39 | 52A043071606D6C40000B4BC /* OAConsumer.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E81606D6C40000B4BC /* OAConsumer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 141 | 40 | 52A043081606D6C40000B4BC /* OADataFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042EA1606D6C40000B4BC /* OADataFetcher.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 142 | 41 | 52A043091606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042EC1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 143 | 42 | 52A0430A1606D6C40000B4BC /* OAMutableURLRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042EE1606D6C40000B4BC /* OAMutableURLRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 144 | 43 | 52A0430B1606D6C40000B4BC /* OAPlaintextSignatureProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F01606D6C40000B4BC /* OAPlaintextSignatureProvider.m */; }; | ||
| 145 | 44 | 52A0430C1606D6C40000B4BC /* OAProblem.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F21606D6C40000B4BC /* OAProblem.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 146 | 45 | 52A0430D1606D6C40000B4BC /* OARequestParameter.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F41606D6C40000B4BC /* OARequestParameter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 147 | 46 | 52A0430E1606D6C40000B4BC /* OAServiceTicket.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F61606D6C40000B4BC /* OAServiceTicket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 148 | 47 | 52A0430F1606D6C40000B4BC /* OATestServer.rb in Resources */ = {isa = PBXBuildFile; fileRef = 52A042F81606D6C40000B4BC /* OATestServer.rb */; }; | ||
| 149 | 48 | 52A043101606D6C40000B4BC /* OAToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042FA1606D6C40000B4BC /* OAToken.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 150 | 49 | 52A043111606D6C40000B4BC /* OATokenManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042FC1606D6C40000B4BC /* OATokenManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; | ||
| 151 | 50 | 52A043121606D6C40000B4BC /* README in Resources */ = {isa = PBXBuildFile; fileRef = 52A042FE1606D6C40000B4BC /* README */; }; | ||
| 152 | 51 | 52AC3D671604513E00B4785D /* about_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4B1604513E00B4785D /* about_logo.png */; }; | ||
| 153 | 52 | 52AC3D681604513E00B4785D /* albums.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4C1604513E00B4785D /* albums.png */; }; | ||
| 154 | 53 | 52AC3D691604513E00B4785D /* albums@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4D1604513E00B4785D /* albums@2x.png */; }; | ||
| 155 | 54 | 52AC3D6A1604513E00B4785D /* artists.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4E1604513E00B4785D /* artists.png */; }; | ||
| 156 | 55 | 52AC3D6B1604513E00B4785D /* artists@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4F1604513E00B4785D /* artists@2x.png */; }; | ||
| 157 | 56 | 52AC3D6C1604513E00B4785D /* cached.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D501604513E00B4785D /* cached.png */; }; | ||
| 158 | 57 | 52AC3D6D1604513E00B4785D /* cached@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D511604513E00B4785D /* cached@2x.png */; }; | ||
| 159 | 58 | 52AC3D6E1604513E00B4785D /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D521604513E00B4785D /* Default.png */; }; | ||
| 160 | 59 | 52AC3D6F1604513E00B4785D /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D531604513E00B4785D /* Default@2x.png */; }; | ||
| 161 | 60 | 52AC3D701604513E00B4785D /* header_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D541604513E00B4785D /* header_bg.png */; }; | ||
| 162 | 61 | 52AC3D711604513E00B4785D /* header_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D551604513E00B4785D /* header_logo@2x.png */; }; | ||
| 163 | 62 | 52AC3D721604513E00B4785D /* music_29.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D561604513E00B4785D /* music_29.png */; }; | ||
| 164 | 63 | 52AC3D731604513E00B4785D /* music_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D571604513E00B4785D /* music_57.png */; }; | ||
| 165 | 64 | 52AC3D741604513E00B4785D /* music_57@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D581604513E00B4785D /* music_57@2x.png */; }; | ||
| 166 | 65 | 52AC3D751604513E00B4785D /* music_512.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D591604513E00B4785D /* music_512.png */; }; | ||
| 167 | 66 | 52AC3D761604513E00B4785D /* partiallycached.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D5A1604513E00B4785D /* partiallycached.png */; }; | ||
| 168 | 67 | 52AC3D771604513E00B4785D /* partiallycached@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D5B1604513E00B4785D /* partiallycached@2x.png */; }; | ||
| 169 | 68 | 52AC3D781604513E00B4785D /* playlists.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D5C1604513E00B4785D /* playlists.png */; }; | ||
| 170 | 69 | 52AC3D791604513E00B4785D /* playlists@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D5D1604513E00B4785D /* playlists@2x.png */; }; | ||
| 171 | 70 | 52AC3D7A1604513E00B4785D /* progress-label-background.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D5E1604513E00B4785D /* progress-label-background.png */; }; | ||
| 172 | 71 | 52AC3D7B1604513E00B4785D /* settings.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D5F1604513E00B4785D /* settings.png */; }; | ||
| 173 | 72 | 52AC3D7C1604513E00B4785D /* settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D601604513E00B4785D /* settings@2x.png */; }; | ||
| 174 | 73 | 52AC3D7D1604513E00B4785D /* songs.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D611604513E00B4785D /* songs.png */; }; | ||
| 175 | 74 | 52AC3D7E1604513E00B4785D /* songs@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D621604513E00B4785D /* songs@2x.png */; }; | ||
| 176 | 75 | 52AC3D7F1604513E00B4785D /* uncached-disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D631604513E00B4785D /* uncached-disabled.png */; }; | ||
| 177 | 76 | 52AC3D801604513E00B4785D /* uncached-disabled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D641604513E00B4785D /* uncached-disabled@2x.png */; }; | ||
| 178 | 77 | 52AC3D811604513E00B4785D /* uncached.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D651604513E00B4785D /* uncached.png */; }; | ||
| 179 | 78 | 52AC3D821604513E00B4785D /* uncached@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D661604513E00B4785D /* uncached@2x.png */; }; | ||
| 180 | 79 | 52AC3D841604539000B4785D /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D831604539000B4785D /* Default-568h@2x.png */; }; | ||
| 181 | 31 | 536D620B1144495400DFCE56 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 536D620A1144495400DFCE56 /* SystemConfiguration.framework */; }; | 80 | 536D620B1144495400DFCE56 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 536D620A1144495400DFCE56 /* SystemConfiguration.framework */; }; |
| 182 | 32 | 537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 537DE2D8113F008C00875852 /* CoreFoundation.framework */; }; | 81 | 537DE2D9113F008C00875852 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 537DE2D8113F008C00875852 /* CoreFoundation.framework */; }; |
| 183 | 33 | 53F0CD8211589F0A00A665CD /* progress-label-background.png in Resources */ = {isa = PBXBuildFile; fileRef = 53F0CD8111589F0A00A665CD /* progress-label-background.png */; }; | ||
| 184 | 34 | 53F675D8113B092C00822059 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675D7113B092C00822059 /* MediaPlayer.framework */; }; | 82 | 53F675D8113B092C00822059 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675D7113B092C00822059 /* MediaPlayer.framework */; }; |
| 185 | 35 | 53F675DC113B093900822059 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675DB113B093900822059 /* CFNetwork.framework */; }; | 83 | 53F675DC113B093900822059 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675DB113B093900822059 /* CFNetwork.framework */; }; |
| 186 | 36 | 53F675E2113B095900822059 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675E1113B095900822059 /* QuartzCore.framework */; }; | 84 | 53F675E2113B095900822059 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675E1113B095900822059 /* QuartzCore.framework */; }; |
| 187 | @@ -38,93 +86,73 @@ | |||
| 188 | 38 | 91018B0B13573BBB0051EFDC /* UIImage+Resize.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B0A13573BBB0051EFDC /* UIImage+Resize.m */; }; | 86 | 91018B0B13573BBB0051EFDC /* UIImage+Resize.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B0A13573BBB0051EFDC /* UIImage+Resize.m */; }; |
| 189 | 39 | 91018B0E13573D150051EFDC /* UIImage+Alpha.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B0D13573D150051EFDC /* UIImage+Alpha.m */; }; | 87 | 91018B0E13573D150051EFDC /* UIImage+Alpha.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B0D13573D150051EFDC /* UIImage+Alpha.m */; }; |
| 190 | 40 | 91018B1113573D350051EFDC /* UIImage+RoundedCorner.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B1013573D350051EFDC /* UIImage+RoundedCorner.m */; }; | 88 | 91018B1113573D350051EFDC /* UIImage+RoundedCorner.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B1013573D350051EFDC /* UIImage+RoundedCorner.m */; }; |
| 217 | 41 | 91018B4B135A724B0051EFDC /* PlaylistEditAlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B42135A724B0051EFDC /* PlaylistEditAlbumListViewController.m */; }; | 89 | 91018B4B135A724B0051EFDC /* PlaylistEditAlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B42135A724B0051EFDC /* PlaylistEditAlbumListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 218 | 42 | 91018B4C135A724B0051EFDC /* PlaylistEditAlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B44135A724B0051EFDC /* PlaylistEditAlbumViewController.m */; }; | 90 | 91018B4C135A724B0051EFDC /* PlaylistEditAlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B44135A724B0051EFDC /* PlaylistEditAlbumViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 219 | 43 | 91018B4D135A724B0051EFDC /* PlaylistEditArtistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B46135A724B0051EFDC /* PlaylistEditArtistListViewController.m */; }; | 91 | 91018B4D135A724B0051EFDC /* PlaylistEditArtistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B46135A724B0051EFDC /* PlaylistEditArtistListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 220 | 44 | 91018B4E135A724B0051EFDC /* PlaylistEditArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B48135A724B0051EFDC /* PlaylistEditArtistViewController.m */; }; | 92 | 91018B4E135A724B0051EFDC /* PlaylistEditArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B48135A724B0051EFDC /* PlaylistEditArtistViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 221 | 45 | 91018B4F135A724B0051EFDC /* PlaylistEditSongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B4A135A724B0051EFDC /* PlaylistEditSongListViewController.m */; }; | 93 | 91018B4F135A724B0051EFDC /* PlaylistEditSongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B4A135A724B0051EFDC /* PlaylistEditSongListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 222 | 46 | 9110DC38134C045A0046B8E4 /* AlbumParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC37134C04590046B8E4 /* AlbumParser.m */; }; | 94 | 9110DC38134C045A0046B8E4 /* AlbumParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC37134C04590046B8E4 /* AlbumParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 223 | 47 | 9110DC44134EAC740046B8E4 /* AlbumListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC43134EAC730046B8E4 /* AlbumListParser.m */; }; | 95 | 9110DC44134EAC740046B8E4 /* AlbumListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC43134EAC730046B8E4 /* AlbumListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 224 | 48 | 9110DC571354A7490046B8E4 /* AlbumArtistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC561354A7470046B8E4 /* AlbumArtistUITableViewCell.m */; }; | 96 | 9110DC571354A7490046B8E4 /* AlbumArtistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC561354A7470046B8E4 /* AlbumArtistUITableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 225 | 49 | 9112B0241383FF27003C1D93 /* albums.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B01E1383FF27003C1D93 /* albums.png */; }; | 97 | 9123D1A113257ADF00B40210 /* PlaylistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1A013257ADF00B40210 /* PlaylistListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 226 | 50 | 9112B0251383FF27003C1D93 /* artists.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B01F1383FF27003C1D93 /* artists.png */; }; | 98 | 9123D1BB13280B3400B40210 /* PlaylistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1BA13280B3400B40210 /* PlaylistViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 227 | 51 | 9112B0261383FF27003C1D93 /* playlists.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B0201383FF27003C1D93 /* playlists.png */; }; | 99 | 9123D1C3132816D200B40210 /* PlaylistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1C2132816D200B40210 /* PlaylistListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 228 | 52 | 9112B0281383FF27003C1D93 /* settings.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B0221383FF27003C1D93 /* settings.png */; }; | 100 | 912D1259134617F600721EE4 /* SongListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1258134617F600721EE4 /* SongListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 229 | 53 | 9112B0291383FF27003C1D93 /* songs.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B0231383FF27003C1D93 /* songs.png */; }; | 101 | 912D1264134A162000721EE4 /* AlertPrompt.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1263134A162000721EE4 /* AlertPrompt.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 230 | 54 | 9112B02F1383FF37003C1D93 /* albums@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B02A1383FF37003C1D93 /* albums@2x.png */; }; | 102 | 912D1267134B609700721EE4 /* PlaylistEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1266134B609600721EE4 /* PlaylistEditViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 231 | 55 | 9112B0301383FF37003C1D93 /* artists@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B02B1383FF37003C1D93 /* artists@2x.png */; }; | 103 | 912D392213311F2700A443B2 /* AlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392113311F2500A443B2 /* AlbumListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 232 | 56 | 9112B0311383FF37003C1D93 /* playlists@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B02C1383FF37003C1D93 /* playlists@2x.png */; }; | 104 | 912D392613311FC600A443B2 /* SongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392513311FC400A443B2 /* SongListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 207 | 57 | 9112B0321383FF37003C1D93 /* settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B02D1383FF37003C1D93 /* settings@2x.png */; }; | ||
| 208 | 58 | 9112B0331383FF37003C1D93 /* songs@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B02E1383FF37003C1D93 /* songs@2x.png */; }; | ||
| 209 | 59 | 9123D1A113257ADF00B40210 /* PlaylistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1A013257ADF00B40210 /* PlaylistListViewController.m */; }; | ||
| 210 | 60 | 9123D1BB13280B3400B40210 /* PlaylistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1BA13280B3400B40210 /* PlaylistViewController.m */; }; | ||
| 211 | 61 | 9123D1C3132816D200B40210 /* PlaylistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1C2132816D200B40210 /* PlaylistListParser.m */; }; | ||
| 212 | 62 | 912D1259134617F600721EE4 /* SongListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1258134617F600721EE4 /* SongListParser.m */; }; | ||
| 213 | 63 | 912D1264134A162000721EE4 /* AlertPrompt.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1263134A162000721EE4 /* AlertPrompt.m */; }; | ||
| 214 | 64 | 912D1267134B609700721EE4 /* PlaylistEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1266134B609600721EE4 /* PlaylistEditViewController.m */; }; | ||
| 215 | 65 | 912D392213311F2700A443B2 /* AlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392113311F2500A443B2 /* AlbumListViewController.m */; }; | ||
| 216 | 66 | 912D392613311FC600A443B2 /* SongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392513311FC400A443B2 /* SongListViewController.m */; }; | ||
| 233 | 67 | 9132827D144E07EA00395F40 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 91328279144E07EA00395F40 /* libTestFlight.a */; }; | 105 | 9132827D144E07EA00395F40 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 91328279144E07EA00395F40 /* libTestFlight.a */; }; |
| 234 | 68 | 9132827E144E07EA00395F40 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9132827A144E07EA00395F40 /* README.txt */; }; | 106 | 9132827E144E07EA00395F40 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9132827A144E07EA00395F40 /* README.txt */; }; |
| 235 | 69 | 9132827F144E07EA00395F40 /* release_notes.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9132827B144E07EA00395F40 /* release_notes.txt */; }; | 107 | 9132827F144E07EA00395F40 /* release_notes.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9132827B144E07EA00395F40 /* release_notes.txt */; }; |
| 243 | 70 | 91406E9413849F2400A7DA67 /* cached.png in Resources */ = {isa = PBXBuildFile; fileRef = 91406E8E13849F2400A7DA67 /* cached.png */; }; | 108 | 91406EEA138AEEE000A7DA67 /* NSString+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 91406EE9138AEEE000A7DA67 /* NSString+Extras.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 237 | 71 | 91406E9513849F2400A7DA67 /* cached@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 91406E8F13849F2400A7DA67 /* cached@2x.png */; }; | ||
| 238 | 72 | 91406E9613849F2400A7DA67 /* partiallycached.png in Resources */ = {isa = PBXBuildFile; fileRef = 91406E9013849F2400A7DA67 /* partiallycached.png */; }; | ||
| 239 | 73 | 91406E9713849F2400A7DA67 /* partiallycached@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 91406E9113849F2400A7DA67 /* partiallycached@2x.png */; }; | ||
| 240 | 74 | 91406E9813849F2400A7DA67 /* uncached.png in Resources */ = {isa = PBXBuildFile; fileRef = 91406E9213849F2400A7DA67 /* uncached.png */; }; | ||
| 241 | 75 | 91406E9913849F2400A7DA67 /* uncached@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 91406E9313849F2400A7DA67 /* uncached@2x.png */; }; | ||
| 242 | 76 | 91406EEA138AEEE000A7DA67 /* NSString+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 91406EE9138AEEE000A7DA67 /* NSString+Extras.m */; }; | ||
| 244 | 77 | 9149D9CF159BEC3D009AE771 /* default-album-art-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9C9159BEC3D009AE771 /* default-album-art-120.png */; }; | 109 | 9149D9CF159BEC3D009AE771 /* default-album-art-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9C9159BEC3D009AE771 /* default-album-art-120.png */; }; |
| 245 | 78 | 9149D9D0159BEC3D009AE771 /* default-album-art-200.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CA159BEC3D009AE771 /* default-album-art-200.png */; }; | 110 | 9149D9D0159BEC3D009AE771 /* default-album-art-200.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CA159BEC3D009AE771 /* default-album-art-200.png */; }; |
| 246 | 79 | 9149D9D1159BEC3D009AE771 /* default-album-art-120@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CB159BEC3D009AE771 /* default-album-art-120@2x.png */; }; | 111 | 9149D9D1159BEC3D009AE771 /* default-album-art-120@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CB159BEC3D009AE771 /* default-album-art-120@2x.png */; }; |
| 247 | 80 | 9149D9D2159BEC3D009AE771 /* default-album-art-200@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CC159BEC3D009AE771 /* default-album-art-200@2x.png */; }; | 112 | 9149D9D2159BEC3D009AE771 /* default-album-art-200@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CC159BEC3D009AE771 /* default-album-art-200@2x.png */; }; |
| 248 | 81 | 9149D9D3159BEC3D009AE771 /* default-album-art-640.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CD159BEC3D009AE771 /* default-album-art-640.png */; }; | 113 | 9149D9D3159BEC3D009AE771 /* default-album-art-640.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CD159BEC3D009AE771 /* default-album-art-640.png */; }; |
| 249 | 82 | 9149D9D4159BEC3D009AE771 /* default-album-art-640@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CE159BEC3D009AE771 /* default-album-art-640@2x.png */; }; | 114 | 9149D9D4159BEC3D009AE771 /* default-album-art-640@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CE159BEC3D009AE771 /* default-album-art-640@2x.png */; }; |
| 251 | 83 | 914AC3FF14B61D8A00C7D5A3 /* CachedSongsPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */; }; | 115 | 914AC3FF14B61D8A00C7D5A3 /* CachedSongsPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 252 | 84 | 914AC40014B61D8A00C7D5A3 /* _Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F414B61D8A00C7D5A3 /* _Album.m */; }; | 116 | 914AC40014B61D8A00C7D5A3 /* _Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F414B61D8A00C7D5A3 /* _Album.m */; }; |
| 253 | 85 | 914AC40114B61D8A00C7D5A3 /* _Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F614B61D8A00C7D5A3 /* _Artist.m */; }; | 117 | 914AC40114B61D8A00C7D5A3 /* _Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F614B61D8A00C7D5A3 /* _Artist.m */; }; |
| 254 | 86 | 914AC40214B61D8A00C7D5A3 /* _Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F814B61D8A00C7D5A3 /* _Playlist.m */; }; | 118 | 914AC40214B61D8A00C7D5A3 /* _Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F814B61D8A00C7D5A3 /* _Playlist.m */; }; |
| 255 | 87 | 914AC40314B61D8A00C7D5A3 /* _PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FA14B61D8A00C7D5A3 /* _PlaylistSongIndex.m */; }; | 119 | 914AC40314B61D8A00C7D5A3 /* _PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FA14B61D8A00C7D5A3 /* _PlaylistSongIndex.m */; }; |
| 256 | 88 | 914AC40414B61D8A00C7D5A3 /* _Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FC14B61D8A00C7D5A3 /* _Song.m */; }; | 120 | 914AC40414B61D8A00C7D5A3 /* _Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FC14B61D8A00C7D5A3 /* _Song.m */; }; |
| 257 | 89 | 914AC40514B61D8A00C7D5A3 /* PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FE14B61D8A00C7D5A3 /* PlaylistSongIndex.m */; }; | 121 | 914AC40514B61D8A00C7D5A3 /* PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FE14B61D8A00C7D5A3 /* PlaylistSongIndex.m */; }; |
| 260 | 90 | 917B47EF14E306C800062874 /* U1AutoDownloadsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 917B47EE14E306C800062874 /* U1AutoDownloadsManager.m */; }; | 122 | 917B47EF14E306C800062874 /* U1AutoDownloadsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 917B47EE14E306C800062874 /* U1AutoDownloadsManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 261 | 91 | 917B47FB14E42C7900062874 /* U1CacheFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 917B47FA14E42C7900062874 /* U1CacheFileManager.m */; }; | 123 | 917B47FB14E42C7900062874 /* U1CacheFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 917B47FA14E42C7900062874 /* U1CacheFileManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 262 | 92 | 919376F3135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 919376F2135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m */; }; | 124 | 919376F3135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 919376F2135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m */; }; |
| 263 | 93 | 91B3A4441344CF92006C8193 /* SubsonicIndexedTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3A4431344CF91006C8193 /* SubsonicIndexedTableViewController.m */; }; | 125 | 91B3A4441344CF92006C8193 /* SubsonicIndexedTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3A4431344CF91006C8193 /* SubsonicIndexedTableViewController.m */; }; |
| 267 | 94 | 91BE4018138E8D2300D44D68 /* UIActionSheet+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4015138E8D2300D44D68 /* UIActionSheet+Blocks.m */; }; | 126 | 91BE4018138E8D2300D44D68 /* UIActionSheet+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4015138E8D2300D44D68 /* UIActionSheet+Blocks.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 268 | 95 | 91BE4019138E8D2300D44D68 /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */; }; | 127 | 91BE4019138E8D2300D44D68 /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 269 | 96 | 91BE401C138E8D3A00D44D68 /* RIButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE401B138E8D3A00D44D68 /* RIButtonItem.m */; }; | 128 | 91BE401C138E8D3A00D44D68 /* RIButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE401B138E8D3A00D44D68 /* RIButtonItem.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 270 | 97 | 91C493D014E4593C00BC1815 /* U1ByteSizeValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C493CF14E4593C00BC1815 /* U1ByteSizeValueTransformer.m */; }; | 129 | 91C493D014E4593C00BC1815 /* U1ByteSizeValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C493CF14E4593C00BC1815 /* U1ByteSizeValueTransformer.m */; }; |
| 271 | 98 | 91C8CCAF14B7883600A0E311 /* ArtistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C8CCAE14B7883600A0E311 /* ArtistUITableViewCell.m */; }; | 130 | 91C8CCAF14B7883600A0E311 /* ArtistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C8CCAE14B7883600A0E311 /* ArtistUITableViewCell.m */; }; |
| 275 | 99 | 91D18DAB13B228D3001BEB42 /* uncached-disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 91D18DA913B228D3001BEB42 /* uncached-disabled.png */; }; | 131 | 91D3A16F14B93B2A003D4FC0 /* MOC.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D3A16E14B93B2A003D4FC0 /* MOC.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 273 | 100 | 91D18DAC13B228D3001BEB42 /* uncached-disabled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 91D18DAA13B228D3001BEB42 /* uncached-disabled@2x.png */; }; | ||
| 274 | 101 | 91D3A16F14B93B2A003D4FC0 /* MOC.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D3A16E14B93B2A003D4FC0 /* MOC.m */; }; | ||
| 276 | 102 | 91D3A17214BE12FE003D4FC0 /* PlaylistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */; }; | 132 | 91D3A17214BE12FE003D4FC0 /* PlaylistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */; }; |
| 281 | 103 | 91DB6B9F13E9C7190029BC77 /* about_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 91DB6B9E13E9C7190029BC77 /* about_logo.png */; }; | 133 | 91E3E46414D33A2D006ED32F /* U1SerializedDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46314D33A2D006ED32F /* U1SerializedDownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 282 | 104 | 91E3E46414D33A2D006ED32F /* U1SerializedDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46314D33A2D006ED32F /* U1SerializedDownloadOperation.m */; }; | 134 | 91E3E46814D33A6F006ED32F /* U1ChunkDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46714D33A6F006ED32F /* U1ChunkDownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 283 | 105 | 91E3E46814D33A6F006ED32F /* U1ChunkDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46714D33A6F006ED32F /* U1ChunkDownloadOperation.m */; }; | 135 | 91E88609132DA82000618994 /* PlaylistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E88608132DA82000618994 /* PlaylistParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 280 | 106 | 91E88609132DA82000618994 /* PlaylistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E88608132DA82000618994 /* PlaylistParser.m */; }; | ||
| 284 | 107 | 91F2653014EACFCC0027232B /* U1MigrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91F2652E14EACFCC0027232B /* U1MigrationViewController.m */; }; | 136 | 91F2653014EACFCC0027232B /* U1MigrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91F2652E14EACFCC0027232B /* U1MigrationViewController.m */; }; |
| 285 | 108 | 91F2653114EACFCC0027232B /* U1MigrationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 91F2652F14EACFCC0027232B /* U1MigrationViewController.xib */; }; | 137 | 91F2653114EACFCC0027232B /* U1MigrationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 91F2652F14EACFCC0027232B /* U1MigrationViewController.xib */; }; |
| 286 | 109 | 9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9316628712264A74003B0EB7 /* NSDate+Extras.m */; }; | 138 | 9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9316628712264A74003B0EB7 /* NSDate+Extras.m */; }; |
| 287 | 110 | 932E7A6E1254747E00E7C8FF /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A6D1254747E00E7C8FF /* Default@2x.png */; }; | ||
| 288 | 111 | 932E7AA01255265A00E7C8FF /* about.css in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A9E1255265A00E7C8FF /* about.css */; }; | 139 | 932E7AA01255265A00E7C8FF /* about.css in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A9E1255265A00E7C8FF /* about.css */; }; |
| 289 | 112 | 932E7AA11255265A00E7C8FF /* about.html in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A9F1255265A00E7C8FF /* about.html */; }; | 140 | 932E7AA11255265A00E7C8FF /* about.html in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A9F1255265A00E7C8FF /* about.html */; }; |
| 290 | 113 | 932E7B0912552CB400E7C8FF /* PullRefreshTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 932E7B0812552CB400E7C8FF /* PullRefreshTableViewController.m */; }; | 141 | 932E7B0912552CB400E7C8FF /* PullRefreshTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 932E7B0812552CB400E7C8FF /* PullRefreshTableViewController.m */; }; |
| 291 | 114 | 932E7B0B12552CD500E7C8FF /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 932E7B0A12552CD500E7C8FF /* arrow.png */; }; | 142 | 932E7B0B12552CD500E7C8FF /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 932E7B0A12552CD500E7C8FF /* arrow.png */; }; |
| 292 | 115 | 9354D0AB1248267B00733067 /* NSDictionary+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9354D0AA1248267B00733067 /* NSDictionary+Extras.m */; }; | 143 | 9354D0AB1248267B00733067 /* NSDictionary+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9354D0AA1248267B00733067 /* NSDictionary+Extras.m */; }; |
| 296 | 116 | 936F20681227364200070F43 /* Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F20671227364200070F43 /* Playlist.m */; }; | 144 | 936F20681227364200070F43 /* Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F20671227364200070F43 /* Playlist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 297 | 117 | 936F209012273D9000070F43 /* Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F208F12273D9000070F43 /* Song.m */; }; | 145 | 936F209012273D9000070F43 /* Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F208F12273D9000070F43 /* Song.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 298 | 118 | 936F230A12284D1900070F43 /* NamedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F230912284D1900070F43 /* NamedTextFieldCell.m */; }; | 146 | 936F230A12284D1900070F43 /* NamedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F230912284D1900070F43 /* NamedTextFieldCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 299 | 119 | 937FAA11137CFC1B00507E51 /* AlbumArtLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA0E137CFC1B00507E51 /* AlbumArtLoader.m */; }; | 147 | 937FAA11137CFC1B00507E51 /* AlbumArtLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA0E137CFC1B00507E51 /* AlbumArtLoader.m */; }; |
| 304 | 120 | 937FAA12137CFC1B00507E51 /* AlbumArtDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA10137CFC1B00507E51 /* AlbumArtDownloadOperation.m */; }; | 148 | 937FAA12137CFC1B00507E51 /* AlbumArtDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA10137CFC1B00507E51 /* AlbumArtDownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 305 | 121 | 937FAA15137CFC5000507E51 /* Downloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA14137CFC5000507E51 /* Downloader.m */; }; | 149 | 937FAA15137CFC5000507E51 /* Downloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA14137CFC5000507E51 /* Downloader.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 306 | 122 | 937FAA18137CFC7200507E51 /* DownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA17137CFC7200507E51 /* DownloadOperation.m */; }; | 150 | 937FAA18137CFC7200507E51 /* DownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA17137CFC7200507E51 /* DownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 307 | 123 | 937FAA1B137CFCA600507E51 /* AbstractNetworkOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA1A137CFCA600507E51 /* AbstractNetworkOperation.m */; }; | 151 | 937FAA1B137CFCA600507E51 /* AbstractNetworkOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA1A137CFCA600507E51 /* AbstractNetworkOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 308 | 124 | 937FAAEF137D15E800507E51 /* Globals.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAAEE137D15E800507E51 /* Globals.m */; }; | 152 | 937FAAEF137D15E800507E51 /* Globals.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAAEE137D15E800507E51 /* Globals.m */; }; |
| 309 | 125 | 93A54024123188880048BC3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93A54023123188880048BC3D /* Security.framework */; }; | 153 | 93A54024123188880048BC3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93A54023123188880048BC3D /* Security.framework */; }; |
| 312 | 126 | 93BC5209124C181600B7587C /* Subsonic.m in Sources */ = {isa = PBXBuildFile; fileRef = 93BC5208124C181600B7587C /* Subsonic.m */; }; | 154 | 93BC5209124C181600B7587C /* Subsonic.m in Sources */ = {isa = PBXBuildFile; fileRef = 93BC5208124C181600B7587C /* Subsonic.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 313 | 127 | 93BC52A7124C1E6900B7587C /* StreamingPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93BC52A6124C1E6900B7587C /* StreamingPlayer.m */; }; | 155 | 93BC52A7124C1E6900B7587C /* StreamingPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93BC52A6124C1E6900B7587C /* StreamingPlayer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 314 | 128 | 93CCBD4F1254039900AFFC22 /* speaker.png in Resources */ = {isa = PBXBuildFile; fileRef = 93CCBD4D1254039900AFFC22 /* speaker.png */; }; | 156 | 93CCBD4F1254039900AFFC22 /* speaker.png in Resources */ = {isa = PBXBuildFile; fileRef = 93CCBD4D1254039900AFFC22 /* speaker.png */; }; |
| 315 | 129 | 93CCBD501254039900AFFC22 /* speaker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93CCBD4E1254039900AFFC22 /* speaker@2x.png */; }; | 157 | 93CCBD501254039900AFFC22 /* speaker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93CCBD4E1254039900AFFC22 /* speaker@2x.png */; }; |
| 316 | 130 | 93CCBD7D12540CB700AFFC22 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CCBD7B12540CB700AFFC22 /* AboutViewController.m */; }; | 158 | 93CCBD7D12540CB700AFFC22 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CCBD7B12540CB700AFFC22 /* AboutViewController.m */; }; |
| 317 | @@ -139,33 +167,29 @@ | |||
| 318 | 139 | 93D6B2BD124FD72D007880B0 /* loopback-one-highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B2BB124FD72D007880B0 /* loopback-one-highlight.png */; }; | 167 | 93D6B2BD124FD72D007880B0 /* loopback-one-highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B2BB124FD72D007880B0 /* loopback-one-highlight.png */; }; |
| 319 | 140 | 93D6B2BE124FD72D007880B0 /* loopback-one-highlight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B2BC124FD72D007880B0 /* loopback-one-highlight@2x.png */; }; | 168 | 93D6B2BE124FD72D007880B0 /* loopback-one-highlight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B2BC124FD72D007880B0 /* loopback-one-highlight@2x.png */; }; |
| 320 | 141 | 93D6B2D3124FDA56007880B0 /* NSMutableArray+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B2D2124FDA56007880B0 /* NSMutableArray+Extras.m */; }; | 169 | 93D6B2D3124FDA56007880B0 /* NSMutableArray+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B2D2124FDA56007880B0 /* NSMutableArray+Extras.m */; }; |
| 326 | 142 | 93D6B50E1252CA71007880B0 /* music_29.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B50A1252CA71007880B0 /* music_29.png */; }; | 170 | 93D6B54B1252CE57007880B0 /* URLQueryStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 322 | 143 | 93D6B50F1252CA71007880B0 /* music_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B50B1252CA71007880B0 /* music_57.png */; }; | ||
| 323 | 144 | 93D6B5111252CA71007880B0 /* music_512.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B50D1252CA71007880B0 /* music_512.png */; }; | ||
| 324 | 145 | 93D6B5151252CB34007880B0 /* music_57@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B5141252CB34007880B0 /* music_57@2x.png */; }; | ||
| 325 | 146 | 93D6B54B1252CE57007880B0 /* URLQueryStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */; }; | ||
| 327 | 147 | 93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93DFFE3E135D70B60061F29F /* CoreData.framework */; }; | 171 | 93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93DFFE3E135D70B60061F29F /* CoreData.framework */; }; |
| 328 | 148 | 93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE4C135D71760061F29F /* music.xcdatamodeld */; }; | 172 | 93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE4C135D71760061F29F /* music.xcdatamodeld */; }; |
| 338 | 149 | 93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE53135D72420061F29F /* NSManagedObjectContext+Additions.m */; }; | 173 | 93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE53135D72420061F29F /* NSManagedObjectContext+Additions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 339 | 150 | 93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2AEF124993F100E7E060 /* ArtistListParser.m */; }; | 174 | 93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2AEF124993F100E7E060 /* ArtistListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 340 | 151 | 93EE2BA31249F33D00E7E060 /* ArtistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2BA21249F33D00E7E060 /* ArtistParser.m */; }; | 175 | 93EE2BA31249F33D00E7E060 /* ArtistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2BA21249F33D00E7E060 /* ArtistParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 341 | 152 | 93F334471247F9DE006C6707 /* SFHFKeychainUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334461247F9DE006C6707 /* SFHFKeychainUtils.m */; }; | 176 | 93F334471247F9DE006C6707 /* SFHFKeychainUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334461247F9DE006C6707 /* SFHFKeychainUtils.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 342 | 153 | 93F3344D1247FA0B006C6707 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344C1247FA0B006C6707 /* Reachability.m */; }; | 177 | 93F3344D1247FA0B006C6707 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344C1247FA0B006C6707 /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 343 | 154 | 93F334521247FA2C006C6707 /* Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344F1247FA2C006C6707 /* Album.m */; }; | 178 | 93F334521247FA2C006C6707 /* Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344F1247FA2C006C6707 /* Album.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 344 | 155 | 93F334531247FA2C006C6707 /* Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334511247FA2C006C6707 /* Artist.m */; }; | 179 | 93F334531247FA2C006C6707 /* Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334511247FA2C006C6707 /* Artist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 345 | 156 | 93F3345C1247FA85006C6707 /* AlbumUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3345B1247FA85006C6707 /* AlbumUITableViewCell.m */; }; | 180 | 93F3345C1247FA85006C6707 /* AlbumUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3345B1247FA85006C6707 /* AlbumUITableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 346 | 157 | 93F3345F1247FA97006C6707 /* SongUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3345E1247FA97006C6707 /* SongUITableViewCell.m */; }; | 181 | 93F3345F1247FA97006C6707 /* SongUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3345E1247FA97006C6707 /* SongUITableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 347 | 158 | 93F334681247FB02006C6707 /* SongViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334641247FB02006C6707 /* SongViewController.xib */; }; | 182 | 93F334681247FB02006C6707 /* SongViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334641247FB02006C6707 /* SongViewController.xib */; }; |
| 348 | 159 | 93F334691247FB02006C6707 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334651247FB02006C6707 /* MainWindow.xib */; }; | 183 | 93F334691247FB02006C6707 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334651247FB02006C6707 /* MainWindow.xib */; }; |
| 349 | 160 | 93F3346A1247FB02006C6707 /* SearchableTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334661247FB02006C6707 /* SearchableTableViewController.xib */; }; | 184 | 93F3346A1247FB02006C6707 /* SearchableTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334661247FB02006C6707 /* SearchableTableViewController.xib */; }; |
| 350 | 161 | 93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */; }; | 185 | 93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */; }; |
| 351 | 162 | 93F334721247FB78006C6707 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334701247FB78006C6707 /* main.m */; }; | 186 | 93F334721247FB78006C6707 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334701247FB78006C6707 /* main.m */; }; |
| 358 | 163 | 93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334741247FB9F006C6707 /* AudioStreamer.m */; }; | 187 | 93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334741247FB9F006C6707 /* AudioStreamer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 359 | 164 | 93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3348E1247FCDC006C6707 /* ArtistViewController.m */; }; | 188 | 93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3348E1247FCDC006C6707 /* ArtistViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 360 | 165 | 93F334A01247FCDC006C6707 /* SongViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334901247FCDC006C6707 /* SongViewController.m */; }; | 189 | 93F334A01247FCDC006C6707 /* SongViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334901247FCDC006C6707 /* SongViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 361 | 166 | 93F334A31247FCDC006C6707 /* ArtistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334961247FCDC006C6707 /* ArtistListViewController.m */; }; | 190 | 93F334A31247FCDC006C6707 /* ArtistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334961247FCDC006C6707 /* ArtistListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 362 | 167 | 93F334A41247FCDC006C6707 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334981247FCDC006C6707 /* SettingsViewController.m */; }; | 191 | 93F334A41247FCDC006C6707 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334981247FCDC006C6707 /* SettingsViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 363 | 168 | 93F334A61247FCDC006C6707 /* AlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3349C1247FCDC006C6707 /* AlbumViewController.m */; }; | 192 | 93F334A61247FCDC006C6707 /* AlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3349C1247FCDC006C6707 /* AlbumViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 364 | 169 | 93F334A71247FCDC006C6707 /* SubsonicTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3349E1247FCDC006C6707 /* SubsonicTableViewController.m */; }; | 193 | 93F334A71247FCDC006C6707 /* SubsonicTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3349E1247FCDC006C6707 /* SubsonicTableViewController.m */; }; |
| 365 | 170 | 93FA42AE124DC1350080DF62 /* 03-loopback.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A7124DC1350080DF62 /* 03-loopback.png */; }; | 194 | 93FA42AE124DC1350080DF62 /* 03-loopback.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A7124DC1350080DF62 /* 03-loopback.png */; }; |
| 366 | 171 | 93FA42AF124DC1350080DF62 /* 03-loopback@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A8124DC1350080DF62 /* 03-loopback@2x.png */; }; | 195 | 93FA42AF124DC1350080DF62 /* 03-loopback@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A8124DC1350080DF62 /* 03-loopback@2x.png */; }; |
| 367 | @@ -181,47 +205,49 @@ | |||
| 368 | 181 | 93FA43B6124DF07C0080DF62 /* player_overlay_bg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43B4124DF07C0080DF62 /* player_overlay_bg@2x.png */; }; | 205 | 93FA43B6124DF07C0080DF62 /* player_overlay_bg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43B4124DF07C0080DF62 /* player_overlay_bg@2x.png */; }; |
| 369 | 182 | 960E4B2E14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B2C14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld */; }; | 206 | 960E4B2E14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B2C14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld */; }; |
| 370 | 183 | 960E4B3514E58844002AAB79 /* U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3414E58844002AAB79 /* U1CachedFile.m */; }; | 207 | 960E4B3514E58844002AAB79 /* U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3414E58844002AAB79 /* U1CachedFile.m */; }; |
| 380 | 184 | 960E4B3814E5884B002AAB79 /* _U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3714E5884B002AAB79 /* _U1CachedFile.m */; }; | 208 | 960E4B3814E5884B002AAB79 /* _U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3714E5884B002AAB79 /* _U1CachedFile.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 381 | 185 | 9619626614E088F50038DACA /* U1SocketListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626514E088F50038DACA /* U1SocketListener.m */; }; | 209 | 9619626614E088F50038DACA /* U1SocketListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626514E088F50038DACA /* U1SocketListener.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 382 | 186 | 9619626A14E08F4B0038DACA /* U1HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626914E08F4B0038DACA /* U1HTTPMessage.m */; }; | 210 | 9619626A14E08F4B0038DACA /* U1HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626914E08F4B0038DACA /* U1HTTPMessage.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 383 | 187 | 9619626F14E08F630038DACA /* U1HTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626C14E08F630038DACA /* U1HTTPRequest.m */; }; | 211 | 9619626F14E08F630038DACA /* U1HTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626C14E08F630038DACA /* U1HTTPRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 384 | 188 | 9619627014E08F630038DACA /* U1HTTPResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626E14E08F630038DACA /* U1HTTPResponse.m */; }; | 212 | 9619627014E08F630038DACA /* U1HTTPResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626E14E08F630038DACA /* U1HTTPResponse.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 385 | 189 | 9619627314E0A4930038DACA /* U1HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619627214E0A4930038DACA /* U1HTTPServer.m */; }; | 213 | 9619627314E0A4930038DACA /* U1HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619627214E0A4930038DACA /* U1HTTPServer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 386 | 190 | 96377AEE14E0726800517845 /* U1Descriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 96377AED14E0726800517845 /* U1Descriptor.m */; }; | 214 | 96377AEE14E0726800517845 /* U1Descriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 96377AED14E0726800517845 /* U1Descriptor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 387 | 191 | 96377AF314E0730B00517845 /* U1StreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 96377AF014E0730B00517845 /* U1StreamReader.m */; }; | 215 | 96377AF314E0730B00517845 /* U1StreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 96377AF014E0730B00517845 /* U1StreamReader.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 388 | 192 | 96377AF414E0730B00517845 /* U1StreamWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 96377AF214E0730B00517845 /* U1StreamWriter.m */; }; | 216 | 96377AF414E0730B00517845 /* U1StreamWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 96377AF214E0730B00517845 /* U1StreamWriter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 389 | 193 | 963C884E14E1AB0C00EB13A2 /* U1LocalMusicServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 963C884D14E1AB0C00EB13A2 /* U1LocalMusicServer.m */; }; | 217 | 963C884E14E1AB0C00EB13A2 /* U1LocalMusicServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 963C884D14E1AB0C00EB13A2 /* U1LocalMusicServer.m */; }; |
| 413 | 194 | 964FA3C313CA5C4F0018A65B /* NSMutableURLRequest+Parameters.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA39A13CA5C040018A65B /* NSMutableURLRequest+Parameters.m */; }; | 218 | 964FA3EA13CA848D0018A65B /* UOHTTPFetchOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3E913CA848D0018A65B /* UOHTTPFetchOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 391 | 195 | 964FA3C413CA5C4F0018A65B /* NSString+URLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA39C13CA5C040018A65B /* NSString+URLEncoding.m */; }; | ||
| 392 | 196 | 964FA3C513CA5C4F0018A65B /* NSURL+Base.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA39E13CA5C040018A65B /* NSURL+Base.m */; }; | ||
| 393 | 197 | 964FA3C613CA5C4F0018A65B /* Base64Transcoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3A013CA5C040018A65B /* Base64Transcoder.c */; }; | ||
| 394 | 198 | 964FA3C713CA5C4F0018A65B /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3A213CA5C040018A65B /* hmac.c */; }; | ||
| 395 | 199 | 964FA3C813CA5C4F0018A65B /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3A413CA5C040018A65B /* sha1.c */; }; | ||
| 396 | 200 | 964FA3C913CA5C4F0018A65B /* OAAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3A713CA5C040018A65B /* OAAttachment.m */; }; | ||
| 397 | 201 | 964FA3CA13CA5C4F0018A65B /* OACall.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3A913CA5C040018A65B /* OACall.m */; }; | ||
| 398 | 202 | 964FA3CB13CA5C4F0018A65B /* OAConsumer.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3AB13CA5C040018A65B /* OAConsumer.m */; }; | ||
| 399 | 203 | 964FA3CC13CA5C4F0018A65B /* OADataFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3AD13CA5C040018A65B /* OADataFetcher.m */; }; | ||
| 400 | 204 | 964FA3CD13CA5C500018A65B /* OAHMAC_SHA1SignatureProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3AF13CA5C040018A65B /* OAHMAC_SHA1SignatureProvider.m */; }; | ||
| 401 | 205 | 964FA3CE13CA5C500018A65B /* OAMutableURLRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3B113CA5C040018A65B /* OAMutableURLRequest.m */; }; | ||
| 402 | 206 | 964FA3CF13CA5C500018A65B /* OAPlaintextSignatureProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3B313CA5C040018A65B /* OAPlaintextSignatureProvider.m */; }; | ||
| 403 | 207 | 964FA3D013CA5C500018A65B /* OAProblem.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3B513CA5C040018A65B /* OAProblem.m */; }; | ||
| 404 | 208 | 964FA3D113CA5C500018A65B /* OARequestParameter.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3B713CA5C040018A65B /* OARequestParameter.m */; }; | ||
| 405 | 209 | 964FA3D213CA5C500018A65B /* OAServiceTicket.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3B913CA5C040018A65B /* OAServiceTicket.m */; }; | ||
| 406 | 210 | 964FA3D313CA5C500018A65B /* OAToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3BD13CA5C040018A65B /* OAToken.m */; }; | ||
| 407 | 211 | 964FA3D413CA5C500018A65B /* OATokenManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3BF13CA5C040018A65B /* OATokenManager.m */; }; | ||
| 408 | 212 | 964FA3DF13CA5D1D0018A65B /* UOJSONFetchOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3DE13CA5D1D0018A65B /* UOJSONFetchOperation.m */; }; | ||
| 409 | 213 | 964FA3EA13CA848D0018A65B /* UOHTTPFetchOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3E913CA848D0018A65B /* UOHTTPFetchOperation.m */; }; | ||
| 410 | 214 | 964FA3ED13CA8C490018A65B /* UOSSOMusicCredsFetchOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3EC13CA8C490018A65B /* UOSSOMusicCredsFetchOperation.m */; }; | ||
| 411 | 215 | 964FB0C213CB8B0C00D13DC3 /* header_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 964FB0C013CB8B0C00D13DC3 /* header_bg.png */; }; | ||
| 412 | 216 | 964FB0C613CB8B6A00D13DC3 /* header_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 964FB0C513CB8B6A00D13DC3 /* header_logo@2x.png */; }; | ||
| 414 | 217 | 9654C9BC13C7826900D0EEA0 /* UOSSOCredentialsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9654C9BA13C7826900D0EEA0 /* UOSSOCredentialsViewController.m */; }; | 219 | 9654C9BC13C7826900D0EEA0 /* UOSSOCredentialsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9654C9BA13C7826900D0EEA0 /* UOSSOCredentialsViewController.m */; }; |
| 415 | 218 | 9654C9BD13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9654C9BB13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib */; }; | 220 | 9654C9BD13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9654C9BB13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib */; }; |
| 416 | 219 | 9654C9C713C7AF9200D0EEA0 /* UOMusicLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9654C9C613C7AF9200D0EEA0 /* UOMusicLoginController.m */; }; | 221 | 9654C9C713C7AF9200D0EEA0 /* UOMusicLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9654C9C613C7AF9200D0EEA0 /* UOMusicLoginController.m */; }; |
| 419 | 220 | 9674C2C513A7DC01004509E4 /* UORadialProgressControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 9674C2C413A7DC01004509E4 /* UORadialProgressControl.m */; }; | 222 | 9674C2C513A7DC01004509E4 /* UORadialProgressControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 9674C2C413A7DC01004509E4 /* UORadialProgressControl.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 420 | 221 | 96E01B3714E1BDAF00A9F36C /* U1StreamPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = 96E01B3614E1BDAF00A9F36C /* U1StreamPipe.m */; }; | 223 | 96E01B3714E1BDAF00A9F36C /* U1StreamPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = 96E01B3614E1BDAF00A9F36C /* U1StreamPipe.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; |
| 421 | 222 | 96FB790A13AA628700D8D4A4 /* UONetworkStatusCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = 96FB790913AA628700D8D4A4 /* UONetworkStatusCoordinator.m */; }; | 224 | 96FB790A13AA628700D8D4A4 /* UONetworkStatusCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = 96FB790913AA628700D8D4A4 /* UONetworkStatusCoordinator.m */; }; |
| 422 | 223 | /* End PBXBuildFile section */ | 225 | /* End PBXBuildFile section */ |
| 423 | 224 | 226 | ||
| 424 | 227 | /* Begin PBXContainerItemProxy section */ | ||
| 425 | 228 | 528515931604F16D004A1F7C /* PBXContainerItemProxy */ = { | ||
| 426 | 229 | isa = PBXContainerItemProxy; | ||
| 427 | 230 | containerPortal = 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */; | ||
| 428 | 231 | proxyType = 2; | ||
| 429 | 232 | remoteGlobalIDString = 528515631604F16B004A1F7C; | ||
| 430 | 233 | remoteInfo = UbuntuOneAuthKit; | ||
| 431 | 234 | }; | ||
| 432 | 235 | 528515951604F16D004A1F7C /* PBXContainerItemProxy */ = { | ||
| 433 | 236 | isa = PBXContainerItemProxy; | ||
| 434 | 237 | containerPortal = 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */; | ||
| 435 | 238 | proxyType = 2; | ||
| 436 | 239 | remoteGlobalIDString = 528515741604F16B004A1F7C; | ||
| 437 | 240 | remoteInfo = UbuntuOneAuthKitTests; | ||
| 438 | 241 | }; | ||
| 439 | 242 | 528515971604F409004A1F7C /* PBXContainerItemProxy */ = { | ||
| 440 | 243 | isa = PBXContainerItemProxy; | ||
| 441 | 244 | containerPortal = 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */; | ||
| 442 | 245 | proxyType = 1; | ||
| 443 | 246 | remoteGlobalIDString = 528515621604F16B004A1F7C; | ||
| 444 | 247 | remoteInfo = UbuntuOneAuthKit; | ||
| 445 | 248 | }; | ||
| 446 | 249 | /* End PBXContainerItemProxy section */ | ||
| 447 | 250 | |||
| 448 | 225 | /* Begin PBXFileReference section */ | 251 | /* Begin PBXFileReference section */ |
| 449 | 226 | 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; | 252 | 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; |
| 450 | 227 | 1D6058910D05DD3D006BFB54 /* U1 Music.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "U1 Music.app"; sourceTree = BUILT_PRODUCTS_DIR; }; | 253 | 1D6058910D05DD3D006BFB54 /* U1 Music.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "U1 Music.app"; sourceTree = BUILT_PRODUCTS_DIR; }; |
| 451 | @@ -246,15 +272,83 @@ | |||
| 452 | 246 | 523B3CF715B73BA0004394F4 /* download.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = download.png; sourceTree = "<group>"; }; | 272 | 523B3CF715B73BA0004394F4 /* download.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = download.png; sourceTree = "<group>"; }; |
| 453 | 247 | 523B3CF815B73BA0004394F4 /* download@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "download@2x.png"; sourceTree = "<group>"; }; | 273 | 523B3CF815B73BA0004394F4 /* download@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "download@2x.png"; sourceTree = "<group>"; }; |
| 454 | 248 | 5279764815F00B2600F8435F /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; | 274 | 5279764815F00B2600F8435F /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; |
| 456 | 249 | 5305C2051157F4F800BC78F0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; }; | 275 | 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UbuntuOneAuthKit.xcodeproj; path = ../UbuntuOneAuthKit/UbuntuOneAuthKit.xcodeproj; sourceTree = "<group>"; }; |
| 457 | 276 | 52A042D61606D6C40000B4BC /* NSMutableURLRequest+Parameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableURLRequest+Parameters.h"; sourceTree = "<group>"; }; | ||
| 458 | 277 | 52A042D71606D6C40000B4BC /* NSMutableURLRequest+Parameters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableURLRequest+Parameters.m"; sourceTree = "<group>"; }; | ||
| 459 | 278 | 52A042D81606D6C40000B4BC /* NSString+URLEncoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+URLEncoding.h"; sourceTree = "<group>"; }; | ||
| 460 | 279 | 52A042D91606D6C40000B4BC /* NSString+URLEncoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+URLEncoding.m"; sourceTree = "<group>"; }; | ||
| 461 | 280 | 52A042DA1606D6C40000B4BC /* NSURL+Base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+Base.h"; sourceTree = "<group>"; }; | ||
| 462 | 281 | 52A042DB1606D6C40000B4BC /* NSURL+Base.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+Base.m"; sourceTree = "<group>"; }; | ||
| 463 | 282 | 52A042DD1606D6C40000B4BC /* Base64Transcoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Base64Transcoder.c; sourceTree = "<group>"; }; | ||
| 464 | 283 | 52A042DE1606D6C40000B4BC /* Base64Transcoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64Transcoder.h; sourceTree = "<group>"; }; | ||
| 465 | 284 | 52A042DF1606D6C40000B4BC /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hmac.c; sourceTree = "<group>"; }; | ||
| 466 | 285 | 52A042E01606D6C40000B4BC /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hmac.h; sourceTree = "<group>"; }; | ||
| 467 | 286 | 52A042E11606D6C40000B4BC /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; }; | ||
| 468 | 287 | 52A042E21606D6C40000B4BC /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = "<group>"; }; | ||
| 469 | 288 | 52A042E31606D6C40000B4BC /* OAAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAAttachment.h; sourceTree = "<group>"; }; | ||
| 470 | 289 | 52A042E41606D6C40000B4BC /* OAAttachment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAAttachment.m; sourceTree = "<group>"; }; | ||
| 471 | 290 | 52A042E51606D6C40000B4BC /* OACall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OACall.h; sourceTree = "<group>"; }; | ||
| 472 | 291 | 52A042E61606D6C40000B4BC /* OACall.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OACall.m; sourceTree = "<group>"; }; | ||
| 473 | 292 | 52A042E71606D6C40000B4BC /* OAConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAConsumer.h; sourceTree = "<group>"; }; | ||
| 474 | 293 | 52A042E81606D6C40000B4BC /* OAConsumer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAConsumer.m; sourceTree = "<group>"; }; | ||
| 475 | 294 | 52A042E91606D6C40000B4BC /* OADataFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OADataFetcher.h; sourceTree = "<group>"; }; | ||
| 476 | 295 | 52A042EA1606D6C40000B4BC /* OADataFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OADataFetcher.m; sourceTree = "<group>"; }; | ||
| 477 | 296 | 52A042EB1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAHMAC_SHA1SignatureProvider.h; sourceTree = "<group>"; }; | ||
| 478 | 297 | 52A042EC1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAHMAC_SHA1SignatureProvider.m; sourceTree = "<group>"; }; | ||
| 479 | 298 | 52A042ED1606D6C40000B4BC /* OAMutableURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAMutableURLRequest.h; sourceTree = "<group>"; }; | ||
| 480 | 299 | 52A042EE1606D6C40000B4BC /* OAMutableURLRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAMutableURLRequest.m; sourceTree = "<group>"; }; | ||
| 481 | 300 | 52A042EF1606D6C40000B4BC /* OAPlaintextSignatureProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAPlaintextSignatureProvider.h; sourceTree = "<group>"; }; | ||
| 482 | 301 | 52A042F01606D6C40000B4BC /* OAPlaintextSignatureProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAPlaintextSignatureProvider.m; sourceTree = "<group>"; }; | ||
| 483 | 302 | 52A042F11606D6C40000B4BC /* OAProblem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAProblem.h; sourceTree = "<group>"; }; | ||
| 484 | 303 | 52A042F21606D6C40000B4BC /* OAProblem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAProblem.m; sourceTree = "<group>"; }; | ||
| 485 | 304 | 52A042F31606D6C40000B4BC /* OARequestParameter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OARequestParameter.h; sourceTree = "<group>"; }; | ||
| 486 | 305 | 52A042F41606D6C40000B4BC /* OARequestParameter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OARequestParameter.m; sourceTree = "<group>"; }; | ||
| 487 | 306 | 52A042F51606D6C40000B4BC /* OAServiceTicket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAServiceTicket.h; sourceTree = "<group>"; }; | ||
| 488 | 307 | 52A042F61606D6C40000B4BC /* OAServiceTicket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAServiceTicket.m; sourceTree = "<group>"; }; | ||
| 489 | 308 | 52A042F71606D6C40000B4BC /* OASignatureProviding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OASignatureProviding.h; sourceTree = "<group>"; }; | ||
| 490 | 309 | 52A042F81606D6C40000B4BC /* OATestServer.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = OATestServer.rb; sourceTree = "<group>"; }; | ||
| 491 | 310 | 52A042F91606D6C40000B4BC /* OAToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAToken.h; sourceTree = "<group>"; }; | ||
| 492 | 311 | 52A042FA1606D6C40000B4BC /* OAToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OAToken.m; sourceTree = "<group>"; }; | ||
| 493 | 312 | 52A042FB1606D6C40000B4BC /* OATokenManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OATokenManager.h; sourceTree = "<group>"; }; | ||
| 494 | 313 | 52A042FC1606D6C40000B4BC /* OATokenManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OATokenManager.m; sourceTree = "<group>"; }; | ||
| 495 | 314 | 52A042FD1606D6C40000B4BC /* OAuthConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OAuthConsumer.h; sourceTree = "<group>"; }; | ||
| 496 | 315 | 52A042FE1606D6C40000B4BC /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; | ||
| 497 | 316 | 52AC3D4B1604513E00B4785D /* about_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = about_logo.png; sourceTree = "<group>"; }; | ||
| 498 | 317 | 52AC3D4C1604513E00B4785D /* albums.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = albums.png; sourceTree = "<group>"; }; | ||
| 499 | 318 | 52AC3D4D1604513E00B4785D /* albums@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "albums@2x.png"; sourceTree = "<group>"; }; | ||
| 500 | 319 | 52AC3D4E1604513E00B4785D /* artists.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = artists.png; sourceTree = "<group>"; }; | ||
| 501 | 320 | 52AC3D4F1604513E00B4785D /* artists@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "artists@2x.png"; sourceTree = "<group>"; }; | ||
| 502 | 321 | 52AC3D501604513E00B4785D /* cached.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cached.png; sourceTree = "<group>"; }; | ||
| 503 | 322 | 52AC3D511604513E00B4785D /* cached@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cached@2x.png"; sourceTree = "<group>"; }; | ||
| 504 | 323 | 52AC3D521604513E00B4785D /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; }; | ||
| 505 | 324 | 52AC3D531604513E00B4785D /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; }; | ||
| 506 | 325 | 52AC3D541604513E00B4785D /* header_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = header_bg.png; sourceTree = "<group>"; }; | ||
| 507 | 326 | 52AC3D551604513E00B4785D /* header_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "header_logo@2x.png"; sourceTree = "<group>"; }; | ||
| 508 | 327 | 52AC3D561604513E00B4785D /* music_29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = music_29.png; sourceTree = "<group>"; }; | ||
| 509 | 328 | 52AC3D571604513E00B4785D /* music_57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = music_57.png; sourceTree = "<group>"; }; | ||
| 510 | 329 | 52AC3D581604513E00B4785D /* music_57@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "music_57@2x.png"; sourceTree = "<group>"; }; | ||
| 511 | 330 | 52AC3D591604513E00B4785D /* music_512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = music_512.png; sourceTree = "<group>"; }; | ||
| 512 | 331 | 52AC3D5A1604513E00B4785D /* partiallycached.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = partiallycached.png; sourceTree = "<group>"; }; | ||
| 513 | 332 | 52AC3D5B1604513E00B4785D /* partiallycached@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "partiallycached@2x.png"; sourceTree = "<group>"; }; | ||
| 514 | 333 | 52AC3D5C1604513E00B4785D /* playlists.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = playlists.png; sourceTree = "<group>"; }; | ||
| 515 | 334 | 52AC3D5D1604513E00B4785D /* playlists@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "playlists@2x.png"; sourceTree = "<group>"; }; | ||
| 516 | 335 | 52AC3D5E1604513E00B4785D /* progress-label-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "progress-label-background.png"; sourceTree = "<group>"; }; | ||
| 517 | 336 | 52AC3D5F1604513E00B4785D /* settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = settings.png; sourceTree = "<group>"; }; | ||
| 518 | 337 | 52AC3D601604513E00B4785D /* settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings@2x.png"; sourceTree = "<group>"; }; | ||
| 519 | 338 | 52AC3D611604513E00B4785D /* songs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = songs.png; sourceTree = "<group>"; }; | ||
| 520 | 339 | 52AC3D621604513E00B4785D /* songs@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "songs@2x.png"; sourceTree = "<group>"; }; | ||
| 521 | 340 | 52AC3D631604513E00B4785D /* uncached-disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "uncached-disabled.png"; sourceTree = "<group>"; }; | ||
| 522 | 341 | 52AC3D641604513E00B4785D /* uncached-disabled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "uncached-disabled@2x.png"; sourceTree = "<group>"; }; | ||
| 523 | 342 | 52AC3D651604513E00B4785D /* uncached.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = uncached.png; sourceTree = "<group>"; }; | ||
| 524 | 343 | 52AC3D661604513E00B4785D /* uncached@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "uncached@2x.png"; sourceTree = "<group>"; }; | ||
| 525 | 344 | 52AC3D831604539000B4785D /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; }; | ||
| 526 | 250 | 536D620A1144495400DFCE56 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; | 345 | 536D620A1144495400DFCE56 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; |
| 527 | 251 | 537DE2D8113F008C00875852 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; | 346 | 537DE2D8113F008C00875852 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; |
| 528 | 252 | 53F0CD8111589F0A00A665CD /* progress-label-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "progress-label-background.png"; sourceTree = "<group>"; }; | ||
| 529 | 253 | 53F675D7113B092C00822059 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; }; | 347 | 53F675D7113B092C00822059 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; }; |
| 530 | 254 | 53F675DB113B093900822059 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; | 348 | 53F675DB113B093900822059 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; |
| 531 | 255 | 53F675E1113B095900822059 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; | 349 | 53F675E1113B095900822059 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; |
| 532 | 256 | 53F675E7113B096400822059 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; | 350 | 53F675E7113B096400822059 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; |
| 534 | 257 | 8D1107310486CEB800E47090 /* U1Music-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "U1Music-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; }; | 351 | 8D1107310486CEB800E47090 /* U1Music-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "U1Music-Info.plist"; path = "../U1Music-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; }; |
| 535 | 258 | 91018B0913573BBB0051EFDC /* UIImage+Resize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Resize.h"; sourceTree = "<group>"; }; | 352 | 91018B0913573BBB0051EFDC /* UIImage+Resize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Resize.h"; sourceTree = "<group>"; }; |
| 536 | 259 | 91018B0A13573BBB0051EFDC /* UIImage+Resize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Resize.m"; sourceTree = "<group>"; }; | 353 | 91018B0A13573BBB0051EFDC /* UIImage+Resize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Resize.m"; sourceTree = "<group>"; }; |
| 537 | 260 | 91018B0C13573D150051EFDC /* UIImage+Alpha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Alpha.h"; sourceTree = "<group>"; }; | 354 | 91018B0C13573D150051EFDC /* UIImage+Alpha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Alpha.h"; sourceTree = "<group>"; }; |
| 538 | @@ -277,16 +371,6 @@ | |||
| 539 | 277 | 9110DC43134EAC730046B8E4 /* AlbumListParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlbumListParser.m; sourceTree = "<group>"; }; | 371 | 9110DC43134EAC730046B8E4 /* AlbumListParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlbumListParser.m; sourceTree = "<group>"; }; |
| 540 | 278 | 9110DC551354A7460046B8E4 /* AlbumArtistUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AlbumArtistUITableViewCell.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; | 372 | 9110DC551354A7460046B8E4 /* AlbumArtistUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AlbumArtistUITableViewCell.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; |
| 541 | 279 | 9110DC561354A7470046B8E4 /* AlbumArtistUITableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AlbumArtistUITableViewCell.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; | 373 | 9110DC561354A7470046B8E4 /* AlbumArtistUITableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AlbumArtistUITableViewCell.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; |
| 542 | 280 | 9112B01E1383FF27003C1D93 /* albums.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = albums.png; sourceTree = "<group>"; }; | ||
| 543 | 281 | 9112B01F1383FF27003C1D93 /* artists.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = artists.png; sourceTree = "<group>"; }; | ||
| 544 | 282 | 9112B0201383FF27003C1D93 /* playlists.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = playlists.png; sourceTree = "<group>"; }; | ||
| 545 | 283 | 9112B0221383FF27003C1D93 /* settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = settings.png; sourceTree = "<group>"; }; | ||
| 546 | 284 | 9112B0231383FF27003C1D93 /* songs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = songs.png; sourceTree = "<group>"; }; | ||
| 547 | 285 | 9112B02A1383FF37003C1D93 /* albums@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "albums@2x.png"; sourceTree = "<group>"; }; | ||
| 548 | 286 | 9112B02B1383FF37003C1D93 /* artists@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "artists@2x.png"; sourceTree = "<group>"; }; | ||
| 549 | 287 | 9112B02C1383FF37003C1D93 /* playlists@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "playlists@2x.png"; sourceTree = "<group>"; }; | ||
| 550 | 288 | 9112B02D1383FF37003C1D93 /* settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings@2x.png"; sourceTree = "<group>"; }; | ||
| 551 | 289 | 9112B02E1383FF37003C1D93 /* songs@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "songs@2x.png"; sourceTree = "<group>"; }; | ||
| 552 | 290 | 9123D19F13257ADF00B40210 /* PlaylistListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistListViewController.h; sourceTree = "<group>"; }; | 374 | 9123D19F13257ADF00B40210 /* PlaylistListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistListViewController.h; sourceTree = "<group>"; }; |
| 553 | 291 | 9123D1A013257ADF00B40210 /* PlaylistListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PlaylistListViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; | 375 | 9123D1A013257ADF00B40210 /* PlaylistListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PlaylistListViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; |
| 554 | 292 | 9123D1B913280B3400B40210 /* PlaylistViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistViewController.h; path = view_controllers/PlaylistViewController.h; sourceTree = "<group>"; }; | 376 | 9123D1B913280B3400B40210 /* PlaylistViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistViewController.h; path = view_controllers/PlaylistViewController.h; sourceTree = "<group>"; }; |
| 555 | @@ -307,12 +391,6 @@ | |||
| 556 | 307 | 9132827A144E07EA00395F40 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; }; | 391 | 9132827A144E07EA00395F40 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; }; |
| 557 | 308 | 9132827B144E07EA00395F40 /* release_notes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_notes.txt; sourceTree = "<group>"; }; | 392 | 9132827B144E07EA00395F40 /* release_notes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = release_notes.txt; sourceTree = "<group>"; }; |
| 558 | 309 | 9132827C144E07EA00395F40 /* TestFlight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestFlight.h; sourceTree = "<group>"; }; | 393 | 9132827C144E07EA00395F40 /* TestFlight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestFlight.h; sourceTree = "<group>"; }; |
| 559 | 310 | 91406E8E13849F2400A7DA67 /* cached.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cached.png; sourceTree = "<group>"; }; | ||
| 560 | 311 | 91406E8F13849F2400A7DA67 /* cached@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cached@2x.png"; sourceTree = "<group>"; }; | ||
| 561 | 312 | 91406E9013849F2400A7DA67 /* partiallycached.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = partiallycached.png; sourceTree = "<group>"; }; | ||
| 562 | 313 | 91406E9113849F2400A7DA67 /* partiallycached@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "partiallycached@2x.png"; sourceTree = "<group>"; }; | ||
| 563 | 314 | 91406E9213849F2400A7DA67 /* uncached.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = uncached.png; sourceTree = "<group>"; }; | ||
| 564 | 315 | 91406E9313849F2400A7DA67 /* uncached@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "uncached@2x.png"; sourceTree = "<group>"; }; | ||
| 565 | 316 | 91406EE8138AEEE000A7DA67 /* NSString+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Extras.h"; sourceTree = "<group>"; }; | 394 | 91406EE8138AEEE000A7DA67 /* NSString+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Extras.h"; sourceTree = "<group>"; }; |
| 566 | 317 | 91406EE9138AEEE000A7DA67 /* NSString+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Extras.m"; sourceTree = "<group>"; }; | 395 | 91406EE9138AEEE000A7DA67 /* NSString+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Extras.m"; sourceTree = "<group>"; }; |
| 567 | 318 | 9149D9C9159BEC3D009AE771 /* default-album-art-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default-album-art-120.png"; sourceTree = "<group>"; }; | 396 | 9149D9C9159BEC3D009AE771 /* default-album-art-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "default-album-art-120.png"; sourceTree = "<group>"; }; |
| 568 | @@ -354,13 +432,10 @@ | |||
| 569 | 354 | 91C493CF14E4593C00BC1815 /* U1ByteSizeValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1ByteSizeValueTransformer.m; sourceTree = "<group>"; }; | 432 | 91C493CF14E4593C00BC1815 /* U1ByteSizeValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1ByteSizeValueTransformer.m; sourceTree = "<group>"; }; |
| 570 | 355 | 91C8CCAD14B7883600A0E311 /* ArtistUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtistUITableViewCell.h; sourceTree = "<group>"; }; | 433 | 91C8CCAD14B7883600A0E311 /* ArtistUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtistUITableViewCell.h; sourceTree = "<group>"; }; |
| 571 | 356 | 91C8CCAE14B7883600A0E311 /* ArtistUITableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistUITableViewCell.m; sourceTree = "<group>"; }; | 434 | 91C8CCAE14B7883600A0E311 /* ArtistUITableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistUITableViewCell.m; sourceTree = "<group>"; }; |
| 572 | 357 | 91D18DA913B228D3001BEB42 /* uncached-disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "uncached-disabled.png"; sourceTree = "<group>"; }; | ||
| 573 | 358 | 91D18DAA13B228D3001BEB42 /* uncached-disabled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "uncached-disabled@2x.png"; sourceTree = "<group>"; }; | ||
| 574 | 359 | 91D3A16D14B93B2A003D4FC0 /* MOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MOC.h; path = Models/MOC.h; sourceTree = SOURCE_ROOT; }; | 435 | 91D3A16D14B93B2A003D4FC0 /* MOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MOC.h; path = Models/MOC.h; sourceTree = SOURCE_ROOT; }; |
| 575 | 360 | 91D3A16E14B93B2A003D4FC0 /* MOC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MOC.m; path = Models/MOC.m; sourceTree = SOURCE_ROOT; }; | 436 | 91D3A16E14B93B2A003D4FC0 /* MOC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MOC.m; path = Models/MOC.m; sourceTree = SOURCE_ROOT; }; |
| 576 | 361 | 91D3A17014BE12FE003D4FC0 /* PlaylistUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistUITableViewCell.h; sourceTree = "<group>"; }; | 437 | 91D3A17014BE12FE003D4FC0 /* PlaylistUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistUITableViewCell.h; sourceTree = "<group>"; }; |
| 577 | 362 | 91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistUITableViewCell.m; sourceTree = "<group>"; }; | 438 | 91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistUITableViewCell.m; sourceTree = "<group>"; }; |
| 578 | 363 | 91DB6B9E13E9C7190029BC77 /* about_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = about_logo.png; sourceTree = "<group>"; }; | ||
| 579 | 364 | 91E3E46214D33A2D006ED32F /* U1SerializedDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1SerializedDownloadOperation.h; sourceTree = "<group>"; }; | 439 | 91E3E46214D33A2D006ED32F /* U1SerializedDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1SerializedDownloadOperation.h; sourceTree = "<group>"; }; |
| 580 | 365 | 91E3E46314D33A2D006ED32F /* U1SerializedDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1SerializedDownloadOperation.m; sourceTree = "<group>"; }; | 440 | 91E3E46314D33A2D006ED32F /* U1SerializedDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1SerializedDownloadOperation.m; sourceTree = "<group>"; }; |
| 581 | 366 | 91E3E46614D33A6F006ED32F /* U1ChunkDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1ChunkDownloadOperation.h; sourceTree = "<group>"; }; | 441 | 91E3E46614D33A6F006ED32F /* U1ChunkDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1ChunkDownloadOperation.h; sourceTree = "<group>"; }; |
| 582 | @@ -372,7 +447,6 @@ | |||
| 583 | 372 | 91F2652F14EACFCC0027232B /* U1MigrationViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = U1MigrationViewController.xib; sourceTree = "<group>"; }; | 447 | 91F2652F14EACFCC0027232B /* U1MigrationViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = U1MigrationViewController.xib; sourceTree = "<group>"; }; |
| 584 | 373 | 9316628612264A74003B0EB7 /* NSDate+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Extras.h"; sourceTree = "<group>"; }; | 448 | 9316628612264A74003B0EB7 /* NSDate+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Extras.h"; sourceTree = "<group>"; }; |
| 585 | 374 | 9316628712264A74003B0EB7 /* NSDate+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Extras.m"; sourceTree = "<group>"; }; | 449 | 9316628712264A74003B0EB7 /* NSDate+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Extras.m"; sourceTree = "<group>"; }; |
| 586 | 375 | 932E7A6D1254747E00E7C8FF /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; }; | ||
| 587 | 376 | 932E7A9E1255265A00E7C8FF /* about.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = about.css; sourceTree = "<group>"; }; | 450 | 932E7A9E1255265A00E7C8FF /* about.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = about.css; sourceTree = "<group>"; }; |
| 588 | 377 | 932E7A9F1255265A00E7C8FF /* about.html */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text.html; path = about.html; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; }; | 451 | 932E7A9F1255265A00E7C8FF /* about.html */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text.html; path = about.html; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; }; |
| 589 | 378 | 932E7B0712552CB400E7C8FF /* PullRefreshTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PullRefreshTableViewController.h; sourceTree = "<group>"; }; | 452 | 932E7B0712552CB400E7C8FF /* PullRefreshTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PullRefreshTableViewController.h; sourceTree = "<group>"; }; |
| 590 | @@ -380,7 +454,7 @@ | |||
| 591 | 380 | 932E7B0A12552CD500E7C8FF /* arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = arrow.png; sourceTree = "<group>"; }; | 454 | 932E7B0A12552CD500E7C8FF /* arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = arrow.png; sourceTree = "<group>"; }; |
| 592 | 381 | 9354D0A91248267B00733067 /* NSDictionary+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Extras.h"; sourceTree = "<group>"; }; | 455 | 9354D0A91248267B00733067 /* NSDictionary+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Extras.h"; sourceTree = "<group>"; }; |
| 593 | 382 | 9354D0AA1248267B00733067 /* NSDictionary+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Extras.m"; sourceTree = "<group>"; }; | 456 | 9354D0AA1248267B00733067 /* NSDictionary+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Extras.m"; sourceTree = "<group>"; }; |
| 595 | 383 | 935FCC42123766E600B5DF9B /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; }; | 457 | 935FCC42123766E600B5DF9B /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Entitlements.plist; path = ../Entitlements.plist; sourceTree = "<group>"; }; |
| 596 | 384 | 936F20661227364200070F43 /* Playlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Playlist.h; sourceTree = "<group>"; }; | 458 | 936F20661227364200070F43 /* Playlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Playlist.h; sourceTree = "<group>"; }; |
| 597 | 385 | 936F20671227364200070F43 /* Playlist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Playlist.m; sourceTree = "<group>"; }; | 459 | 936F20671227364200070F43 /* Playlist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Playlist.m; sourceTree = "<group>"; }; |
| 598 | 386 | 936F208E12273D9000070F43 /* Song.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Song.h; sourceTree = "<group>"; }; | 460 | 936F208E12273D9000070F43 /* Song.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Song.h; sourceTree = "<group>"; }; |
| 599 | @@ -424,10 +498,6 @@ | |||
| 600 | 424 | 93D6B2BC124FD72D007880B0 /* loopback-one-highlight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "loopback-one-highlight@2x.png"; sourceTree = "<group>"; }; | 498 | 93D6B2BC124FD72D007880B0 /* loopback-one-highlight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "loopback-one-highlight@2x.png"; sourceTree = "<group>"; }; |
| 601 | 425 | 93D6B2D1124FDA56007880B0 /* NSMutableArray+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+Extras.h"; sourceTree = "<group>"; }; | 499 | 93D6B2D1124FDA56007880B0 /* NSMutableArray+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+Extras.h"; sourceTree = "<group>"; }; |
| 602 | 426 | 93D6B2D2124FDA56007880B0 /* NSMutableArray+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+Extras.m"; sourceTree = "<group>"; }; | 500 | 93D6B2D2124FDA56007880B0 /* NSMutableArray+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+Extras.m"; sourceTree = "<group>"; }; |
| 603 | 427 | 93D6B50A1252CA71007880B0 /* music_29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = music_29.png; sourceTree = "<group>"; }; | ||
| 604 | 428 | 93D6B50B1252CA71007880B0 /* music_57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = music_57.png; sourceTree = "<group>"; }; | ||
| 605 | 429 | 93D6B50D1252CA71007880B0 /* music_512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = music_512.png; sourceTree = "<group>"; }; | ||
| 606 | 430 | 93D6B5141252CB34007880B0 /* music_57@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "music_57@2x.png"; sourceTree = "<group>"; }; | ||
| 607 | 431 | 93D6B5491252CE57007880B0 /* URLQueryStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLQueryStringParser.h; sourceTree = "<group>"; }; | 501 | 93D6B5491252CE57007880B0 /* URLQueryStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLQueryStringParser.h; sourceTree = "<group>"; }; |
| 608 | 432 | 93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLQueryStringParser.m; sourceTree = "<group>"; }; | 502 | 93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLQueryStringParser.m; sourceTree = "<group>"; }; |
| 609 | 433 | 93DFFE3E135D70B60061F29F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; | 503 | 93DFFE3E135D70B60061F29F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; |
| 610 | @@ -506,54 +576,8 @@ | |||
| 611 | 506 | 96377AF214E0730B00517845 /* U1StreamWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1StreamWriter.m; sourceTree = "<group>"; }; | 576 | 96377AF214E0730B00517845 /* U1StreamWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1StreamWriter.m; sourceTree = "<group>"; }; |
| 612 | 507 | 963C884C14E1AB0C00EB13A2 /* U1LocalMusicServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1LocalMusicServer.h; sourceTree = "<group>"; }; | 577 | 963C884C14E1AB0C00EB13A2 /* U1LocalMusicServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1LocalMusicServer.h; sourceTree = "<group>"; }; |
| 613 | 508 | 963C884D14E1AB0C00EB13A2 /* U1LocalMusicServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1LocalMusicServer.m; sourceTree = "<group>"; }; | 578 | 963C884D14E1AB0C00EB13A2 /* U1LocalMusicServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1LocalMusicServer.m; sourceTree = "<group>"; }; |
| 614 | 509 | 964FA39913CA5C040018A65B /* NSMutableURLRequest+Parameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSMutableURLRequest+Parameters.h"; sourceTree = "<group>"; }; | ||
| 615 | 510 | 964FA39A13CA5C040018A65B /* NSMutableURLRequest+Parameters.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSMutableURLRequest+Parameters.m"; sourceTree = "<group>"; }; | ||
| 616 | 511 | 964FA39B13CA5C040018A65B /* NSString+URLEncoding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+URLEncoding.h"; sourceTree = "<group>"; }; | ||
| 617 | 512 | 964FA39C13CA5C040018A65B /* NSString+URLEncoding.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+URLEncoding.m"; sourceTree = "<group>"; }; | ||
| 618 | 513 | 964FA39D13CA5C040018A65B /* NSURL+Base.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSURL+Base.h"; sourceTree = "<group>"; }; | ||
| 619 | 514 | 964FA39E13CA5C040018A65B /* NSURL+Base.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSURL+Base.m"; sourceTree = "<group>"; }; | ||
| 620 | 515 | 964FA3A013CA5C040018A65B /* Base64Transcoder.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = Base64Transcoder.c; sourceTree = "<group>"; }; | ||
| 621 | 516 | 964FA3A113CA5C040018A65B /* Base64Transcoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Base64Transcoder.h; sourceTree = "<group>"; }; | ||
| 622 | 517 | 964FA3A213CA5C040018A65B /* hmac.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = hmac.c; sourceTree = "<group>"; }; | ||
| 623 | 518 | 964FA3A313CA5C040018A65B /* hmac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hmac.h; sourceTree = "<group>"; }; | ||
| 624 | 519 | 964FA3A413CA5C040018A65B /* sha1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; }; | ||
| 625 | 520 | 964FA3A513CA5C040018A65B /* sha1.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = "<group>"; }; | ||
| 626 | 521 | 964FA3A613CA5C040018A65B /* OAAttachment.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAAttachment.h; sourceTree = "<group>"; }; | ||
| 627 | 522 | 964FA3A713CA5C040018A65B /* OAAttachment.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OAAttachment.m; sourceTree = "<group>"; }; | ||
| 628 | 523 | 964FA3A813CA5C040018A65B /* OACall.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OACall.h; sourceTree = "<group>"; }; | ||
| 629 | 524 | 964FA3A913CA5C040018A65B /* OACall.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OACall.m; sourceTree = "<group>"; }; | ||
| 630 | 525 | 964FA3AA13CA5C040018A65B /* OAConsumer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAConsumer.h; sourceTree = "<group>"; }; | ||
| 631 | 526 | 964FA3AB13CA5C040018A65B /* OAConsumer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OAConsumer.m; sourceTree = "<group>"; }; | ||
| 632 | 527 | 964FA3AC13CA5C040018A65B /* OADataFetcher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OADataFetcher.h; sourceTree = "<group>"; }; | ||
| 633 | 528 | 964FA3AD13CA5C040018A65B /* OADataFetcher.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OADataFetcher.m; sourceTree = "<group>"; }; | ||
| 634 | 529 | 964FA3AE13CA5C040018A65B /* OAHMAC_SHA1SignatureProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAHMAC_SHA1SignatureProvider.h; sourceTree = "<group>"; }; | ||
| 635 | 530 | 964FA3AF13CA5C040018A65B /* OAHMAC_SHA1SignatureProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OAHMAC_SHA1SignatureProvider.m; sourceTree = "<group>"; }; | ||
| 636 | 531 | 964FA3B013CA5C040018A65B /* OAMutableURLRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAMutableURLRequest.h; sourceTree = "<group>"; }; | ||
| 637 | 532 | 964FA3B113CA5C040018A65B /* OAMutableURLRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OAMutableURLRequest.m; sourceTree = "<group>"; }; | ||
| 638 | 533 | 964FA3B213CA5C040018A65B /* OAPlaintextSignatureProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAPlaintextSignatureProvider.h; sourceTree = "<group>"; }; | ||
| 639 | 534 | 964FA3B313CA5C040018A65B /* OAPlaintextSignatureProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OAPlaintextSignatureProvider.m; sourceTree = "<group>"; }; | ||
| 640 | 535 | 964FA3B413CA5C040018A65B /* OAProblem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAProblem.h; sourceTree = "<group>"; }; | ||
| 641 | 536 | 964FA3B513CA5C040018A65B /* OAProblem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OAProblem.m; sourceTree = "<group>"; }; | ||
| 642 | 537 | 964FA3B613CA5C040018A65B /* OARequestParameter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OARequestParameter.h; sourceTree = "<group>"; }; | ||
| 643 | 538 | 964FA3B713CA5C040018A65B /* OARequestParameter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OARequestParameter.m; sourceTree = "<group>"; }; | ||
| 644 | 539 | 964FA3B813CA5C040018A65B /* OAServiceTicket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAServiceTicket.h; sourceTree = "<group>"; }; | ||
| 645 | 540 | 964FA3B913CA5C040018A65B /* OAServiceTicket.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OAServiceTicket.m; sourceTree = "<group>"; }; | ||
| 646 | 541 | 964FA3BA13CA5C040018A65B /* OASignatureProviding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OASignatureProviding.h; sourceTree = "<group>"; }; | ||
| 647 | 542 | 964FA3BB13CA5C040018A65B /* OATestServer.rb */ = {isa = PBXFileReference; lastKnownFileType = text.script.ruby; path = OATestServer.rb; sourceTree = "<group>"; }; | ||
| 648 | 543 | 964FA3BC13CA5C040018A65B /* OAToken.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAToken.h; sourceTree = "<group>"; }; | ||
| 649 | 544 | 964FA3BD13CA5C040018A65B /* OAToken.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OAToken.m; sourceTree = "<group>"; }; | ||
| 650 | 545 | 964FA3BE13CA5C040018A65B /* OATokenManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OATokenManager.h; sourceTree = "<group>"; }; | ||
| 651 | 546 | 964FA3BF13CA5C040018A65B /* OATokenManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OATokenManager.m; sourceTree = "<group>"; }; | ||
| 652 | 547 | 964FA3C013CA5C040018A65B /* OAuthConsumer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OAuthConsumer.h; sourceTree = "<group>"; }; | ||
| 653 | 548 | 964FA3C113CA5C040018A65B /* README */ = {isa = PBXFileReference; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; | ||
| 654 | 549 | 964FA3DD13CA5D1D0018A65B /* UOJSONFetchOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOJSONFetchOperation.h; sourceTree = "<group>"; }; | ||
| 655 | 550 | 964FA3DE13CA5D1D0018A65B /* UOJSONFetchOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOJSONFetchOperation.m; sourceTree = "<group>"; }; | ||
| 656 | 551 | 964FA3E813CA848D0018A65B /* UOHTTPFetchOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOHTTPFetchOperation.h; sourceTree = "<group>"; }; | 579 | 964FA3E813CA848D0018A65B /* UOHTTPFetchOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOHTTPFetchOperation.h; sourceTree = "<group>"; }; |
| 657 | 552 | 964FA3E913CA848D0018A65B /* UOHTTPFetchOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOHTTPFetchOperation.m; sourceTree = "<group>"; }; | 580 | 964FA3E913CA848D0018A65B /* UOHTTPFetchOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOHTTPFetchOperation.m; sourceTree = "<group>"; }; |
| 658 | 553 | 964FA3EB13CA8C490018A65B /* UOSSOMusicCredsFetchOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UOSSOMusicCredsFetchOperation.h; path = utilities/UOSSOMusicCredsFetchOperation.h; sourceTree = SOURCE_ROOT; }; | ||
| 659 | 554 | 964FA3EC13CA8C490018A65B /* UOSSOMusicCredsFetchOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UOSSOMusicCredsFetchOperation.m; path = utilities/UOSSOMusicCredsFetchOperation.m; sourceTree = SOURCE_ROOT; }; | ||
| 660 | 555 | 964FB0C013CB8B0C00D13DC3 /* header_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = header_bg.png; sourceTree = "<group>"; }; | ||
| 661 | 556 | 964FB0C513CB8B6A00D13DC3 /* header_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "header_logo@2x.png"; sourceTree = "<group>"; }; | ||
| 662 | 557 | 9654C9B913C7826900D0EEA0 /* UOSSOCredentialsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOSSOCredentialsViewController.h; sourceTree = "<group>"; }; | 581 | 9654C9B913C7826900D0EEA0 /* UOSSOCredentialsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOSSOCredentialsViewController.h; sourceTree = "<group>"; }; |
| 663 | 558 | 9654C9BA13C7826900D0EEA0 /* UOSSOCredentialsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOSSOCredentialsViewController.m; sourceTree = "<group>"; }; | 582 | 9654C9BA13C7826900D0EEA0 /* UOSSOCredentialsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOSSOCredentialsViewController.m; sourceTree = "<group>"; }; |
| 664 | 559 | 9654C9BB13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UOSSOCredentialsViewController.xib; sourceTree = "<group>"; }; | 583 | 9654C9BB13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UOSSOCredentialsViewController.xib; sourceTree = "<group>"; }; |
| 665 | @@ -572,6 +596,7 @@ | |||
| 666 | 572 | isa = PBXFrameworksBuildPhase; | 596 | isa = PBXFrameworksBuildPhase; |
| 667 | 573 | buildActionMask = 2147483647; | 597 | buildActionMask = 2147483647; |
| 668 | 574 | files = ( | 598 | files = ( |
| 669 | 599 | 528515991604F410004A1F7C /* UbuntuOneAuthKit.a in Frameworks */, | ||
| 670 | 575 | 5279764915F00B2600F8435F /* libz.dylib in Frameworks */, | 600 | 5279764915F00B2600F8435F /* libz.dylib in Frameworks */, |
| 671 | 576 | 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, | 601 | 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, |
| 672 | 577 | 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, | 602 | 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, |
| 673 | @@ -602,8 +627,8 @@ | |||
| 674 | 602 | 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { | 627 | 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { |
| 675 | 603 | isa = PBXGroup; | 628 | isa = PBXGroup; |
| 676 | 604 | children = ( | 629 | children = ( |
| 679 | 605 | 5279764815F00B2600F8435F /* libz.dylib */, | 630 | 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */, |
| 680 | 606 | 93F3346C1247FB78006C6707 /* Main */, | 631 | 93F3346C1247FB78006C6707 /* Music */, |
| 681 | 607 | 91018B261359233E0051EFDC /* Base View Controllers */, | 632 | 91018B261359233E0051EFDC /* Base View Controllers */, |
| 682 | 608 | 93F3348C1247FCDC006C6707 /* Root View Controllers */, | 633 | 93F3348C1247FCDC006C6707 /* Root View Controllers */, |
| 683 | 609 | 91018B27135923960051EFDC /* Sub View Controllers */, | 634 | 91018B27135923960051EFDC /* Sub View Controllers */, |
| 684 | @@ -614,8 +639,6 @@ | |||
| 685 | 614 | 936F1F2E12271B6500070F43 /* Controls */, | 639 | 936F1F2E12271B6500070F43 /* Controls */, |
| 686 | 615 | 9316628512264A74003B0EB7 /* Categories */, | 640 | 9316628512264A74003B0EB7 /* Categories */, |
| 687 | 616 | 29B97317FDCFA39411CA2CEA /* Resources */, | 641 | 29B97317FDCFA39411CA2CEA /* Resources */, |
| 688 | 617 | 932E7A9D1255265A00E7C8FF /* About Content */, | ||
| 689 | 618 | 93FA42A6124DC1350080DF62 /* Images */, | ||
| 690 | 619 | 964FA39013CA5BE60018A65B /* Dependencies */, | 642 | 964FA39013CA5BE60018A65B /* Dependencies */, |
| 691 | 620 | 29B97323FDCFA39411CA2CEA /* Frameworks */, | 643 | 29B97323FDCFA39411CA2CEA /* Frameworks */, |
| 692 | 621 | 19C28FACFE9D520D11CA2CBB /* Products */, | 644 | 19C28FACFE9D520D11CA2CBB /* Products */, |
| 693 | @@ -626,37 +649,8 @@ | |||
| 694 | 626 | 29B97317FDCFA39411CA2CEA /* Resources */ = { | 649 | 29B97317FDCFA39411CA2CEA /* Resources */ = { |
| 695 | 627 | isa = PBXGroup; | 650 | isa = PBXGroup; |
| 696 | 628 | children = ( | 651 | children = ( |
| 728 | 629 | 91DB6B9E13E9C7190029BC77 /* about_logo.png */, | 652 | 932E7A9D1255265A00E7C8FF /* About Content */, |
| 729 | 630 | 964FB0C513CB8B6A00D13DC3 /* header_logo@2x.png */, | 653 | 93FA42A6124DC1350080DF62 /* Images */, |
| 699 | 631 | 964FB0C013CB8B0C00D13DC3 /* header_bg.png */, | ||
| 700 | 632 | 9112B01F1383FF27003C1D93 /* artists.png */, | ||
| 701 | 633 | 9112B02B1383FF37003C1D93 /* artists@2x.png */, | ||
| 702 | 634 | 9112B01E1383FF27003C1D93 /* albums.png */, | ||
| 703 | 635 | 9112B02A1383FF37003C1D93 /* albums@2x.png */, | ||
| 704 | 636 | 9112B0231383FF27003C1D93 /* songs.png */, | ||
| 705 | 637 | 9112B02E1383FF37003C1D93 /* songs@2x.png */, | ||
| 706 | 638 | 9112B0201383FF27003C1D93 /* playlists.png */, | ||
| 707 | 639 | 9112B02C1383FF37003C1D93 /* playlists@2x.png */, | ||
| 708 | 640 | 9112B0221383FF27003C1D93 /* settings.png */, | ||
| 709 | 641 | 9112B02D1383FF37003C1D93 /* settings@2x.png */, | ||
| 710 | 642 | 91406E8E13849F2400A7DA67 /* cached.png */, | ||
| 711 | 643 | 91406E8F13849F2400A7DA67 /* cached@2x.png */, | ||
| 712 | 644 | 91406E9013849F2400A7DA67 /* partiallycached.png */, | ||
| 713 | 645 | 91406E9113849F2400A7DA67 /* partiallycached@2x.png */, | ||
| 714 | 646 | 91406E9213849F2400A7DA67 /* uncached.png */, | ||
| 715 | 647 | 91406E9313849F2400A7DA67 /* uncached@2x.png */, | ||
| 716 | 648 | 91D18DA913B228D3001BEB42 /* uncached-disabled.png */, | ||
| 717 | 649 | 91D18DAA13B228D3001BEB42 /* uncached-disabled@2x.png */, | ||
| 718 | 650 | 5305C2051157F4F800BC78F0 /* Default.png */, | ||
| 719 | 651 | 932E7A6D1254747E00E7C8FF /* Default@2x.png */, | ||
| 720 | 652 | 93D6B50B1252CA71007880B0 /* music_57.png */, | ||
| 721 | 653 | 93D6B5141252CB34007880B0 /* music_57@2x.png */, | ||
| 722 | 654 | 93D6B50A1252CA71007880B0 /* music_29.png */, | ||
| 723 | 655 | 93D6B50D1252CA71007880B0 /* music_512.png */, | ||
| 724 | 656 | 53F0CD8111589F0A00A665CD /* progress-label-background.png */, | ||
| 725 | 657 | 8D1107310486CEB800E47090 /* U1Music-Info.plist */, | ||
| 726 | 658 | 935FCC42123766E600B5DF9B /* Entitlements.plist */, | ||
| 727 | 659 | 93DFFE4C135D71760061F29F /* music.xcdatamodeld */, | ||
| 730 | 660 | ); | 654 | ); |
| 731 | 661 | name = Resources; | 655 | name = Resources; |
| 732 | 662 | sourceTree = "<group>"; | 656 | sourceTree = "<group>"; |
| 733 | @@ -679,6 +673,89 @@ | |||
| 734 | 679 | name = Frameworks; | 673 | name = Frameworks; |
| 735 | 680 | sourceTree = "<group>"; | 674 | sourceTree = "<group>"; |
| 736 | 681 | }; | 675 | }; |
| 737 | 676 | 528515571604EED8004A1F7C /* Supporting Files */ = { | ||
| 738 | 677 | isa = PBXGroup; | ||
| 739 | 678 | children = ( | ||
| 740 | 679 | 8D1107310486CEB800E47090 /* U1Music-Info.plist */, | ||
| 741 | 680 | 935FCC42123766E600B5DF9B /* Entitlements.plist */, | ||
| 742 | 681 | 93F334701247FB78006C6707 /* main.m */, | ||
| 743 | 682 | ); | ||
| 744 | 683 | name = "Supporting Files"; | ||
| 745 | 684 | sourceTree = "<group>"; | ||
| 746 | 685 | }; | ||
| 747 | 686 | 5285158F1604F16B004A1F7C /* Products */ = { | ||
| 748 | 687 | isa = PBXGroup; | ||
| 749 | 688 | children = ( | ||
| 750 | 689 | 528515941604F16D004A1F7C /* UbuntuOneAuthKit.a */, | ||
| 751 | 690 | 528515961604F16D004A1F7C /* UbuntuOneAuthKitTests.octest */, | ||
| 752 | 691 | ); | ||
| 753 | 692 | name = Products; | ||
| 754 | 693 | sourceTree = "<group>"; | ||
| 755 | 694 | }; | ||
| 756 | 695 | 52A042D41606D6C40000B4BC /* oauthconsumer */ = { | ||
| 757 | 696 | isa = PBXGroup; | ||
| 758 | 697 | children = ( | ||
| 759 | 698 | 52A042D51606D6C40000B4BC /* Categories */, | ||
| 760 | 699 | 52A042DC1606D6C40000B4BC /* Crypto */, | ||
| 761 | 700 | 52A042E31606D6C40000B4BC /* OAAttachment.h */, | ||
| 762 | 701 | 52A042E41606D6C40000B4BC /* OAAttachment.m */, | ||
| 763 | 702 | 52A042E51606D6C40000B4BC /* OACall.h */, | ||
| 764 | 703 | 52A042E61606D6C40000B4BC /* OACall.m */, | ||
| 765 | 704 | 52A042E71606D6C40000B4BC /* OAConsumer.h */, | ||
| 766 | 705 | 52A042E81606D6C40000B4BC /* OAConsumer.m */, | ||
| 767 | 706 | 52A042E91606D6C40000B4BC /* OADataFetcher.h */, | ||
| 768 | 707 | 52A042EA1606D6C40000B4BC /* OADataFetcher.m */, | ||
| 769 | 708 | 52A042EB1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.h */, | ||
| 770 | 709 | 52A042EC1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m */, | ||
| 771 | 710 | 52A042ED1606D6C40000B4BC /* OAMutableURLRequest.h */, | ||
| 772 | 711 | 52A042EE1606D6C40000B4BC /* OAMutableURLRequest.m */, | ||
| 773 | 712 | 52A042EF1606D6C40000B4BC /* OAPlaintextSignatureProvider.h */, | ||
| 774 | 713 | 52A042F01606D6C40000B4BC /* OAPlaintextSignatureProvider.m */, | ||
| 775 | 714 | 52A042F11606D6C40000B4BC /* OAProblem.h */, | ||
| 776 | 715 | 52A042F21606D6C40000B4BC /* OAProblem.m */, | ||
| 777 | 716 | 52A042F31606D6C40000B4BC /* OARequestParameter.h */, | ||
| 778 | 717 | 52A042F41606D6C40000B4BC /* OARequestParameter.m */, | ||
| 779 | 718 | 52A042F51606D6C40000B4BC /* OAServiceTicket.h */, | ||
| 780 | 719 | 52A042F61606D6C40000B4BC /* OAServiceTicket.m */, | ||
| 781 | 720 | 52A042F71606D6C40000B4BC /* OASignatureProviding.h */, | ||
| 782 | 721 | 52A042F81606D6C40000B4BC /* OATestServer.rb */, | ||
| 783 | 722 | 52A042F91606D6C40000B4BC /* OAToken.h */, | ||
| 784 | 723 | 52A042FA1606D6C40000B4BC /* OAToken.m */, | ||
| 785 | 724 | 52A042FB1606D6C40000B4BC /* OATokenManager.h */, | ||
| 786 | 725 | 52A042FC1606D6C40000B4BC /* OATokenManager.m */, | ||
| 787 | 726 | 52A042FD1606D6C40000B4BC /* OAuthConsumer.h */, | ||
| 788 | 727 | 52A042FE1606D6C40000B4BC /* README */, | ||
| 789 | 728 | ); | ||
| 790 | 729 | name = oauthconsumer; | ||
| 791 | 730 | path = Dependencies/oauthconsumer; | ||
| 792 | 731 | sourceTree = "<group>"; | ||
| 793 | 732 | }; | ||
| 794 | 733 | 52A042D51606D6C40000B4BC /* Categories */ = { | ||
| 795 | 734 | isa = PBXGroup; | ||
| 796 | 735 | children = ( | ||
| 797 | 736 | 52A042D61606D6C40000B4BC /* NSMutableURLRequest+Parameters.h */, | ||
| 798 | 737 | 52A042D71606D6C40000B4BC /* NSMutableURLRequest+Parameters.m */, | ||
| 799 | 738 | 52A042D81606D6C40000B4BC /* NSString+URLEncoding.h */, | ||
| 800 | 739 | 52A042D91606D6C40000B4BC /* NSString+URLEncoding.m */, | ||
| 801 | 740 | 52A042DA1606D6C40000B4BC /* NSURL+Base.h */, | ||
| 802 | 741 | 52A042DB1606D6C40000B4BC /* NSURL+Base.m */, | ||
| 803 | 742 | ); | ||
| 804 | 743 | path = Categories; | ||
| 805 | 744 | sourceTree = "<group>"; | ||
| 806 | 745 | }; | ||
| 807 | 746 | 52A042DC1606D6C40000B4BC /* Crypto */ = { | ||
| 808 | 747 | isa = PBXGroup; | ||
| 809 | 748 | children = ( | ||
| 810 | 749 | 52A042DD1606D6C40000B4BC /* Base64Transcoder.c */, | ||
| 811 | 750 | 52A042DE1606D6C40000B4BC /* Base64Transcoder.h */, | ||
| 812 | 751 | 52A042DF1606D6C40000B4BC /* hmac.c */, | ||
| 813 | 752 | 52A042E01606D6C40000B4BC /* hmac.h */, | ||
| 814 | 753 | 52A042E11606D6C40000B4BC /* sha1.c */, | ||
| 815 | 754 | 52A042E21606D6C40000B4BC /* sha1.h */, | ||
| 816 | 755 | ); | ||
| 817 | 756 | path = Crypto; | ||
| 818 | 757 | sourceTree = "<group>"; | ||
| 819 | 758 | }; | ||
| 820 | 682 | 91018B261359233E0051EFDC /* Base View Controllers */ = { | 759 | 91018B261359233E0051EFDC /* Base View Controllers */ = { |
| 821 | 683 | isa = PBXGroup; | 760 | isa = PBXGroup; |
| 822 | 684 | children = ( | 761 | children = ( |
| 823 | @@ -896,8 +973,6 @@ | |||
| 824 | 896 | 937FAA10137CFC1B00507E51 /* AlbumArtDownloadOperation.m */, | 973 | 937FAA10137CFC1B00507E51 /* AlbumArtDownloadOperation.m */, |
| 825 | 897 | 937FAA19137CFCA600507E51 /* AbstractNetworkOperation.h */, | 974 | 937FAA19137CFCA600507E51 /* AbstractNetworkOperation.h */, |
| 826 | 898 | 937FAA1A137CFCA600507E51 /* AbstractNetworkOperation.m */, | 975 | 937FAA1A137CFCA600507E51 /* AbstractNetworkOperation.m */, |
| 827 | 899 | 964FA3DD13CA5D1D0018A65B /* UOJSONFetchOperation.h */, | ||
| 828 | 900 | 964FA3DE13CA5D1D0018A65B /* UOJSONFetchOperation.m */, | ||
| 829 | 901 | 964FA3E813CA848D0018A65B /* UOHTTPFetchOperation.h */, | 976 | 964FA3E813CA848D0018A65B /* UOHTTPFetchOperation.h */, |
| 830 | 902 | 964FA3E913CA848D0018A65B /* UOHTTPFetchOperation.m */, | 977 | 964FA3E913CA848D0018A65B /* UOHTTPFetchOperation.m */, |
| 831 | 903 | ); | 978 | ); |
| 832 | @@ -951,16 +1026,16 @@ | |||
| 833 | 951 | path = xibs; | 1026 | path = xibs; |
| 834 | 952 | sourceTree = "<group>"; | 1027 | sourceTree = "<group>"; |
| 835 | 953 | }; | 1028 | }; |
| 837 | 954 | 93F3346C1247FB78006C6707 /* Main */ = { | 1029 | 93F3346C1247FB78006C6707 /* Music */ = { |
| 838 | 955 | isa = PBXGroup; | 1030 | isa = PBXGroup; |
| 839 | 956 | children = ( | 1031 | children = ( |
| 840 | 957 | 93BC520A124C187700B7587C /* SynthesizeSingleton.h */, | ||
| 841 | 958 | 93F334841247FC15006C6707 /* U1Music_Prefix.pch */, | 1032 | 93F334841247FC15006C6707 /* U1Music_Prefix.pch */, |
| 842 | 959 | 93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */, | 1033 | 93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */, |
| 843 | 960 | 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */, | 1034 | 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */, |
| 845 | 961 | 93F334701247FB78006C6707 /* main.m */, | 1035 | 93DFFE4C135D71760061F29F /* music.xcdatamodeld */, |
| 846 | 1036 | 528515571604EED8004A1F7C /* Supporting Files */, | ||
| 847 | 962 | ); | 1037 | ); |
| 849 | 963 | name = Main; | 1038 | name = Music; |
| 850 | 964 | path = "Other Sources"; | 1039 | path = "Other Sources"; |
| 851 | 965 | sourceTree = "<group>"; | 1040 | sourceTree = "<group>"; |
| 852 | 966 | }; | 1041 | }; |
| 853 | @@ -988,47 +1063,76 @@ | |||
| 854 | 988 | 93FA42A6124DC1350080DF62 /* Images */ = { | 1063 | 93FA42A6124DC1350080DF62 /* Images */ = { |
| 855 | 989 | isa = PBXGroup; | 1064 | isa = PBXGroup; |
| 856 | 990 | children = ( | 1065 | children = ( |
| 857 | 1066 | 93FA42A7124DC1350080DF62 /* 03-loopback.png */, | ||
| 858 | 1067 | 93FA42A8124DC1350080DF62 /* 03-loopback@2x.png */, | ||
| 859 | 1068 | 93FA42A9124DC1350080DF62 /* 05-shuffle.png */, | ||
| 860 | 1069 | 93FA42AA124DC1350080DF62 /* 05-shuffle@2x.png */, | ||
| 861 | 1070 | 52AC3D4B1604513E00B4785D /* about_logo.png */, | ||
| 862 | 1071 | 52AC3D4C1604513E00B4785D /* albums.png */, | ||
| 863 | 1072 | 52AC3D4D1604513E00B4785D /* albums@2x.png */, | ||
| 864 | 1073 | 932E7B0A12552CD500E7C8FF /* arrow.png */, | ||
| 865 | 1074 | 52AC3D4E1604513E00B4785D /* artists.png */, | ||
| 866 | 1075 | 52AC3D4F1604513E00B4785D /* artists@2x.png */, | ||
| 867 | 1076 | 93FA42AB124DC1350080DF62 /* background.png */, | ||
| 868 | 1077 | 93FA43A2124DEE0E0080DF62 /* bluetrack.png */, | ||
| 869 | 1078 | 52AC3D501604513E00B4785D /* cached.png */, | ||
| 870 | 1079 | 52AC3D511604513E00B4785D /* cached@2x.png */, | ||
| 871 | 991 | 52169C9D15D95E2C00ED366D /* cancel.png */, | 1080 | 52169C9D15D95E2C00ED366D /* cancel.png */, |
| 872 | 992 | 52169C9E15D95E2C00ED366D /* cancel@2x.png */, | 1081 | 52169C9E15D95E2C00ED366D /* cancel@2x.png */, |
| 873 | 993 | 52169C9F15D95E2C00ED366D /* trash-grey.png */, | ||
| 874 | 994 | 52169CA015D95E2C00ED366D /* trash-grey@2x.png */, | ||
| 875 | 995 | 52169C9415D95DD100ED366D /* cancel-grey.png */, | 1082 | 52169C9415D95DD100ED366D /* cancel-grey.png */, |
| 876 | 996 | 52169C9515D95DD100ED366D /* cancel-grey@2x.png */, | 1083 | 52169C9515D95DD100ED366D /* cancel-grey@2x.png */, |
| 885 | 997 | 52169C9615D95DD100ED366D /* trash.png */, | 1084 | 52AC3D521604513E00B4785D /* Default.png */, |
| 886 | 998 | 52169C9715D95DD100ED366D /* trash@2x.png */, | 1085 | 52AC3D531604513E00B4785D /* Default@2x.png */, |
| 887 | 999 | 523B3CF515B73BA0004394F4 /* download-grey.png */, | 1086 | 52AC3D831604539000B4785D /* Default-568h@2x.png */, |
| 880 | 1000 | 523B3CF615B73BA0004394F4 /* download-grey@2x.png */, | ||
| 881 | 1001 | 523B3CF715B73BA0004394F4 /* download.png */, | ||
| 882 | 1002 | 523B3CF815B73BA0004394F4 /* download@2x.png */, | ||
| 883 | 1003 | 523B3CE015B5D64F004394F4 /* grabber.png */, | ||
| 884 | 1004 | 523B3CE115B5D64F004394F4 /* grabber@2x.png */, | ||
| 888 | 1005 | 9149D9C9159BEC3D009AE771 /* default-album-art-120.png */, | 1087 | 9149D9C9159BEC3D009AE771 /* default-album-art-120.png */, |
| 889 | 1006 | 9149D9CB159BEC3D009AE771 /* default-album-art-120@2x.png */, | 1088 | 9149D9CB159BEC3D009AE771 /* default-album-art-120@2x.png */, |
| 890 | 1007 | 9149D9CA159BEC3D009AE771 /* default-album-art-200.png */, | 1089 | 9149D9CA159BEC3D009AE771 /* default-album-art-200.png */, |
| 891 | 1008 | 9149D9CC159BEC3D009AE771 /* default-album-art-200@2x.png */, | 1090 | 9149D9CC159BEC3D009AE771 /* default-album-art-200@2x.png */, |
| 892 | 1009 | 9149D9CD159BEC3D009AE771 /* default-album-art-640.png */, | 1091 | 9149D9CD159BEC3D009AE771 /* default-album-art-640.png */, |
| 893 | 1010 | 9149D9CE159BEC3D009AE771 /* default-album-art-640@2x.png */, | 1092 | 9149D9CE159BEC3D009AE771 /* default-album-art-640@2x.png */, |
| 895 | 1011 | 932E7B0A12552CD500E7C8FF /* arrow.png */, | 1093 | 523B3CF715B73BA0004394F4 /* download.png */, |
| 896 | 1094 | 523B3CF815B73BA0004394F4 /* download@2x.png */, | ||
| 897 | 1095 | 523B3CF515B73BA0004394F4 /* download-grey.png */, | ||
| 898 | 1096 | 523B3CF615B73BA0004394F4 /* download-grey@2x.png */, | ||
| 899 | 1097 | 523B3CE015B5D64F004394F4 /* grabber.png */, | ||
| 900 | 1098 | 523B3CE115B5D64F004394F4 /* grabber@2x.png */, | ||
| 901 | 1099 | 52AC3D541604513E00B4785D /* header_bg.png */, | ||
| 902 | 1100 | 52AC3D551604513E00B4785D /* header_logo@2x.png */, | ||
| 903 | 1101 | 93D6B285124FD279007880B0 /* loopback-highlight.png */, | ||
| 904 | 1102 | 93D6B286124FD279007880B0 /* loopback-highlight@2x.png */, | ||
| 905 | 1103 | 93D6B2BB124FD72D007880B0 /* loopback-one-highlight.png */, | ||
| 906 | 1104 | 93D6B2BC124FD72D007880B0 /* loopback-one-highlight@2x.png */, | ||
| 907 | 1105 | 52AC3D561604513E00B4785D /* music_29.png */, | ||
| 908 | 1106 | 52AC3D571604513E00B4785D /* music_57.png */, | ||
| 909 | 1107 | 52AC3D581604513E00B4785D /* music_57@2x.png */, | ||
| 910 | 1108 | 52AC3D591604513E00B4785D /* music_512.png */, | ||
| 911 | 1109 | 52AC3D5A1604513E00B4785D /* partiallycached.png */, | ||
| 912 | 1110 | 52AC3D5B1604513E00B4785D /* partiallycached@2x.png */, | ||
| 913 | 1111 | 93FA4334124DE0D80080DF62 /* player_back.png */, | ||
| 914 | 1112 | 93FA4335124DE0D80080DF62 /* player_back@2x.png */, | ||
| 915 | 1113 | 93FA43B3124DF07C0080DF62 /* player_overlay_bg.png */, | ||
| 916 | 1114 | 93FA43B4124DF07C0080DF62 /* player_overlay_bg@2x.png */, | ||
| 917 | 1115 | 52AC3D5C1604513E00B4785D /* playlists.png */, | ||
| 918 | 1116 | 52AC3D5D1604513E00B4785D /* playlists@2x.png */, | ||
| 919 | 1117 | 52AC3D5E1604513E00B4785D /* progress-label-background.png */, | ||
| 920 | 1118 | 52AC3D5F1604513E00B4785D /* settings.png */, | ||
| 921 | 1119 | 52AC3D601604513E00B4785D /* settings@2x.png */, | ||
| 922 | 1120 | 52AC3D611604513E00B4785D /* songs.png */, | ||
| 923 | 1121 | 52AC3D621604513E00B4785D /* songs@2x.png */, | ||
| 924 | 1012 | 93CCBD4D1254039900AFFC22 /* speaker.png */, | 1122 | 93CCBD4D1254039900AFFC22 /* speaker.png */, |
| 925 | 1013 | 93CCBD4E1254039900AFFC22 /* speaker@2x.png */, | 1123 | 93CCBD4E1254039900AFFC22 /* speaker@2x.png */, |
| 926 | 1014 | 93D6B2BB124FD72D007880B0 /* loopback-one-highlight.png */, | ||
| 927 | 1015 | 93D6B2BC124FD72D007880B0 /* loopback-one-highlight@2x.png */, | ||
| 928 | 1016 | 93D6B289124FD280007880B0 /* shuffle-highlight.png */, | 1124 | 93D6B289124FD280007880B0 /* shuffle-highlight.png */, |
| 929 | 1017 | 93D6B28A124FD280007880B0 /* shuffle-highlight@2x.png */, | 1125 | 93D6B28A124FD280007880B0 /* shuffle-highlight@2x.png */, |
| 935 | 1018 | 93D6B285124FD279007880B0 /* loopback-highlight.png */, | 1126 | 52169C9615D95DD100ED366D /* trash.png */, |
| 936 | 1019 | 93D6B286124FD279007880B0 /* loopback-highlight@2x.png */, | 1127 | 52169C9715D95DD100ED366D /* trash@2x.png */, |
| 937 | 1020 | 93FA43B3124DF07C0080DF62 /* player_overlay_bg.png */, | 1128 | 52169C9F15D95E2C00ED366D /* trash-grey.png */, |
| 938 | 1021 | 93FA43B4124DF07C0080DF62 /* player_overlay_bg@2x.png */, | 1129 | 52169CA015D95E2C00ED366D /* trash-grey@2x.png */, |
| 939 | 1022 | 93FA43A2124DEE0E0080DF62 /* bluetrack.png */, | 1130 | 52AC3D631604513E00B4785D /* uncached-disabled.png */, |
| 940 | 1131 | 52AC3D641604513E00B4785D /* uncached-disabled@2x.png */, | ||
| 941 | 1132 | 52AC3D651604513E00B4785D /* uncached.png */, | ||
| 942 | 1133 | 52AC3D661604513E00B4785D /* uncached@2x.png */, | ||
| 943 | 1023 | 93FA43A3124DEE0E0080DF62 /* whiteslide.png */, | 1134 | 93FA43A3124DEE0E0080DF62 /* whiteslide.png */, |
| 944 | 1024 | 93FA43A4124DEE0E0080DF62 /* whitetrack.png */, | 1135 | 93FA43A4124DEE0E0080DF62 /* whitetrack.png */, |
| 945 | 1025 | 93FA4334124DE0D80080DF62 /* player_back.png */, | ||
| 946 | 1026 | 93FA4335124DE0D80080DF62 /* player_back@2x.png */, | ||
| 947 | 1027 | 93FA42A7124DC1350080DF62 /* 03-loopback.png */, | ||
| 948 | 1028 | 93FA42A8124DC1350080DF62 /* 03-loopback@2x.png */, | ||
| 949 | 1029 | 93FA42A9124DC1350080DF62 /* 05-shuffle.png */, | ||
| 950 | 1030 | 93FA42AA124DC1350080DF62 /* 05-shuffle@2x.png */, | ||
| 951 | 1031 | 93FA42AB124DC1350080DF62 /* background.png */, | ||
| 952 | 1032 | ); | 1136 | ); |
| 953 | 1033 | name = Images; | 1137 | name = Images; |
| 954 | 1034 | path = images; | 1138 | path = images; |
| 955 | @@ -1080,76 +1184,14 @@ | |||
| 956 | 1080 | 964FA39013CA5BE60018A65B /* Dependencies */ = { | 1184 | 964FA39013CA5BE60018A65B /* Dependencies */ = { |
| 957 | 1081 | isa = PBXGroup; | 1185 | isa = PBXGroup; |
| 958 | 1082 | children = ( | 1186 | children = ( |
| 959 | 1187 | 52A042D41606D6C40000B4BC /* oauthconsumer */, | ||
| 960 | 1188 | 93BC520A124C187700B7587C /* SynthesizeSingleton.h */, | ||
| 961 | 1189 | 5279764815F00B2600F8435F /* libz.dylib */, | ||
| 962 | 1083 | 91328278144E07EA00395F40 /* TestFlight SDK */, | 1190 | 91328278144E07EA00395F40 /* TestFlight SDK */, |
| 963 | 1084 | 964FA39713CA5C040018A65B /* oauthconsumer */, | ||
| 964 | 1085 | ); | 1191 | ); |
| 965 | 1086 | name = Dependencies; | 1192 | name = Dependencies; |
| 966 | 1087 | sourceTree = "<group>"; | 1193 | sourceTree = "<group>"; |
| 967 | 1088 | }; | 1194 | }; |
| 968 | 1089 | 964FA39713CA5C040018A65B /* oauthconsumer */ = { | ||
| 969 | 1090 | isa = PBXGroup; | ||
| 970 | 1091 | children = ( | ||
| 971 | 1092 | 964FA39813CA5C040018A65B /* Categories */, | ||
| 972 | 1093 | 964FA39F13CA5C040018A65B /* Crypto */, | ||
| 973 | 1094 | 964FA3A613CA5C040018A65B /* OAAttachment.h */, | ||
| 974 | 1095 | 964FA3A713CA5C040018A65B /* OAAttachment.m */, | ||
| 975 | 1096 | 964FA3A813CA5C040018A65B /* OACall.h */, | ||
| 976 | 1097 | 964FA3A913CA5C040018A65B /* OACall.m */, | ||
| 977 | 1098 | 964FA3AA13CA5C040018A65B /* OAConsumer.h */, | ||
| 978 | 1099 | 964FA3AB13CA5C040018A65B /* OAConsumer.m */, | ||
| 979 | 1100 | 964FA3AC13CA5C040018A65B /* OADataFetcher.h */, | ||
| 980 | 1101 | 964FA3AD13CA5C040018A65B /* OADataFetcher.m */, | ||
| 981 | 1102 | 964FA3AE13CA5C040018A65B /* OAHMAC_SHA1SignatureProvider.h */, | ||
| 982 | 1103 | 964FA3AF13CA5C040018A65B /* OAHMAC_SHA1SignatureProvider.m */, | ||
| 983 | 1104 | 964FA3B013CA5C040018A65B /* OAMutableURLRequest.h */, | ||
| 984 | 1105 | 964FA3B113CA5C040018A65B /* OAMutableURLRequest.m */, | ||
| 985 | 1106 | 964FA3B213CA5C040018A65B /* OAPlaintextSignatureProvider.h */, | ||
| 986 | 1107 | 964FA3B313CA5C040018A65B /* OAPlaintextSignatureProvider.m */, | ||
| 987 | 1108 | 964FA3B413CA5C040018A65B /* OAProblem.h */, | ||
| 988 | 1109 | 964FA3B513CA5C040018A65B /* OAProblem.m */, | ||
| 989 | 1110 | 964FA3B613CA5C040018A65B /* OARequestParameter.h */, | ||
| 990 | 1111 | 964FA3B713CA5C040018A65B /* OARequestParameter.m */, | ||
| 991 | 1112 | 964FA3B813CA5C040018A65B /* OAServiceTicket.h */, | ||
| 992 | 1113 | 964FA3B913CA5C040018A65B /* OAServiceTicket.m */, | ||
| 993 | 1114 | 964FA3BA13CA5C040018A65B /* OASignatureProviding.h */, | ||
| 994 | 1115 | 964FA3BB13CA5C040018A65B /* OATestServer.rb */, | ||
| 995 | 1116 | 964FA3BC13CA5C040018A65B /* OAToken.h */, | ||
| 996 | 1117 | 964FA3BD13CA5C040018A65B /* OAToken.m */, | ||
| 997 | 1118 | 964FA3BE13CA5C040018A65B /* OATokenManager.h */, | ||
| 998 | 1119 | 964FA3BF13CA5C040018A65B /* OATokenManager.m */, | ||
| 999 | 1120 | 964FA3C013CA5C040018A65B /* OAuthConsumer.h */, | ||
| 1000 | 1121 | 964FA3C113CA5C040018A65B /* README */, | ||
| 1001 | 1122 | ); | ||
| 1002 | 1123 | name = oauthconsumer; | ||
| 1003 | 1124 | path = Dependencies/oauthconsumer; | ||
| 1004 | 1125 | sourceTree = "<group>"; | ||
| 1005 | 1126 | }; | ||
| 1006 | 1127 | 964FA39813CA5C040018A65B /* Categories */ = { | ||
| 1007 | 1128 | isa = PBXGroup; | ||
| 1008 | 1129 | children = ( | ||
| 1009 | 1130 | 964FA39913CA5C040018A65B /* NSMutableURLRequest+Parameters.h */, | ||
| 1010 | 1131 | 964FA39A13CA5C040018A65B /* NSMutableURLRequest+Parameters.m */, | ||
| 1011 | 1132 | 964FA39B13CA5C040018A65B /* NSString+URLEncoding.h */, | ||
| 1012 | 1133 | 964FA39C13CA5C040018A65B /* NSString+URLEncoding.m */, | ||
| 1013 | 1134 | 964FA39D13CA5C040018A65B /* NSURL+Base.h */, | ||
| 1014 | 1135 | 964FA39E13CA5C040018A65B /* NSURL+Base.m */, | ||
| 1015 | 1136 | ); | ||
| 1016 | 1137 | path = Categories; | ||
| 1017 | 1138 | sourceTree = "<group>"; | ||
| 1018 | 1139 | }; | ||
| 1019 | 1140 | 964FA39F13CA5C040018A65B /* Crypto */ = { | ||
| 1020 | 1141 | isa = PBXGroup; | ||
| 1021 | 1142 | children = ( | ||
| 1022 | 1143 | 964FA3A013CA5C040018A65B /* Base64Transcoder.c */, | ||
| 1023 | 1144 | 964FA3A113CA5C040018A65B /* Base64Transcoder.h */, | ||
| 1024 | 1145 | 964FA3A213CA5C040018A65B /* hmac.c */, | ||
| 1025 | 1146 | 964FA3A313CA5C040018A65B /* hmac.h */, | ||
| 1026 | 1147 | 964FA3A413CA5C040018A65B /* sha1.c */, | ||
| 1027 | 1148 | 964FA3A513CA5C040018A65B /* sha1.h */, | ||
| 1028 | 1149 | ); | ||
| 1029 | 1150 | path = Crypto; | ||
| 1030 | 1151 | sourceTree = "<group>"; | ||
| 1031 | 1152 | }; | ||
| 1032 | 1153 | 9654C9B713C7824500D0EEA0 /* SSO */ = { | 1195 | 9654C9B713C7824500D0EEA0 /* SSO */ = { |
| 1033 | 1154 | isa = PBXGroup; | 1196 | isa = PBXGroup; |
| 1034 | 1155 | children = ( | 1197 | children = ( |
| 1035 | @@ -1158,8 +1200,6 @@ | |||
| 1036 | 1158 | 9654C9BB13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib */, | 1200 | 9654C9BB13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib */, |
| 1037 | 1159 | 9654C9C513C7AF9200D0EEA0 /* UOMusicLoginController.h */, | 1201 | 9654C9C513C7AF9200D0EEA0 /* UOMusicLoginController.h */, |
| 1038 | 1160 | 9654C9C613C7AF9200D0EEA0 /* UOMusicLoginController.m */, | 1202 | 9654C9C613C7AF9200D0EEA0 /* UOMusicLoginController.m */, |
| 1039 | 1161 | 964FA3EB13CA8C490018A65B /* UOSSOMusicCredsFetchOperation.h */, | ||
| 1040 | 1162 | 964FA3EC13CA8C490018A65B /* UOSSOMusicCredsFetchOperation.m */, | ||
| 1041 | 1163 | ); | 1203 | ); |
| 1042 | 1164 | name = SSO; | 1204 | name = SSO; |
| 1043 | 1165 | sourceTree = "<group>"; | 1205 | sourceTree = "<group>"; |
| 1044 | @@ -1190,6 +1230,7 @@ | |||
| 1045 | 1190 | buildRules = ( | 1230 | buildRules = ( |
| 1046 | 1191 | ); | 1231 | ); |
| 1047 | 1192 | dependencies = ( | 1232 | dependencies = ( |
| 1048 | 1233 | 528515981604F409004A1F7C /* PBXTargetDependency */, | ||
| 1049 | 1193 | ); | 1234 | ); |
| 1050 | 1194 | name = U1Music; | 1235 | name = U1Music; |
| 1051 | 1195 | productName = iSubTESTING; | 1236 | productName = iSubTESTING; |
| 1052 | @@ -1218,6 +1259,12 @@ | |||
| 1053 | 1218 | ); | 1259 | ); |
| 1054 | 1219 | mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; | 1260 | mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; |
| 1055 | 1220 | projectDirPath = ""; | 1261 | projectDirPath = ""; |
| 1056 | 1262 | projectReferences = ( | ||
| 1057 | 1263 | { | ||
| 1058 | 1264 | ProductGroup = 5285158F1604F16B004A1F7C /* Products */; | ||
| 1059 | 1265 | ProjectRef = 5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */; | ||
| 1060 | 1266 | }, | ||
| 1061 | 1267 | ); | ||
| 1062 | 1221 | projectRoot = ""; | 1268 | projectRoot = ""; |
| 1063 | 1222 | targets = ( | 1269 | targets = ( |
| 1064 | 1223 | 1D6058900D05DD3D006BFB54 /* U1Music */, | 1270 | 1D6058900D05DD3D006BFB54 /* U1Music */, |
| 1065 | @@ -1225,13 +1272,28 @@ | |||
| 1066 | 1225 | }; | 1272 | }; |
| 1067 | 1226 | /* End PBXProject section */ | 1273 | /* End PBXProject section */ |
| 1068 | 1227 | 1274 | ||
| 1069 | 1275 | /* Begin PBXReferenceProxy section */ | ||
| 1070 | 1276 | 528515941604F16D004A1F7C /* UbuntuOneAuthKit.a */ = { | ||
| 1071 | 1277 | isa = PBXReferenceProxy; | ||
| 1072 | 1278 | fileType = archive.ar; | ||
| 1073 | 1279 | path = UbuntuOneAuthKit.a; | ||
| 1074 | 1280 | remoteRef = 528515931604F16D004A1F7C /* PBXContainerItemProxy */; | ||
| 1075 | 1281 | sourceTree = BUILT_PRODUCTS_DIR; | ||
| 1076 | 1282 | }; | ||
| 1077 | 1283 | 528515961604F16D004A1F7C /* UbuntuOneAuthKitTests.octest */ = { | ||
| 1078 | 1284 | isa = PBXReferenceProxy; | ||
| 1079 | 1285 | fileType = wrapper.cfbundle; | ||
| 1080 | 1286 | path = UbuntuOneAuthKitTests.octest; | ||
| 1081 | 1287 | remoteRef = 528515951604F16D004A1F7C /* PBXContainerItemProxy */; | ||
| 1082 | 1288 | sourceTree = BUILT_PRODUCTS_DIR; | ||
| 1083 | 1289 | }; | ||
| 1084 | 1290 | /* End PBXReferenceProxy section */ | ||
| 1085 | 1291 | |||
| 1086 | 1228 | /* Begin PBXResourcesBuildPhase section */ | 1292 | /* Begin PBXResourcesBuildPhase section */ |
| 1087 | 1229 | 1D60588D0D05DD3D006BFB54 /* Resources */ = { | 1293 | 1D60588D0D05DD3D006BFB54 /* Resources */ = { |
| 1088 | 1230 | isa = PBXResourcesBuildPhase; | 1294 | isa = PBXResourcesBuildPhase; |
| 1089 | 1231 | buildActionMask = 2147483647; | 1295 | buildActionMask = 2147483647; |
| 1090 | 1232 | files = ( | 1296 | files = ( |
| 1091 | 1233 | 5305C2061157F4F800BC78F0 /* Default.png in Resources */, | ||
| 1092 | 1234 | 53F0CD8211589F0A00A665CD /* progress-label-background.png in Resources */, | ||
| 1093 | 1235 | 93F334681247FB02006C6707 /* SongViewController.xib in Resources */, | 1297 | 93F334681247FB02006C6707 /* SongViewController.xib in Resources */, |
| 1094 | 1236 | 93F334691247FB02006C6707 /* MainWindow.xib in Resources */, | 1298 | 93F334691247FB02006C6707 /* MainWindow.xib in Resources */, |
| 1095 | 1237 | 93F3346A1247FB02006C6707 /* SearchableTableViewController.xib in Resources */, | 1299 | 93F3346A1247FB02006C6707 /* SearchableTableViewController.xib in Resources */, |
| 1096 | @@ -1253,39 +1315,13 @@ | |||
| 1097 | 1253 | 93D6B28C124FD280007880B0 /* shuffle-highlight@2x.png in Resources */, | 1315 | 93D6B28C124FD280007880B0 /* shuffle-highlight@2x.png in Resources */, |
| 1098 | 1254 | 93D6B2BD124FD72D007880B0 /* loopback-one-highlight.png in Resources */, | 1316 | 93D6B2BD124FD72D007880B0 /* loopback-one-highlight.png in Resources */, |
| 1099 | 1255 | 93D6B2BE124FD72D007880B0 /* loopback-one-highlight@2x.png in Resources */, | 1317 | 93D6B2BE124FD72D007880B0 /* loopback-one-highlight@2x.png in Resources */, |
| 1100 | 1256 | 93D6B50E1252CA71007880B0 /* music_29.png in Resources */, | ||
| 1101 | 1257 | 93D6B50F1252CA71007880B0 /* music_57.png in Resources */, | ||
| 1102 | 1258 | 93D6B5111252CA71007880B0 /* music_512.png in Resources */, | ||
| 1103 | 1259 | 93D6B5151252CB34007880B0 /* music_57@2x.png in Resources */, | ||
| 1104 | 1260 | 93CCBD4F1254039900AFFC22 /* speaker.png in Resources */, | 1318 | 93CCBD4F1254039900AFFC22 /* speaker.png in Resources */, |
| 1105 | 1261 | 93CCBD501254039900AFFC22 /* speaker@2x.png in Resources */, | 1319 | 93CCBD501254039900AFFC22 /* speaker@2x.png in Resources */, |
| 1106 | 1262 | 93CCBD8012540CD200AFFC22 /* AboutViewController.xib in Resources */, | 1320 | 93CCBD8012540CD200AFFC22 /* AboutViewController.xib in Resources */, |
| 1107 | 1263 | 932E7A6E1254747E00E7C8FF /* Default@2x.png in Resources */, | ||
| 1108 | 1264 | 932E7AA01255265A00E7C8FF /* about.css in Resources */, | 1321 | 932E7AA01255265A00E7C8FF /* about.css in Resources */, |
| 1109 | 1265 | 932E7AA11255265A00E7C8FF /* about.html in Resources */, | 1322 | 932E7AA11255265A00E7C8FF /* about.html in Resources */, |
| 1110 | 1266 | 932E7B0B12552CD500E7C8FF /* arrow.png in Resources */, | 1323 | 932E7B0B12552CD500E7C8FF /* arrow.png in Resources */, |
| 1111 | 1267 | 9112B0241383FF27003C1D93 /* albums.png in Resources */, | ||
| 1112 | 1268 | 9112B0251383FF27003C1D93 /* artists.png in Resources */, | ||
| 1113 | 1269 | 9112B0261383FF27003C1D93 /* playlists.png in Resources */, | ||
| 1114 | 1270 | 9112B0281383FF27003C1D93 /* settings.png in Resources */, | ||
| 1115 | 1271 | 9112B0291383FF27003C1D93 /* songs.png in Resources */, | ||
| 1116 | 1272 | 9112B02F1383FF37003C1D93 /* albums@2x.png in Resources */, | ||
| 1117 | 1273 | 9112B0301383FF37003C1D93 /* artists@2x.png in Resources */, | ||
| 1118 | 1274 | 9112B0311383FF37003C1D93 /* playlists@2x.png in Resources */, | ||
| 1119 | 1275 | 9112B0321383FF37003C1D93 /* settings@2x.png in Resources */, | ||
| 1120 | 1276 | 9112B0331383FF37003C1D93 /* songs@2x.png in Resources */, | ||
| 1121 | 1277 | 91406E9413849F2400A7DA67 /* cached.png in Resources */, | ||
| 1122 | 1278 | 91406E9513849F2400A7DA67 /* cached@2x.png in Resources */, | ||
| 1123 | 1279 | 91406E9613849F2400A7DA67 /* partiallycached.png in Resources */, | ||
| 1124 | 1280 | 91406E9713849F2400A7DA67 /* partiallycached@2x.png in Resources */, | ||
| 1125 | 1281 | 91406E9813849F2400A7DA67 /* uncached.png in Resources */, | ||
| 1126 | 1282 | 91406E9913849F2400A7DA67 /* uncached@2x.png in Resources */, | ||
| 1127 | 1283 | 91D18DAB13B228D3001BEB42 /* uncached-disabled.png in Resources */, | ||
| 1128 | 1284 | 91D18DAC13B228D3001BEB42 /* uncached-disabled@2x.png in Resources */, | ||
| 1129 | 1285 | 9654C9BD13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib in Resources */, | 1324 | 9654C9BD13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib in Resources */, |
| 1130 | 1286 | 964FB0C213CB8B0C00D13DC3 /* header_bg.png in Resources */, | ||
| 1131 | 1287 | 964FB0C613CB8B6A00D13DC3 /* header_logo@2x.png in Resources */, | ||
| 1132 | 1288 | 91DB6B9F13E9C7190029BC77 /* about_logo.png in Resources */, | ||
| 1133 | 1289 | 9132827E144E07EA00395F40 /* README.txt in Resources */, | 1325 | 9132827E144E07EA00395F40 /* README.txt in Resources */, |
| 1134 | 1290 | 9132827F144E07EA00395F40 /* release_notes.txt in Resources */, | 1326 | 9132827F144E07EA00395F40 /* release_notes.txt in Resources */, |
| 1135 | 1291 | 91F2653114EACFCC0027232B /* U1MigrationViewController.xib in Resources */, | 1327 | 91F2653114EACFCC0027232B /* U1MigrationViewController.xib in Resources */, |
| 1136 | @@ -1309,6 +1345,37 @@ | |||
| 1137 | 1309 | 52169CA215D95E2C00ED366D /* cancel@2x.png in Resources */, | 1345 | 52169CA215D95E2C00ED366D /* cancel@2x.png in Resources */, |
| 1138 | 1310 | 52169CA315D95E2C00ED366D /* trash-grey.png in Resources */, | 1346 | 52169CA315D95E2C00ED366D /* trash-grey.png in Resources */, |
| 1139 | 1311 | 52169CA415D95E2C00ED366D /* trash-grey@2x.png in Resources */, | 1347 | 52169CA415D95E2C00ED366D /* trash-grey@2x.png in Resources */, |
| 1140 | 1348 | 52AC3D671604513E00B4785D /* about_logo.png in Resources */, | ||
| 1141 | 1349 | 52AC3D681604513E00B4785D /* albums.png in Resources */, | ||
| 1142 | 1350 | 52AC3D691604513E00B4785D /* albums@2x.png in Resources */, | ||
| 1143 | 1351 | 52AC3D6A1604513E00B4785D /* artists.png in Resources */, | ||
| 1144 | 1352 | 52AC3D6B1604513E00B4785D /* artists@2x.png in Resources */, | ||
| 1145 | 1353 | 52AC3D6C1604513E00B4785D /* cached.png in Resources */, | ||
| 1146 | 1354 | 52AC3D6D1604513E00B4785D /* cached@2x.png in Resources */, | ||
| 1147 | 1355 | 52AC3D6E1604513E00B4785D /* Default.png in Resources */, | ||
| 1148 | 1356 | 52AC3D6F1604513E00B4785D /* Default@2x.png in Resources */, | ||
| 1149 | 1357 | 52AC3D701604513E00B4785D /* header_bg.png in Resources */, | ||
| 1150 | 1358 | 52AC3D711604513E00B4785D /* header_logo@2x.png in Resources */, | ||
| 1151 | 1359 | 52AC3D721604513E00B4785D /* music_29.png in Resources */, | ||
| 1152 | 1360 | 52AC3D731604513E00B4785D /* music_57.png in Resources */, | ||
| 1153 | 1361 | 52AC3D741604513E00B4785D /* music_57@2x.png in Resources */, | ||
| 1154 | 1362 | 52AC3D751604513E00B4785D /* music_512.png in Resources */, | ||
| 1155 | 1363 | 52AC3D761604513E00B4785D /* partiallycached.png in Resources */, | ||
| 1156 | 1364 | 52AC3D771604513E00B4785D /* partiallycached@2x.png in Resources */, | ||
| 1157 | 1365 | 52AC3D781604513E00B4785D /* playlists.png in Resources */, | ||
| 1158 | 1366 | 52AC3D791604513E00B4785D /* playlists@2x.png in Resources */, | ||
| 1159 | 1367 | 52AC3D7A1604513E00B4785D /* progress-label-background.png in Resources */, | ||
| 1160 | 1368 | 52AC3D7B1604513E00B4785D /* settings.png in Resources */, | ||
| 1161 | 1369 | 52AC3D7C1604513E00B4785D /* settings@2x.png in Resources */, | ||
| 1162 | 1370 | 52AC3D7D1604513E00B4785D /* songs.png in Resources */, | ||
| 1163 | 1371 | 52AC3D7E1604513E00B4785D /* songs@2x.png in Resources */, | ||
| 1164 | 1372 | 52AC3D7F1604513E00B4785D /* uncached-disabled.png in Resources */, | ||
| 1165 | 1373 | 52AC3D801604513E00B4785D /* uncached-disabled@2x.png in Resources */, | ||
| 1166 | 1374 | 52AC3D811604513E00B4785D /* uncached.png in Resources */, | ||
| 1167 | 1375 | 52AC3D821604513E00B4785D /* uncached@2x.png in Resources */, | ||
| 1168 | 1376 | 52AC3D841604539000B4785D /* Default-568h@2x.png in Resources */, | ||
| 1169 | 1377 | 52A0430F1606D6C40000B4BC /* OATestServer.rb in Resources */, | ||
| 1170 | 1378 | 52A043121606D6C40000B4BC /* README in Resources */, | ||
| 1171 | 1312 | ); | 1379 | ); |
| 1172 | 1313 | runOnlyForDeploymentPostprocessing = 0; | 1380 | runOnlyForDeploymentPostprocessing = 0; |
| 1173 | 1314 | }; | 1381 | }; |
| 1174 | @@ -1337,24 +1404,6 @@ | |||
| 1175 | 1337 | isa = PBXSourcesBuildPhase; | 1404 | isa = PBXSourcesBuildPhase; |
| 1176 | 1338 | buildActionMask = 2147483647; | 1405 | buildActionMask = 2147483647; |
| 1177 | 1339 | files = ( | 1406 | files = ( |
| 1178 | 1340 | 964FA3C313CA5C4F0018A65B /* NSMutableURLRequest+Parameters.m in Sources */, | ||
| 1179 | 1341 | 964FA3C413CA5C4F0018A65B /* NSString+URLEncoding.m in Sources */, | ||
| 1180 | 1342 | 964FA3C513CA5C4F0018A65B /* NSURL+Base.m in Sources */, | ||
| 1181 | 1343 | 964FA3C613CA5C4F0018A65B /* Base64Transcoder.c in Sources */, | ||
| 1182 | 1344 | 964FA3C713CA5C4F0018A65B /* hmac.c in Sources */, | ||
| 1183 | 1345 | 964FA3C813CA5C4F0018A65B /* sha1.c in Sources */, | ||
| 1184 | 1346 | 964FA3C913CA5C4F0018A65B /* OAAttachment.m in Sources */, | ||
| 1185 | 1347 | 964FA3CA13CA5C4F0018A65B /* OACall.m in Sources */, | ||
| 1186 | 1348 | 964FA3CB13CA5C4F0018A65B /* OAConsumer.m in Sources */, | ||
| 1187 | 1349 | 964FA3CC13CA5C4F0018A65B /* OADataFetcher.m in Sources */, | ||
| 1188 | 1350 | 964FA3CD13CA5C500018A65B /* OAHMAC_SHA1SignatureProvider.m in Sources */, | ||
| 1189 | 1351 | 964FA3CE13CA5C500018A65B /* OAMutableURLRequest.m in Sources */, | ||
| 1190 | 1352 | 964FA3CF13CA5C500018A65B /* OAPlaintextSignatureProvider.m in Sources */, | ||
| 1191 | 1353 | 964FA3D013CA5C500018A65B /* OAProblem.m in Sources */, | ||
| 1192 | 1354 | 964FA3D113CA5C500018A65B /* OARequestParameter.m in Sources */, | ||
| 1193 | 1355 | 964FA3D213CA5C500018A65B /* OAServiceTicket.m in Sources */, | ||
| 1194 | 1356 | 964FA3D313CA5C500018A65B /* OAToken.m in Sources */, | ||
| 1195 | 1357 | 964FA3D413CA5C500018A65B /* OATokenManager.m in Sources */, | ||
| 1196 | 1358 | 9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */, | 1407 | 9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */, |
| 1197 | 1359 | 936F20681227364200070F43 /* Playlist.m in Sources */, | 1408 | 936F20681227364200070F43 /* Playlist.m in Sources */, |
| 1198 | 1360 | 936F209012273D9000070F43 /* Song.m in Sources */, | 1409 | 936F209012273D9000070F43 /* Song.m in Sources */, |
| 1199 | @@ -1424,9 +1473,7 @@ | |||
| 1200 | 1424 | 96FB790A13AA628700D8D4A4 /* UONetworkStatusCoordinator.m in Sources */, | 1473 | 96FB790A13AA628700D8D4A4 /* UONetworkStatusCoordinator.m in Sources */, |
| 1201 | 1425 | 9654C9BC13C7826900D0EEA0 /* UOSSOCredentialsViewController.m in Sources */, | 1474 | 9654C9BC13C7826900D0EEA0 /* UOSSOCredentialsViewController.m in Sources */, |
| 1202 | 1426 | 9654C9C713C7AF9200D0EEA0 /* UOMusicLoginController.m in Sources */, | 1475 | 9654C9C713C7AF9200D0EEA0 /* UOMusicLoginController.m in Sources */, |
| 1203 | 1427 | 964FA3DF13CA5D1D0018A65B /* UOJSONFetchOperation.m in Sources */, | ||
| 1204 | 1428 | 964FA3EA13CA848D0018A65B /* UOHTTPFetchOperation.m in Sources */, | 1476 | 964FA3EA13CA848D0018A65B /* UOHTTPFetchOperation.m in Sources */, |
| 1205 | 1429 | 964FA3ED13CA8C490018A65B /* UOSSOMusicCredsFetchOperation.m in Sources */, | ||
| 1206 | 1430 | 96377AEE14E0726800517845 /* U1Descriptor.m in Sources */, | 1477 | 96377AEE14E0726800517845 /* U1Descriptor.m in Sources */, |
| 1207 | 1431 | 96377AF314E0730B00517845 /* U1StreamReader.m in Sources */, | 1478 | 96377AF314E0730B00517845 /* U1StreamReader.m in Sources */, |
| 1208 | 1432 | 96377AF414E0730B00517845 /* U1StreamWriter.m in Sources */, | 1479 | 96377AF414E0730B00517845 /* U1StreamWriter.m in Sources */, |
| 1209 | @@ -1458,11 +1505,37 @@ | |||
| 1210 | 1458 | 91F2653014EACFCC0027232B /* U1MigrationViewController.m in Sources */, | 1505 | 91F2653014EACFCC0027232B /* U1MigrationViewController.m in Sources */, |
| 1211 | 1459 | 523B3CDE15B4C42F004394F4 /* SongUITableView.m in Sources */, | 1506 | 523B3CDE15B4C42F004394F4 /* SongUITableView.m in Sources */, |
| 1212 | 1460 | 523B3CE615B5D814004394F4 /* UOPullGestureRecognizer.m in Sources */, | 1507 | 523B3CE615B5D814004394F4 /* UOPullGestureRecognizer.m in Sources */, |
| 1213 | 1508 | 52A042FF1606D6C40000B4BC /* NSMutableURLRequest+Parameters.m in Sources */, | ||
| 1214 | 1509 | 52A043001606D6C40000B4BC /* NSString+URLEncoding.m in Sources */, | ||
| 1215 | 1510 | 52A043011606D6C40000B4BC /* NSURL+Base.m in Sources */, | ||
| 1216 | 1511 | 52A043021606D6C40000B4BC /* Base64Transcoder.c in Sources */, | ||
| 1217 | 1512 | 52A043031606D6C40000B4BC /* hmac.c in Sources */, | ||
| 1218 | 1513 | 52A043041606D6C40000B4BC /* sha1.c in Sources */, | ||
| 1219 | 1514 | 52A043051606D6C40000B4BC /* OAAttachment.m in Sources */, | ||
| 1220 | 1515 | 52A043061606D6C40000B4BC /* OACall.m in Sources */, | ||
| 1221 | 1516 | 52A043071606D6C40000B4BC /* OAConsumer.m in Sources */, | ||
| 1222 | 1517 | 52A043081606D6C40000B4BC /* OADataFetcher.m in Sources */, | ||
| 1223 | 1518 | 52A043091606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m in Sources */, | ||
| 1224 | 1519 | 52A0430A1606D6C40000B4BC /* OAMutableURLRequest.m in Sources */, | ||
| 1225 | 1520 | 52A0430B1606D6C40000B4BC /* OAPlaintextSignatureProvider.m in Sources */, | ||
| 1226 | 1521 | 52A0430C1606D6C40000B4BC /* OAProblem.m in Sources */, | ||
| 1227 | 1522 | 52A0430D1606D6C40000B4BC /* OARequestParameter.m in Sources */, | ||
| 1228 | 1523 | 52A0430E1606D6C40000B4BC /* OAServiceTicket.m in Sources */, | ||
| 1229 | 1524 | 52A043101606D6C40000B4BC /* OAToken.m in Sources */, | ||
| 1230 | 1525 | 52A043111606D6C40000B4BC /* OATokenManager.m in Sources */, | ||
| 1231 | 1461 | ); | 1526 | ); |
| 1232 | 1462 | runOnlyForDeploymentPostprocessing = 0; | 1527 | runOnlyForDeploymentPostprocessing = 0; |
| 1233 | 1463 | }; | 1528 | }; |
| 1234 | 1464 | /* End PBXSourcesBuildPhase section */ | 1529 | /* End PBXSourcesBuildPhase section */ |
| 1235 | 1465 | 1530 | ||
| 1236 | 1531 | /* Begin PBXTargetDependency section */ | ||
| 1237 | 1532 | 528515981604F409004A1F7C /* PBXTargetDependency */ = { | ||
| 1238 | 1533 | isa = PBXTargetDependency; | ||
| 1239 | 1534 | name = UbuntuOneAuthKit; | ||
| 1240 | 1535 | targetProxy = 528515971604F409004A1F7C /* PBXContainerItemProxy */; | ||
| 1241 | 1536 | }; | ||
| 1242 | 1537 | /* End PBXTargetDependency section */ | ||
| 1243 | 1538 | |||
| 1244 | 1466 | /* Begin XCBuildConfiguration section */ | 1539 | /* Begin XCBuildConfiguration section */ |
| 1245 | 1467 | 1D6058940D05DD3E006BFB54 /* Debug */ = { | 1540 | 1D6058940D05DD3E006BFB54 /* Debug */ = { |
| 1246 | 1468 | isa = XCBuildConfiguration; | 1541 | isa = XCBuildConfiguration; |
| 1247 | @@ -1472,6 +1545,8 @@ | |||
| 1248 | 1472 | armv6, | 1545 | armv6, |
| 1249 | 1473 | armv7, | 1546 | armv7, |
| 1250 | 1474 | ); | 1547 | ); |
| 1251 | 1548 | CLANG_ENABLE_OBJC_ARC = YES; | ||
| 1252 | 1549 | CLANG_WARN_OBJCPP_ARC_ABI = YES; | ||
| 1253 | 1475 | CODE_SIGN_ENTITLEMENTS = ""; | 1550 | CODE_SIGN_ENTITLEMENTS = ""; |
| 1254 | 1476 | CODE_SIGN_IDENTITY = "iPhone Developer"; | 1551 | CODE_SIGN_IDENTITY = "iPhone Developer"; |
| 1255 | 1477 | "CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer"; | 1552 | "CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer"; |
| 1256 | @@ -1484,11 +1559,13 @@ | |||
| 1257 | 1484 | GCC_PREFIX_HEADER = U1Music_Prefix.pch; | 1559 | GCC_PREFIX_HEADER = U1Music_Prefix.pch; |
| 1258 | 1485 | GCC_THUMB_SUPPORT = NO; | 1560 | GCC_THUMB_SUPPORT = NO; |
| 1259 | 1486 | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | 1561 | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; |
| 1260 | 1562 | HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; | ||
| 1261 | 1487 | INFOPLIST_FILE = "U1Music-Info.plist"; | 1563 | INFOPLIST_FILE = "U1Music-Info.plist"; |
| 1262 | 1488 | IPHONEOS_DEPLOYMENT_TARGET = 5.0; | 1564 | IPHONEOS_DEPLOYMENT_TARGET = 5.0; |
| 1263 | 1489 | LIBRARY_SEARCH_PATHS = ( | 1565 | LIBRARY_SEARCH_PATHS = ( |
| 1264 | 1490 | "$(inherited)", | 1566 | "$(inherited)", |
| 1265 | 1491 | "\"$(SRCROOT)/TestFlight SDK\"", | 1567 | "\"$(SRCROOT)/TestFlight SDK\"", |
| 1266 | 1568 | "$(BUILT_PRODUCTS_DIR)/**", | ||
| 1267 | 1492 | ); | 1569 | ); |
| 1268 | 1493 | PRODUCT_NAME = "U1 Music"; | 1570 | PRODUCT_NAME = "U1 Music"; |
| 1269 | 1494 | PROVISIONING_PROFILE = ""; | 1571 | PROVISIONING_PROFILE = ""; |
| 1270 | @@ -1507,6 +1584,8 @@ | |||
| 1271 | 1507 | armv6, | 1584 | armv6, |
| 1272 | 1508 | armv7, | 1585 | armv7, |
| 1273 | 1509 | ); | 1586 | ); |
| 1274 | 1587 | CLANG_ENABLE_OBJC_ARC = YES; | ||
| 1275 | 1588 | CLANG_WARN_OBJCPP_ARC_ABI = YES; | ||
| 1276 | 1510 | CODE_SIGN_ENTITLEMENTS = Entitlements.plist; | 1589 | CODE_SIGN_ENTITLEMENTS = Entitlements.plist; |
| 1277 | 1511 | CODE_SIGN_IDENTITY = "iPhone Distribution"; | 1590 | CODE_SIGN_IDENTITY = "iPhone Distribution"; |
| 1278 | 1512 | "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; | 1591 | "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; |
| 1279 | @@ -1516,11 +1595,13 @@ | |||
| 1280 | 1516 | GCC_PREFIX_HEADER = U1Music_Prefix.pch; | 1595 | GCC_PREFIX_HEADER = U1Music_Prefix.pch; |
| 1281 | 1517 | GCC_THUMB_SUPPORT = NO; | 1596 | GCC_THUMB_SUPPORT = NO; |
| 1282 | 1518 | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | 1597 | GCC_VERSION = com.apple.compilers.llvm.clang.1_0; |
| 1283 | 1598 | HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; | ||
| 1284 | 1519 | INFOPLIST_FILE = "U1Music-Info.plist"; | 1599 | INFOPLIST_FILE = "U1Music-Info.plist"; |
| 1285 | 1520 | IPHONEOS_DEPLOYMENT_TARGET = 5.0; | 1600 | IPHONEOS_DEPLOYMENT_TARGET = 5.0; |
| 1286 | 1521 | LIBRARY_SEARCH_PATHS = ( | 1601 | LIBRARY_SEARCH_PATHS = ( |
| 1287 | 1522 | "$(inherited)", | 1602 | "$(inherited)", |
| 1288 | 1523 | "\"$(SRCROOT)/TestFlight SDK\"", | 1603 | "\"$(SRCROOT)/TestFlight SDK\"", |
| 1289 | 1604 | "$(BUILT_PRODUCTS_DIR)/**", | ||
| 1290 | 1524 | ); | 1605 | ); |
| 1291 | 1525 | PRODUCT_NAME = "U1 Music"; | 1606 | PRODUCT_NAME = "U1 Music"; |
| 1292 | 1526 | PROVISIONING_PROFILE = ""; | 1607 | PROVISIONING_PROFILE = ""; |
| 1293 | @@ -1598,7 +1679,8 @@ | |||
| 1294 | 1598 | 93DFFE48135D71550061F29F /* music.xcdatamodel */, | 1679 | 93DFFE48135D71550061F29F /* music.xcdatamodel */, |
| 1295 | 1599 | ); | 1680 | ); |
| 1296 | 1600 | currentVersion = 914AC3EE14B60ECC00C7D5A3 /* U1Music 2.2-31.xcdatamodel */; | 1681 | currentVersion = 914AC3EE14B60ECC00C7D5A3 /* U1Music 2.2-31.xcdatamodel */; |
| 1298 | 1601 | path = music.xcdatamodeld; | 1682 | name = music.xcdatamodeld; |
| 1299 | 1683 | path = ../music.xcdatamodeld; | ||
| 1300 | 1602 | sourceTree = "<group>"; | 1684 | sourceTree = "<group>"; |
| 1301 | 1603 | versionGroupType = wrapper.xcdatamodel; | 1685 | versionGroupType = wrapper.xcdatamodel; |
| 1302 | 1604 | }; | 1686 | }; |
| 1303 | 1605 | 1687 | ||
| 1304 | === modified file 'categories/UIDevice+Hardware.m' | |||
| 1305 | --- categories/UIDevice+Hardware.m 2010-09-26 00:48:58 +0000 | |||
| 1306 | +++ categories/UIDevice+Hardware.m 2012-09-19 03:34:23 +0000 | |||
| 1307 | @@ -578,9 +578,10 @@ | |||
| 1308 | 578 | printf("Could not allocate memory. error!\n"); | 578 | printf("Could not allocate memory. error!\n"); |
| 1309 | 579 | return NULL; | 579 | return NULL; |
| 1310 | 580 | } | 580 | } |
| 1312 | 581 | 581 | ||
| 1313 | 582 | if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { | 582 | if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { |
| 1314 | 583 | printf("Error: sysctl, take 2"); | 583 | printf("Error: sysctl, take 2"); |
| 1315 | 584 | free(buf); | ||
| 1316 | 584 | return NULL; | 585 | return NULL; |
| 1317 | 585 | } | 586 | } |
| 1318 | 586 | 587 | ||
| 1319 | 587 | 588 | ||
| 1320 | === modified file 'categories/UIImage+Alpha.h' | |||
| 1321 | --- categories/UIImage+Alpha.h 2011-04-14 18:53:36 +0000 | |||
| 1322 | +++ categories/UIImage+Alpha.h 2012-09-19 03:34:23 +0000 | |||
| 1323 | @@ -8,4 +8,5 @@ | |||
| 1324 | 8 | - (BOOL)hasAlpha; | 8 | - (BOOL)hasAlpha; |
| 1325 | 9 | - (UIImage *)imageWithAlpha; | 9 | - (UIImage *)imageWithAlpha; |
| 1326 | 10 | - (UIImage *)transparentBorderImage:(NSUInteger)borderSize; | 10 | - (UIImage *)transparentBorderImage:(NSUInteger)borderSize; |
| 1327 | 11 | - (CGImageRef)newBorderMask:(NSUInteger)borderSize size:(CGSize)size; | ||
| 1328 | 11 | @end | 12 | @end |
| 1329 | 12 | \ No newline at end of file | 13 | \ No newline at end of file |
| 1330 | 13 | 14 | ||
| 1331 | === modified file 'categories/UIImage+Alpha.m' | |||
| 1332 | --- categories/UIImage+Alpha.m 2011-04-14 18:53:36 +0000 | |||
| 1333 | +++ categories/UIImage+Alpha.m 2012-09-19 03:34:23 +0000 | |||
| 1334 | @@ -5,11 +5,6 @@ | |||
| 1335 | 5 | 5 | ||
| 1336 | 6 | #import "UIImage+Alpha.h" | 6 | #import "UIImage+Alpha.h" |
| 1337 | 7 | 7 | ||
| 1338 | 8 | // Private helper methods | ||
| 1339 | 9 | @interface UIImage () | ||
| 1340 | 10 | - (CGImageRef)newBorderMask:(NSUInteger)borderSize size:(CGSize)size; | ||
| 1341 | 11 | @end | ||
| 1342 | 12 | |||
| 1343 | 13 | @implementation UIImage (Alpha) | 8 | @implementation UIImage (Alpha) |
| 1344 | 14 | 9 | ||
| 1345 | 15 | // Returns true if the image has an alpha layer | 10 | // Returns true if the image has an alpha layer |
| 1346 | 16 | 11 | ||
| 1347 | === modified file 'categories/UIImage+Resize.h' | |||
| 1348 | --- categories/UIImage+Resize.h 2011-05-02 07:33:18 +0000 | |||
| 1349 | +++ categories/UIImage+Resize.h 2012-09-19 03:34:23 +0000 | |||
| 1350 | @@ -15,5 +15,9 @@ | |||
| 1351 | 15 | - (UIImage *)resizedImageWithContentMode:(UIViewContentMode)contentMode | 15 | - (UIImage *)resizedImageWithContentMode:(UIViewContentMode)contentMode |
| 1352 | 16 | bounds:(CGSize)bounds | 16 | bounds:(CGSize)bounds |
| 1353 | 17 | interpolationQuality:(CGInterpolationQuality)quality; | 17 | interpolationQuality:(CGInterpolationQuality)quality; |
| 1355 | 18 | - (UIImage *) normalize; | 18 | - (UIImage *)resizedImage:(CGSize)newSize |
| 1356 | 19 | transform:(CGAffineTransform)transform | ||
| 1357 | 20 | drawTransposed:(BOOL)transpose | ||
| 1358 | 21 | interpolationQuality:(CGInterpolationQuality)quality; | ||
| 1359 | 22 | - (CGAffineTransform)transformForOrientation:(CGSize)newSize; | ||
| 1360 | 19 | @end | 23 | @end |
| 1361 | 20 | \ No newline at end of file | 24 | \ No newline at end of file |
| 1362 | 21 | 25 | ||
| 1363 | === modified file 'categories/UIImage+Resize.m' | |||
| 1364 | --- categories/UIImage+Resize.m 2012-08-16 16:48:51 +0000 | |||
| 1365 | +++ categories/UIImage+Resize.m 2012-09-19 03:34:23 +0000 | |||
| 1366 | @@ -7,15 +7,6 @@ | |||
| 1367 | 7 | #import "UIImage+RoundedCorner.h" | 7 | #import "UIImage+RoundedCorner.h" |
| 1368 | 8 | #import "UIImage+Alpha.h" | 8 | #import "UIImage+Alpha.h" |
| 1369 | 9 | 9 | ||
| 1370 | 10 | // Private helper methods | ||
| 1371 | 11 | @interface UIImage () | ||
| 1372 | 12 | - (UIImage *)resizedImage:(CGSize)newSize | ||
| 1373 | 13 | transform:(CGAffineTransform)transform | ||
| 1374 | 14 | drawTransposed:(BOOL)transpose | ||
| 1375 | 15 | interpolationQuality:(CGInterpolationQuality)quality; | ||
| 1376 | 16 | - (CGAffineTransform)transformForOrientation:(CGSize)newSize; | ||
| 1377 | 17 | @end | ||
| 1378 | 18 | |||
| 1379 | 19 | @implementation UIImage (Resize) | 10 | @implementation UIImage (Resize) |
| 1380 | 20 | 11 | ||
| 1381 | 21 | // Returns a copy of this image that is cropped to the given bounds. | 12 | // Returns a copy of this image that is cropped to the given bounds. |
| 1382 | @@ -48,7 +39,7 @@ | |||
| 1383 | 48 | UIImage *croppedImage = [resizedImage croppedImage:cropRect]; | 39 | UIImage *croppedImage = [resizedImage croppedImage:cropRect]; |
| 1384 | 49 | 40 | ||
| 1385 | 50 | UIImage *transparentBorderImage = borderSize ? [croppedImage transparentBorderImage:borderSize] : croppedImage; | 41 | UIImage *transparentBorderImage = borderSize ? [croppedImage transparentBorderImage:borderSize] : croppedImage; |
| 1387 | 51 | 42 | ||
| 1388 | 52 | return [transparentBorderImage roundedCornerImage:cornerRadius borderSize:borderSize]; | 43 | return [transparentBorderImage roundedCornerImage:cornerRadius borderSize:borderSize]; |
| 1389 | 53 | } | 44 | } |
| 1390 | 54 | 45 | ||
| 1391 | @@ -56,46 +47,33 @@ | |||
| 1392 | 56 | // The image will be scaled disproportionately if necessary to fit the bounds specified by the parameter | 47 | // The image will be scaled disproportionately if necessary to fit the bounds specified by the parameter |
| 1393 | 57 | - (UIImage *)resizedImage:(CGSize)newSize interpolationQuality:(CGInterpolationQuality)quality { | 48 | - (UIImage *)resizedImage:(CGSize)newSize interpolationQuality:(CGInterpolationQuality)quality { |
| 1394 | 58 | BOOL drawTransposed; | 49 | BOOL drawTransposed; |
| 1435 | 59 | 50 | CGAffineTransform transform = CGAffineTransformIdentity; | |
| 1436 | 60 | switch (self.imageOrientation) { | 51 | |
| 1437 | 61 | case UIImageOrientationLeft: | 52 | // In iOS 5 the image is already correctly rotated. See Eran Sandler's |
| 1438 | 62 | case UIImageOrientationLeftMirrored: | 53 | // addition here: http://eran.sandler.co.il/2011/11/07/uiimage-in-ios-5-orientation-and-resize/ |
| 1439 | 63 | case UIImageOrientationRight: | 54 | |
| 1440 | 64 | case UIImageOrientationRightMirrored: | 55 | if ( [[[UIDevice currentDevice] systemVersion] floatValue] >= 5.0 ) |
| 1441 | 65 | drawTransposed = YES; | 56 | { |
| 1442 | 66 | break; | 57 | drawTransposed = NO; |
| 1443 | 67 | 58 | } | |
| 1444 | 68 | default: | 59 | else |
| 1445 | 69 | drawTransposed = NO; | 60 | { |
| 1446 | 70 | } | 61 | switch ( self.imageOrientation ) |
| 1447 | 71 | 62 | { | |
| 1448 | 72 | return [[self normalize] resizedImage:newSize | 63 | case UIImageOrientationLeft: |
| 1449 | 73 | transform:[self transformForOrientation:newSize] | 64 | case UIImageOrientationLeftMirrored: |
| 1450 | 74 | drawTransposed:drawTransposed | 65 | case UIImageOrientationRight: |
| 1451 | 75 | interpolationQuality:quality]; | 66 | case UIImageOrientationRightMirrored: |
| 1452 | 76 | } | 67 | drawTransposed = YES; |
| 1453 | 77 | 68 | break; | |
| 1454 | 78 | //http://stackoverflow.com/questions/2457116/iphone-changing-cgimagealphainfo-of-cgimage | 69 | default: |
| 1455 | 79 | 70 | drawTransposed = NO; | |
| 1456 | 80 | - (UIImage *) normalize { | 71 | } |
| 1457 | 81 | 72 | ||
| 1458 | 82 | CGColorSpaceRef genericColorSpace = CGColorSpaceCreateDeviceRGB(); | 73 | transform = [self transformForOrientation:newSize]; |
| 1459 | 83 | CGContextRef thumbBitmapCtxt = CGBitmapContextCreate(NULL, | 74 | } |
| 1460 | 84 | self.size.width, | 75 | |
| 1461 | 85 | self.size.height, | 76 | return [self resizedImage:newSize transform:transform drawTransposed:drawTransposed interpolationQuality:quality]; |
| 1422 | 86 | 8, (4 * self.size.width), | ||
| 1423 | 87 | genericColorSpace, | ||
| 1424 | 88 | kCGImageAlphaPremultipliedFirst); | ||
| 1425 | 89 | CGColorSpaceRelease(genericColorSpace); | ||
| 1426 | 90 | CGContextSetInterpolationQuality(thumbBitmapCtxt, kCGInterpolationDefault); | ||
| 1427 | 91 | CGRect destRect = CGRectMake(0, 0, self.size.width, self.size.height); | ||
| 1428 | 92 | CGContextDrawImage(thumbBitmapCtxt, destRect, self.CGImage); | ||
| 1429 | 93 | CGImageRef tmpThumbImage = CGBitmapContextCreateImage(thumbBitmapCtxt); | ||
| 1430 | 94 | CGContextRelease(thumbBitmapCtxt); | ||
| 1431 | 95 | UIImage *result = [UIImage imageWithCGImage:tmpThumbImage]; | ||
| 1432 | 96 | CGImageRelease(tmpThumbImage); | ||
| 1433 | 97 | |||
| 1434 | 98 | return result; | ||
| 1462 | 99 | } | 77 | } |
| 1463 | 100 | 78 | ||
| 1464 | 101 | // Resizes the image according to the given content mode, taking into account the image's orientation | 79 | // Resizes the image according to the given content mode, taking into account the image's orientation |
| 1465 | @@ -138,15 +116,19 @@ | |||
| 1466 | 138 | CGRect transposedRect = CGRectMake(0, 0, newRect.size.height, newRect.size.width); | 116 | CGRect transposedRect = CGRectMake(0, 0, newRect.size.height, newRect.size.width); |
| 1467 | 139 | CGImageRef imageRef = self.CGImage; | 117 | CGImageRef imageRef = self.CGImage; |
| 1468 | 140 | 118 | ||
| 1477 | 141 | // Build a context that's the same dimensions as the new size | 119 | // Fix for a colorspace / transparency issue that affects some types of |
| 1478 | 142 | CGContextRef bitmap = CGBitmapContextCreate(NULL, | 120 | // images. See here: http://vocaro.com/trevor/blog/2009/10/12/resize-a-uiimage-the-right-way/comment-page-2/#comment-39951 |
| 1471 | 143 | newRect.size.width, | ||
| 1472 | 144 | newRect.size.height, | ||
| 1473 | 145 | CGImageGetBitsPerComponent(imageRef), | ||
| 1474 | 146 | 0, | ||
| 1475 | 147 | CGImageGetColorSpace(imageRef), | ||
| 1476 | 148 | CGImageGetBitmapInfo(imageRef)); | ||
| 1479 | 149 | 121 | ||
| 1480 | 122 | CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); | ||
| 1481 | 123 | CGContextRef bitmap =CGBitmapContextCreate( NULL, | ||
| 1482 | 124 | newRect.size.width, | ||
| 1483 | 125 | newRect.size.height, | ||
| 1484 | 126 | 8, | ||
| 1485 | 127 | 0, | ||
| 1486 | 128 | colorSpace, | ||
| 1487 | 129 | kCGImageAlphaPremultipliedLast ); | ||
| 1488 | 130 | CGColorSpaceRelease(colorSpace); | ||
| 1489 | 131 | |||
| 1490 | 150 | // Rotate and/or flip the image if required by its orientation | 132 | // Rotate and/or flip the image if required by its orientation |
| 1491 | 151 | CGContextConcatCTM(bitmap, transform); | 133 | CGContextConcatCTM(bitmap, transform); |
| 1492 | 152 | 134 | ||
| 1493 | 153 | 135 | ||
| 1494 | === renamed file 'Default-568h@2x.png' => 'images/Default-568h@2x.png' | |||
| 1495 | === renamed file 'Default.png' => 'images/Default.png' | |||
| 1496 | === renamed file 'Default@2x.png' => 'images/Default@2x.png' | |||
| 1497 | === renamed file 'about_logo.png' => 'images/about_logo.png' | |||
| 1498 | === renamed file 'albums.png' => 'images/albums.png' | |||
| 1499 | === renamed file 'albums@2x.png' => 'images/albums@2x.png' | |||
| 1500 | === renamed file 'artists.png' => 'images/artists.png' | |||
| 1501 | === renamed file 'artists@2x.png' => 'images/artists@2x.png' | |||
| 1502 | === renamed file 'cached.png' => 'images/cached.png' | |||
| 1503 | === renamed file 'cached@2x.png' => 'images/cached@2x.png' | |||
| 1504 | === renamed file 'header_bg.png' => 'images/header_bg.png' | |||
| 1505 | === renamed file 'header_logo@2x.png' => 'images/header_logo@2x.png' | |||
| 1506 | === renamed file 'music_29.png' => 'images/music_29.png' | |||
| 1507 | === renamed file 'music_512.png' => 'images/music_512.png' | |||
| 1508 | === renamed file 'music_57.png' => 'images/music_57.png' | |||
| 1509 | === renamed file 'music_57@2x.png' => 'images/music_57@2x.png' | |||
| 1510 | === renamed file 'partiallycached.png' => 'images/partiallycached.png' | |||
| 1511 | === renamed file 'partiallycached@2x.png' => 'images/partiallycached@2x.png' | |||
| 1512 | === renamed file 'playlists.png' => 'images/playlists.png' | |||
| 1513 | === renamed file 'playlists@2x.png' => 'images/playlists@2x.png' | |||
| 1514 | === renamed file 'progress-label-background.png' => 'images/progress-label-background.png' | |||
| 1515 | === renamed file 'settings.png' => 'images/settings.png' | |||
| 1516 | === renamed file 'settings@2x.png' => 'images/settings@2x.png' | |||
| 1517 | === renamed file 'songs.png' => 'images/songs.png' | |||
| 1518 | === renamed file 'songs@2x.png' => 'images/songs@2x.png' | |||
| 1519 | === renamed file 'uncached-disabled.png' => 'images/uncached-disabled.png' | |||
| 1520 | === renamed file 'uncached-disabled@2x.png' => 'images/uncached-disabled@2x.png' | |||
| 1521 | === renamed file 'uncached.png' => 'images/uncached.png' | |||
| 1522 | === renamed file 'uncached@2x.png' => 'images/uncached@2x.png' | |||
| 1523 | === modified file 'utilities/AudioStreamer.m' | |||
| 1524 | --- utilities/AudioStreamer.m 2012-08-16 17:14:27 +0000 | |||
| 1525 | +++ utilities/AudioStreamer.m 2012-09-19 03:34:23 +0000 | |||
| 1526 | @@ -1632,8 +1632,10 @@ | |||
| 1527 | 1632 | 1632 | ||
| 1528 | 1633 | AudioFormatListItem *formatList = malloc(formatListSize); | 1633 | AudioFormatListItem *formatList = malloc(formatListSize); |
| 1529 | 1634 | err = AudioFileStreamGetProperty(inAudioFileStream, kAudioFileStreamProperty_FormatList, &formatListSize, formatList); | 1634 | err = AudioFileStreamGetProperty(inAudioFileStream, kAudioFileStreamProperty_FormatList, &formatListSize, formatList); |
| 1530 | 1635 | [(id)formatList release]; | ||
| 1531 | 1635 | if (err) | 1636 | if (err) |
| 1532 | 1636 | { | 1637 | { |
| 1533 | 1638 | free(formatList); | ||
| 1534 | 1637 | [self failWithErrorCode:AS_FILE_STREAM_GET_PROPERTY_FAILED]; | 1639 | [self failWithErrorCode:AS_FILE_STREAM_GET_PROPERTY_FAILED]; |
| 1535 | 1638 | return; | 1640 | return; |
| 1536 | 1639 | } | 1641 | } |
| 1537 | 1640 | 1642 | ||
| 1538 | === modified file 'utilities/Models/Generated/_U1CachedFile.h' | |||
| 1539 | --- utilities/Models/Generated/_U1CachedFile.h 2012-02-10 17:38:18 +0000 | |||
| 1540 | +++ utilities/Models/Generated/_U1CachedFile.h 2012-09-19 03:34:23 +0000 | |||
| 1541 | @@ -5,9 +5,9 @@ | |||
| 1542 | 5 | 5 | ||
| 1543 | 6 | 6 | ||
| 1544 | 7 | extern const struct U1CachedFileAttributes { | 7 | extern const struct U1CachedFileAttributes { |
| 1548 | 8 | NSString *accessCount; | 8 | __unsafe_unretained NSString *accessCount; |
| 1549 | 9 | NSString *lastAccess; | 9 | __unsafe_unretained NSString *lastAccess; |
| 1550 | 10 | NSString *path; | 10 | __unsafe_unretained NSString *path; |
| 1551 | 11 | } U1CachedFileAttributes; | 11 | } U1CachedFileAttributes; |
| 1552 | 12 | 12 | ||
| 1553 | 13 | extern const struct U1CachedFileRelationships { | 13 | extern const struct U1CachedFileRelationships { |
| 1554 | 14 | 14 | ||
| 1555 | === modified file 'utilities/U1LocalMusicServer.m' | |||
| 1556 | --- utilities/U1LocalMusicServer.m 2012-08-28 20:27:24 +0000 | |||
| 1557 | +++ utilities/U1LocalMusicServer.m 2012-09-19 03:34:23 +0000 | |||
| 1558 | @@ -44,7 +44,7 @@ | |||
| 1559 | 44 | if (self == nil) | 44 | if (self == nil) |
| 1560 | 45 | return nil; | 45 | return nil; |
| 1561 | 46 | 46 | ||
| 1563 | 47 | httpServer = [[U1HTTPServer localHTTPServer] retain]; | 47 | httpServer = [U1HTTPServer localHTTPServer]; |
| 1564 | 48 | __block id weakSelf = self; | 48 | __block id weakSelf = self; |
| 1565 | 49 | [httpServer setRequestHandler:^(U1HTTPRequest *request, U1HTTPServerResponseCallback callback) { | 49 | [httpServer setRequestHandler:^(U1HTTPRequest *request, U1HTTPServerResponseCallback callback) { |
| 1566 | 50 | [weakSelf handleRequest:request withCallback:callback]; | 50 | [weakSelf handleRequest:request withCallback:callback]; |
| 1567 | @@ -52,12 +52,6 @@ | |||
| 1568 | 52 | return self; | 52 | return self; |
| 1569 | 53 | } | 53 | } |
| 1570 | 54 | 54 | ||
| 1571 | 55 | - (void)dealloc; | ||
| 1572 | 56 | { | ||
| 1573 | 57 | [httpServer release]; | ||
| 1574 | 58 | [super dealloc]; | ||
| 1575 | 59 | } | ||
| 1576 | 60 | |||
| 1577 | 61 | - (void)handleRequest:(U1HTTPRequest*)request withCallback:(U1HTTPServerResponseCallback)callback; | 55 | - (void)handleRequest:(U1HTTPRequest*)request withCallback:(U1HTTPServerResponseCallback)callback; |
| 1578 | 62 | { | 56 | { |
| 1579 | 63 | NSString *songId = [[request URL] path]; | 57 | NSString *songId = [[request URL] path]; |
| 1580 | @@ -78,7 +72,6 @@ | |||
| 1581 | 78 | [response setHTTPBodyStream:reader]; | 72 | [response setHTTPBodyStream:reader]; |
| 1582 | 79 | 73 | ||
| 1583 | 80 | callback(response); | 74 | callback(response); |
| 1584 | 81 | [response release]; | ||
| 1585 | 82 | } | 75 | } |
| 1586 | 83 | 76 | ||
| 1587 | 84 | - (NSRange)parsedRangeFromHeaderValue:(NSString*)rangeValue; | 77 | - (NSRange)parsedRangeFromHeaderValue:(NSString*)rangeValue; |
| 1588 | 85 | 78 | ||
| 1589 | === removed file 'utilities/UOSSOMusicCredsFetchOperation.h' | |||
| 1590 | --- utilities/UOSSOMusicCredsFetchOperation.h 2011-07-11 17:20:23 +0000 | |||
| 1591 | +++ utilities/UOSSOMusicCredsFetchOperation.h 1970-01-01 00:00:00 +0000 | |||
| 1592 | @@ -1,24 +0,0 @@ | |||
| 1593 | 1 | // | ||
| 1594 | 2 | // Copyright 2011 Canonical Ltd. | ||
| 1595 | 3 | // | ||
| 1596 | 4 | // This program is free software: you can redistribute it and/or modify it | ||
| 1597 | 5 | // under the terms of the GNU Affero General Public License version 3, | ||
| 1598 | 6 | // as published by the Free Software Foundation. | ||
| 1599 | 7 | // | ||
| 1600 | 8 | // This program is distributed in the hope that it will be useful, but | ||
| 1601 | 9 | // WITHOUT ANY WARRANTY; without even the implied warranties of | ||
| 1602 | 10 | // MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
| 1603 | 11 | // PURPOSE. See the GNU Affero General Public License for more details. | ||
| 1604 | 12 | // | ||
| 1605 | 13 | // You should have received a copy of the GNU Affero General Public License | ||
| 1606 | 14 | // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1607 | 15 | |||
| 1608 | 16 | #import <Foundation/Foundation.h> | ||
| 1609 | 17 | |||
| 1610 | 18 | #import "UOHTTPFetchOperation.h" | ||
| 1611 | 19 | |||
| 1612 | 20 | |||
| 1613 | 21 | @interface UOSSOMusicCredsFetchOperation : UOHTTPFetchOperation | ||
| 1614 | 22 | @property (readonly, copy) NSString *username; | ||
| 1615 | 23 | @property (readonly, copy) NSString *password; | ||
| 1616 | 24 | @end | ||
| 1617 | 25 | 0 | ||
| 1618 | === removed file 'utilities/UOSSOMusicCredsFetchOperation.m' | |||
| 1619 | --- utilities/UOSSOMusicCredsFetchOperation.m 2011-07-13 17:59:26 +0000 | |||
| 1620 | +++ utilities/UOSSOMusicCredsFetchOperation.m 1970-01-01 00:00:00 +0000 | |||
| 1621 | @@ -1,57 +0,0 @@ | |||
| 1622 | 1 | // | ||
| 1623 | 2 | // Copyright 2011 Canonical Ltd. | ||
| 1624 | 3 | // | ||
| 1625 | 4 | // This program is free software: you can redistribute it and/or modify it | ||
| 1626 | 5 | // under the terms of the GNU Affero General Public License version 3, | ||
| 1627 | 6 | // as published by the Free Software Foundation. | ||
| 1628 | 7 | // | ||
| 1629 | 8 | // This program is distributed in the hope that it will be useful, but | ||
| 1630 | 9 | // WITHOUT ANY WARRANTY; without even the implied warranties of | ||
| 1631 | 10 | // MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
| 1632 | 11 | // PURPOSE. See the GNU Affero General Public License for more details. | ||
| 1633 | 12 | // | ||
| 1634 | 13 | // You should have received a copy of the GNU Affero General Public License | ||
| 1635 | 14 | // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1636 | 15 | |||
| 1637 | 16 | #import "UOSSOMusicCredsFetchOperation.h" | ||
| 1638 | 17 | |||
| 1639 | 18 | #import "URLQueryStringParser.h" | ||
| 1640 | 19 | |||
| 1641 | 20 | |||
| 1642 | 21 | @interface UOSSOMusicCredsFetchOperation () | ||
| 1643 | 22 | @property (copy) NSString *username; | ||
| 1644 | 23 | @property (copy) NSString *password; | ||
| 1645 | 24 | @end | ||
| 1646 | 25 | |||
| 1647 | 26 | |||
| 1648 | 27 | @implementation UOSSOMusicCredsFetchOperation | ||
| 1649 | 28 | |||
| 1650 | 29 | @synthesize username, password; | ||
| 1651 | 30 | |||
| 1652 | 31 | - (void)dealloc; | ||
| 1653 | 32 | { | ||
| 1654 | 33 | [username release]; | ||
| 1655 | 34 | [password release]; | ||
| 1656 | 35 | [super dealloc]; | ||
| 1657 | 36 | } | ||
| 1658 | 37 | |||
| 1659 | 38 | - (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response; | ||
| 1660 | 39 | { | ||
| 1661 | 40 | // haven't sent a request yet | ||
| 1662 | 41 | if (response == nil) | ||
| 1663 | 42 | return request; | ||
| 1664 | 43 | |||
| 1665 | 44 | if ([[[request URL] scheme] isEqualToString:@"x-ubuntuone-music"]) | ||
| 1666 | 45 | { | ||
| 1667 | 46 | URLQueryStringParser *queryParser = [[[URLQueryStringParser alloc] initWithURL:[request URL]] autorelease]; | ||
| 1668 | 47 | self.username = [queryParser queryStringValueForKey:@"u"]; | ||
| 1669 | 48 | self.password = [queryParser queryStringValueForKey:@"p"]; | ||
| 1670 | 49 | |||
| 1671 | 50 | // [connection cancel]; | ||
| 1672 | 51 | // [self finish]; | ||
| 1673 | 52 | // return nil; | ||
| 1674 | 53 | } | ||
| 1675 | 54 | return nil; | ||
| 1676 | 55 | } | ||
| 1677 | 56 | |||
| 1678 | 57 | @end | ||
| 1679 | 58 | 0 | ||
| 1680 | === modified file 'utilities/operations/AlbumArtLoader.h' | |||
| 1681 | --- utilities/operations/AlbumArtLoader.h 2012-07-05 17:19:56 +0000 | |||
| 1682 | +++ utilities/operations/AlbumArtLoader.h 2012-09-19 03:34:23 +0000 | |||
| 1683 | @@ -29,8 +29,6 @@ | |||
| 1684 | 29 | 29 | ||
| 1685 | 30 | @interface AlbumArtLoader : NSObject <AlbumArtDownloadOperationDelegate> | 30 | @interface AlbumArtLoader : NSObject <AlbumArtDownloadOperationDelegate> |
| 1686 | 31 | { | 31 | { |
| 1687 | 32 | id<AlbumArtLoaderDelegate> delegate; | ||
| 1688 | 33 | int imageSize; | ||
| 1689 | 34 | NSMutableSet *downloadedURLs; | 32 | NSMutableSet *downloadedURLs; |
| 1690 | 35 | NSMutableDictionary *downloadCache; | 33 | NSMutableDictionary *downloadCache; |
| 1691 | 36 | NSOperationQueue *downloadQueue; | 34 | NSOperationQueue *downloadQueue; |
| 1692 | 37 | 35 | ||
| 1693 | === modified file 'utilities/operations/AlbumArtLoader.m' | |||
| 1694 | --- utilities/operations/AlbumArtLoader.m 2012-07-05 17:19:56 +0000 | |||
| 1695 | +++ utilities/operations/AlbumArtLoader.m 2012-09-19 03:34:23 +0000 | |||
| 1696 | @@ -53,15 +53,6 @@ | |||
| 1697 | 53 | return self; | 53 | return self; |
| 1698 | 54 | } | 54 | } |
| 1699 | 55 | 55 | ||
| 1700 | 56 | - (void)dealloc | ||
| 1701 | 57 | { | ||
| 1702 | 58 | [downloadCache release]; | ||
| 1703 | 59 | [downloadedURLs release]; | ||
| 1704 | 60 | [downloadQueue release]; | ||
| 1705 | 61 | |||
| 1706 | 62 | [super dealloc]; | ||
| 1707 | 63 | } | ||
| 1708 | 64 | |||
| 1709 | 65 | #pragma mark - | 56 | #pragma mark - |
| 1710 | 66 | #pragma mark Public Methods | 57 | #pragma mark Public Methods |
| 1711 | 67 | 58 | ||
| 1712 | @@ -127,7 +118,6 @@ | |||
| 1713 | 127 | AlbumArtDownloadOperation *operation = [[AlbumArtDownloadOperation alloc] initWithArtId:artId URL:url]; | 118 | AlbumArtDownloadOperation *operation = [[AlbumArtDownloadOperation alloc] initWithArtId:artId URL:url]; |
| 1714 | 128 | operation.delegate = self; | 119 | operation.delegate = self; |
| 1715 | 129 | [downloadQueue addOperation:operation]; | 120 | [downloadQueue addOperation:operation]; |
| 1716 | 130 | [operation release]; | ||
| 1717 | 131 | } | 121 | } |
| 1718 | 132 | } | 122 | } |
| 1719 | 133 | } | 123 | } |
| 1720 | 134 | 124 | ||
| 1721 | === removed file 'utilities/operations/UOJSONFetchOperation.h' | |||
| 1722 | --- utilities/operations/UOJSONFetchOperation.h 2011-07-11 01:34:54 +0000 | |||
| 1723 | +++ utilities/operations/UOJSONFetchOperation.h 1970-01-01 00:00:00 +0000 | |||
| 1724 | @@ -1,25 +0,0 @@ | |||
| 1725 | 1 | // | ||
| 1726 | 2 | // Copyright 2011 Canonical Ltd. | ||
| 1727 | 3 | // | ||
| 1728 | 4 | // This program is free software: you can redistribute it and/or modify it | ||
| 1729 | 5 | // under the terms of the GNU Affero General Public License version 3, | ||
| 1730 | 6 | // as published by the Free Software Foundation. | ||
| 1731 | 7 | // | ||
| 1732 | 8 | // This program is distributed in the hope that it will be useful, but | ||
| 1733 | 9 | // WITHOUT ANY WARRANTY; without even the implied warranties of | ||
| 1734 | 10 | // MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
| 1735 | 11 | // PURPOSE. See the GNU Affero General Public License for more details. | ||
| 1736 | 12 | // | ||
| 1737 | 13 | // You should have received a copy of the GNU Affero General Public License | ||
| 1738 | 14 | // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1739 | 15 | |||
| 1740 | 16 | #import <Foundation/Foundation.h> | ||
| 1741 | 17 | |||
| 1742 | 18 | #import "AbstractNetworkOperation.h" | ||
| 1743 | 19 | |||
| 1744 | 20 | |||
| 1745 | 21 | @interface UOJSONFetchOperation : AbstractNetworkOperation | ||
| 1746 | 22 | |||
| 1747 | 23 | + (UOJSONFetchOperation*)jsonOperationWithRequest:(NSURLRequest*)request action:(void(^)(NSObject *jsonResult, NSError *error))action; | ||
| 1748 | 24 | |||
| 1749 | 25 | @end | ||
| 1750 | 26 | 0 | ||
| 1751 | === removed file 'utilities/operations/UOJSONFetchOperation.m' | |||
| 1752 | --- utilities/operations/UOJSONFetchOperation.m 2012-08-27 22:35:20 +0000 | |||
| 1753 | +++ utilities/operations/UOJSONFetchOperation.m 1970-01-01 00:00:00 +0000 | |||
| 1754 | @@ -1,80 +0,0 @@ | |||
| 1755 | 1 | // | ||
| 1756 | 2 | // Copyright 2011 Canonical Ltd. | ||
| 1757 | 3 | // | ||
| 1758 | 4 | // This program is free software: you can redistribute it and/or modify it | ||
| 1759 | 5 | // under the terms of the GNU Affero General Public License version 3, | ||
| 1760 | 6 | // as published by the Free Software Foundation. | ||
| 1761 | 7 | // | ||
| 1762 | 8 | // This program is distributed in the hope that it will be useful, but | ||
| 1763 | 9 | // WITHOUT ANY WARRANTY; without even the implied warranties of | ||
| 1764 | 10 | // MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
| 1765 | 11 | // PURPOSE. See the GNU Affero General Public License for more details. | ||
| 1766 | 12 | // | ||
| 1767 | 13 | // You should have received a copy of the GNU Affero General Public License | ||
| 1768 | 14 | // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1769 | 15 | |||
| 1770 | 16 | #import "UOJSONFetchOperation.h" | ||
| 1771 | 17 | |||
| 1772 | 18 | @interface UOJSONFetchOperation () | ||
| 1773 | 19 | @property (copy) void (^action)(NSObject *, NSError *); | ||
| 1774 | 20 | @property (retain) NSMutableData *jsonData; | ||
| 1775 | 21 | @end | ||
| 1776 | 22 | |||
| 1777 | 23 | |||
| 1778 | 24 | @implementation UOJSONFetchOperation | ||
| 1779 | 25 | |||
| 1780 | 26 | @synthesize action, jsonData; | ||
| 1781 | 27 | |||
| 1782 | 28 | + (UOJSONFetchOperation*)jsonOperationWithRequest:(NSURLRequest*)request action:(void(^)(NSObject *jsonResult, NSError *error))action; | ||
| 1783 | 29 | { | ||
| 1784 | 30 | NSParameterAssert(action != nil); | ||
| 1785 | 31 | |||
| 1786 | 32 | UOJSONFetchOperation *operation = [[[UOJSONFetchOperation alloc] initWithRequest:request] autorelease]; | ||
| 1787 | 33 | operation.action = action; | ||
| 1788 | 34 | |||
| 1789 | 35 | return operation; | ||
| 1790 | 36 | } | ||
| 1791 | 37 | |||
| 1792 | 38 | - (void)dealloc; | ||
| 1793 | 39 | { | ||
| 1794 | 40 | [action release]; | ||
| 1795 | 41 | [jsonData release]; | ||
| 1796 | 42 | [super dealloc]; | ||
| 1797 | 43 | } | ||
| 1798 | 44 | |||
| 1799 | 45 | - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response; | ||
| 1800 | 46 | { | ||
| 1801 | 47 | [super connection:connection didReceiveResponse:response]; | ||
| 1802 | 48 | self.jsonData = [NSMutableData data]; | ||
| 1803 | 49 | } | ||
| 1804 | 50 | |||
| 1805 | 51 | - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data; | ||
| 1806 | 52 | { | ||
| 1807 | 53 | [super connection:connection didReceiveData:data]; | ||
| 1808 | 54 | [self.jsonData appendData:data]; | ||
| 1809 | 55 | } | ||
| 1810 | 56 | |||
| 1811 | 57 | - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error; | ||
| 1812 | 58 | { | ||
| 1813 | 59 | [super connection:connection didFailWithError:error]; | ||
| 1814 | 60 | self.jsonData = nil; | ||
| 1815 | 61 | self.action(nil, error); | ||
| 1816 | 62 | } | ||
| 1817 | 63 | |||
| 1818 | 64 | - (void)connectionDidFinishLoading:(NSURLConnection *)connection; | ||
| 1819 | 65 | { | ||
| 1820 | 66 | [super connectionDidFinishLoading:connection]; | ||
| 1821 | 67 | NSError *error = nil; | ||
| 1822 | 68 | NSObject *jsonObject = nil; | ||
| 1823 | 69 | if (self.statusCode == 200) | ||
| 1824 | 70 | { | ||
| 1825 | 71 | jsonObject = [NSJSONSerialization JSONObjectWithData:self.jsonData options:0 error:&error]; | ||
| 1826 | 72 | } | ||
| 1827 | 73 | else | ||
| 1828 | 74 | { | ||
| 1829 | 75 | error = [NSError errorWithDomain:@"UOJSONFetchOperationErrorDomain" code:self.statusCode userInfo:nil]; | ||
| 1830 | 76 | } | ||
| 1831 | 77 | self.action(jsonObject, error); | ||
| 1832 | 78 | } | ||
| 1833 | 79 | |||
| 1834 | 80 | @end | ||
| 1835 | 81 | 0 | ||
| 1836 | === modified file 'view_controllers/PullRefreshTableViewController.h' | |||
| 1837 | --- view_controllers/PullRefreshTableViewController.h 2010-09-30 21:09:34 +0000 | |||
| 1838 | +++ view_controllers/PullRefreshTableViewController.h 2012-09-19 03:34:23 +0000 | |||
| 1839 | @@ -31,15 +31,8 @@ | |||
| 1840 | 31 | 31 | ||
| 1841 | 32 | 32 | ||
| 1842 | 33 | @interface PullRefreshTableViewController : UITableViewController { | 33 | @interface PullRefreshTableViewController : UITableViewController { |
| 1843 | 34 | UIView *refreshHeaderView; | ||
| 1844 | 35 | UILabel *refreshLabel; | ||
| 1845 | 36 | UIImageView *refreshArrow; | ||
| 1846 | 37 | UIActivityIndicatorView *refreshSpinner; | ||
| 1847 | 38 | BOOL isDragging; | 34 | BOOL isDragging; |
| 1848 | 39 | BOOL isLoading; | 35 | BOOL isLoading; |
| 1849 | 40 | NSString *textPull; | ||
| 1850 | 41 | NSString *textRelease; | ||
| 1851 | 42 | NSString *textLoading; | ||
| 1852 | 43 | } | 36 | } |
| 1853 | 44 | 37 | ||
| 1854 | 45 | @property (nonatomic, retain) UIView *refreshHeaderView; | 38 | @property (nonatomic, retain) UIView *refreshHeaderView; |
| 1855 | 46 | 39 | ||
| 1856 | === modified file 'view_controllers/PullRefreshTableViewController.m' | |||
| 1857 | --- view_controllers/PullRefreshTableViewController.m 2010-09-30 21:09:34 +0000 | |||
| 1858 | +++ view_controllers/PullRefreshTableViewController.m 2012-09-19 03:34:23 +0000 | |||
| 1859 | @@ -149,15 +149,4 @@ | |||
| 1860 | 149 | [self performSelector:@selector(stopLoading) withObject:nil afterDelay:2.0]; | 149 | [self performSelector:@selector(stopLoading) withObject:nil afterDelay:2.0]; |
| 1861 | 150 | } | 150 | } |
| 1862 | 151 | 151 | ||
| 1863 | 152 | - (void)dealloc { | ||
| 1864 | 153 | [refreshHeaderView release]; | ||
| 1865 | 154 | [refreshLabel release]; | ||
| 1866 | 155 | [refreshArrow release]; | ||
| 1867 | 156 | [refreshSpinner release]; | ||
| 1868 | 157 | [textPull release]; | ||
| 1869 | 158 | [textRelease release]; | ||
| 1870 | 159 | [textLoading release]; | ||
| 1871 | 160 | [super dealloc]; | ||
| 1872 | 161 | } | ||
| 1873 | 162 | |||
| 1874 | 163 | @end | 152 | @end |
| 1875 | 164 | 153 | ||
| 1876 | === modified file 'view_controllers/SettingsViewController.m' | |||
| 1877 | --- view_controllers/SettingsViewController.m 2012-02-16 17:58:53 +0000 | |||
| 1878 | +++ view_controllers/SettingsViewController.m 2012-09-19 03:34:23 +0000 | |||
| 1879 | @@ -36,6 +36,7 @@ | |||
| 1880 | 36 | #import "U1CacheFileManager.h" | 36 | #import "U1CacheFileManager.h" |
| 1881 | 37 | #import "UIAlertView+Blocks.h" | 37 | #import "UIAlertView+Blocks.h" |
| 1882 | 38 | #import "RIButtonItem.h" | 38 | #import "RIButtonItem.h" |
| 1883 | 39 | #import "UOAuthManager.h" | ||
| 1884 | 39 | 40 | ||
| 1885 | 40 | @interface SettingsViewController (Private) | 41 | @interface SettingsViewController (Private) |
| 1886 | 41 | - (void)_clearDatabaseFile:(id)sender; | 42 | - (void)_clearDatabaseFile:(id)sender; |
| 1887 | @@ -254,7 +255,7 @@ | |||
| 1888 | 254 | { | 255 | { |
| 1889 | 255 | if ([Subsonic sharedSubsonic].hasCredentials) | 256 | if ([Subsonic sharedSubsonic].hasCredentials) |
| 1890 | 256 | { | 257 | { |
| 1892 | 257 | [[Subsonic sharedSubsonic] removeCredentials]; | 258 | [[UOAuthManager sharedAuthManager] clearSubsonicCredentials]; |
| 1893 | 258 | [self clearAllCaches:nil]; | 259 | [self clearAllCaches:nil]; |
| 1894 | 259 | [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_removeCachedContent object:nil]; | 260 | [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_removeCachedContent object:nil]; |
| 1895 | 260 | [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_reloadAccountCredentials object:nil]; | 261 | [[NSNotificationCenter defaultCenter] postNotificationName:NOTIF_reloadAccountCredentials object:nil]; |
| 1896 | 261 | 262 | ||
| 1897 | === modified file 'view_controllers/SubsonicIndexedTableViewController.m' | |||
| 1898 | --- view_controllers/SubsonicIndexedTableViewController.m 2011-06-22 16:06:39 +0000 | |||
| 1899 | +++ view_controllers/SubsonicIndexedTableViewController.m 2012-09-19 03:34:23 +0000 | |||
| 1900 | @@ -39,8 +39,6 @@ | |||
| 1901 | 39 | self.indexes = NULL; | 39 | self.indexes = NULL; |
| 1902 | 40 | self.groupedTableData = NULL; | 40 | self.groupedTableData = NULL; |
| 1903 | 41 | [[NSNotificationCenter defaultCenter] removeObserver:self]; | 41 | [[NSNotificationCenter defaultCenter] removeObserver:self]; |
| 1904 | 42 | |||
| 1905 | 43 | [super dealloc]; | ||
| 1906 | 44 | } | 42 | } |
| 1907 | 45 | 43 | ||
| 1908 | 46 | - (void)viewDidUnload | 44 | - (void)viewDidUnload |
| 1909 | 47 | 45 | ||
| 1910 | === modified file 'view_controllers/SubsonicTableViewController.h' | |||
| 1911 | --- view_controllers/SubsonicTableViewController.h 2011-06-21 18:23:09 +0000 | |||
| 1912 | +++ view_controllers/SubsonicTableViewController.h 2012-09-19 03:34:23 +0000 | |||
| 1913 | @@ -30,7 +30,7 @@ | |||
| 1914 | 30 | NSTimer *respondToRemoteTimer; | 30 | NSTimer *respondToRemoteTimer; |
| 1915 | 31 | NSMutableArray *tableData; | 31 | NSMutableArray *tableData; |
| 1916 | 32 | NSMutableArray *searchResults; | 32 | NSMutableArray *searchResults; |
| 1918 | 33 | id <NSXMLParserDelegate> parserDelegate; | 33 | __unsafe_unretained id <NSXMLParserDelegate> parserDelegate; |
| 1919 | 34 | NSString *viewName; | 34 | NSString *viewName; |
| 1920 | 35 | 35 | ||
| 1921 | 36 | @protected | 36 | @protected |
| 1922 | 37 | 37 | ||
| 1923 | === modified file 'view_controllers/SubsonicTableViewController.m' | |||
| 1924 | --- view_controllers/SubsonicTableViewController.m 2011-11-05 00:42:21 +0000 | |||
| 1925 | +++ view_controllers/SubsonicTableViewController.m 2012-09-19 03:34:23 +0000 | |||
| 1926 | @@ -83,10 +83,10 @@ | |||
| 1927 | 83 | 83 | ||
| 1928 | 84 | if ([StreamingPlayer sharedStreamingPlayer].streamer) | 84 | if ([StreamingPlayer sharedStreamingPlayer].streamer) |
| 1929 | 85 | { | 85 | { |
| 1931 | 86 | self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Now Playing",@"") | 86 | self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Now Playing",@"") |
| 1932 | 87 | style:UIBarButtonItemStyleBordered | 87 | style:UIBarButtonItemStyleBordered |
| 1933 | 88 | target:self | 88 | target:self |
| 1935 | 89 | action:@selector(nowPlayingAction:)] autorelease]; | 89 | action:@selector(nowPlayingAction:)]; |
| 1936 | 90 | } | 90 | } |
| 1937 | 91 | [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil]; | 91 | [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil]; |
| 1938 | 92 | [self updateReachability:[[Subsonic sharedSubsonic] reachability]]; | 92 | [self updateReachability:[[Subsonic sharedSubsonic] reachability]]; |
| 1939 | @@ -184,7 +184,7 @@ | |||
| 1940 | 184 | 184 | ||
| 1941 | 185 | - (void)respondToRemoteControl:(NSTimer*)timer | 185 | - (void)respondToRemoteControl:(NSTimer*)timer |
| 1942 | 186 | { | 186 | { |
| 1944 | 187 | UIEvent *event = [[timer userInfo] retain]; | 187 | UIEvent *event = [timer userInfo]; |
| 1945 | 188 | 188 | ||
| 1946 | 189 | switch (event.subtype) | 189 | switch (event.subtype) |
| 1947 | 190 | { | 190 | { |
| 1948 | @@ -213,7 +213,6 @@ | |||
| 1949 | 213 | 213 | ||
| 1950 | 214 | [respondToRemoteTimer invalidate]; | 214 | [respondToRemoteTimer invalidate]; |
| 1951 | 215 | respondToRemoteTimer = nil; | 215 | respondToRemoteTimer = nil; |
| 1952 | 216 | [event release]; | ||
| 1953 | 217 | } | 216 | } |
| 1954 | 218 | 217 | ||
| 1955 | 219 | #pragma mark - Alert handling | 218 | #pragma mark - Alert handling |
| 1956 | @@ -268,8 +267,6 @@ | |||
| 1957 | 268 | 267 | ||
| 1958 | 269 | - (void)beginLoadingRemoteData:(NSString*)force | 268 | - (void)beginLoadingRemoteData:(NSString*)force |
| 1959 | 270 | { | 269 | { |
| 1960 | 271 | NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; | ||
| 1961 | 272 | |||
| 1962 | 273 | NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:self.viewName]; | 270 | NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:self.viewName]; |
| 1963 | 274 | NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url]; | 271 | NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url]; |
| 1964 | 275 | 272 | ||
| 1965 | @@ -279,12 +276,9 @@ | |||
| 1966 | 279 | { | 276 | { |
| 1967 | 280 | [self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:[xmlParser parserError] waitUntilDone:NO]; | 277 | [self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:[xmlParser parserError] waitUntilDone:NO]; |
| 1968 | 281 | } | 278 | } |
| 1969 | 282 | |||
| 1970 | 283 | [xmlParser release]; | ||
| 1971 | 284 | 279 | ||
| 1972 | 285 | [self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO]; | 280 | [self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO]; |
| 1973 | 286 | [self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO]; | 281 | [self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO]; |
| 1974 | 287 | [pool release]; | ||
| 1975 | 288 | } | 282 | } |
| 1976 | 289 | 283 | ||
| 1977 | 290 | - (void)finishLoadingData | 284 | - (void)finishLoadingData |
| 1978 | @@ -312,7 +306,6 @@ | |||
| 1979 | 312 | [StreamingPlayer sharedStreamingPlayer].isNewSong = NO; | 306 | [StreamingPlayer sharedStreamingPlayer].isNewSong = NO; |
| 1980 | 313 | SongViewController *streamingPlayerViewController = [[SongViewController alloc] initWithNibName:@"SongViewController" bundle:nil]; | 307 | SongViewController *streamingPlayerViewController = [[SongViewController alloc] initWithNibName:@"SongViewController" bundle:nil]; |
| 1981 | 314 | [self.navigationController pushViewController:streamingPlayerViewController animated:YES]; | 308 | [self.navigationController pushViewController:streamingPlayerViewController animated:YES]; |
| 1982 | 315 | [streamingPlayerViewController release]; | ||
| 1983 | 316 | } | 309 | } |
| 1984 | 317 | } | 310 | } |
| 1985 | 318 | 311 | ||
| 1986 | @@ -347,8 +340,7 @@ | |||
| 1987 | 347 | [StreamingPlayer sharedStreamingPlayer].isNewSong = YES; | 340 | [StreamingPlayer sharedStreamingPlayer].isNewSong = YES; |
| 1988 | 348 | [StreamingPlayer sharedStreamingPlayer].isShuffle = NO; | 341 | [StreamingPlayer sharedStreamingPlayer].isShuffle = NO; |
| 1989 | 349 | 342 | ||
| 1992 | 350 | SongViewController *streamingPlayerViewController = [[[SongViewController alloc] | 343 | SongViewController *streamingPlayerViewController = [[SongViewController alloc] initWithNibName:@"SongViewController" bundle:nil]; |
| 1991 | 351 | initWithNibName:@"SongViewController" bundle:nil] autorelease]; | ||
| 1993 | 352 | 344 | ||
| 1994 | 353 | [self.navigationController pushViewController:streamingPlayerViewController animated:YES]; | 345 | [self.navigationController pushViewController:streamingPlayerViewController animated:YES]; |
| 1995 | 354 | 346 | ||
| 1996 | @@ -364,7 +356,7 @@ | |||
| 1997 | 364 | 356 | ||
| 1998 | 365 | - (void)showMessage:(NSString*)message withTitle:(NSString*)title | 357 | - (void)showMessage:(NSString*)message withTitle:(NSString*)title |
| 1999 | 366 | { | 358 | { |
| 2001 | 367 | UIAlertView *alert = [[[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil] autorelease]; | 359 | UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil]; |
| 2002 | 368 | [alert show]; | 360 | [alert show]; |
| 2003 | 369 | } | 361 | } |
| 2004 | 370 | 362 | ||
| 2005 | @@ -406,7 +398,6 @@ | |||
| 2006 | 406 | 398 | ||
| 2007 | 407 | - (void)viewDidUnload | 399 | - (void)viewDidUnload |
| 2008 | 408 | { | 400 | { |
| 2009 | 409 | RELEASE_SAFELY(searchResults); | ||
| 2010 | 410 | [super viewDidUnload]; | 401 | [super viewDidUnload]; |
| 2011 | 411 | } | 402 | } |
| 2012 | 412 | 403 | ||
| 2013 | @@ -414,12 +405,6 @@ | |||
| 2014 | 414 | - (void)dealloc | 405 | - (void)dealloc |
| 2015 | 415 | { | 406 | { |
| 2016 | 416 | [[NSNotificationCenter defaultCenter] removeObserver:self]; | 407 | [[NSNotificationCenter defaultCenter] removeObserver:self]; |
| 2017 | 417 | RELEASE_SAFELY(parserDelegate); | ||
| 2018 | 418 | RELEASE_SAFELY(viewName); | ||
| 2019 | 419 | RELEASE_SAFELY(tableData); | ||
| 2020 | 420 | RELEASE_SAFELY(searchResults); | ||
| 2021 | 421 | |||
| 2022 | 422 | [super dealloc]; | ||
| 2023 | 423 | } | 408 | } |
| 2024 | 424 | 409 | ||
| 2025 | 425 | #pragma mark - UISearchDisplayController Delegate Methods | 410 | #pragma mark - UISearchDisplayController Delegate Methods |
| 2026 | 426 | 411 | ||
| 2027 | === modified file 'view_controllers/SubsonicViewController.m' | |||
| 2028 | --- view_controllers/SubsonicViewController.m 2011-06-18 02:04:11 +0000 | |||
| 2029 | +++ view_controllers/SubsonicViewController.m 2012-09-19 03:34:23 +0000 | |||
| 2030 | @@ -97,10 +97,4 @@ | |||
| 2031 | 97 | } | 97 | } |
| 2032 | 98 | } | 98 | } |
| 2033 | 99 | 99 | ||
| 2034 | 100 | - (void)dealloc | ||
| 2035 | 101 | { | ||
| 2036 | 102 | RELEASE_SAFELY(remoteLock); | ||
| 2037 | 103 | [super dealloc]; | ||
| 2038 | 104 | } | ||
| 2039 | 105 | |||
| 2040 | 106 | @end | 100 | @end |
| 2041 | 107 | 101 | ||
| 2042 | === modified file 'view_controllers/U1MigrationViewController.m' | |||
| 2043 | --- view_controllers/U1MigrationViewController.m 2012-08-28 20:52:02 +0000 | |||
| 2044 | +++ view_controllers/U1MigrationViewController.m 2012-09-19 03:34:23 +0000 | |||
| 2045 | @@ -13,9 +13,6 @@ | |||
| 2046 | 13 | 13 | ||
| 2047 | 14 | @interface U1MigrationViewController () | 14 | @interface U1MigrationViewController () |
| 2048 | 15 | @property (copy) void (^completionBlock)(); | 15 | @property (copy) void (^completionBlock)(); |
| 2049 | 16 | |||
| 2050 | 17 | - (void)migrateOldCache; | ||
| 2051 | 18 | - (void)complete; | ||
| 2052 | 19 | @end | 16 | @end |
| 2053 | 20 | 17 | ||
| 2054 | 21 | @implementation U1MigrationViewController | 18 | @implementation U1MigrationViewController |
| 2055 | @@ -57,16 +54,10 @@ | |||
| 2056 | 57 | { | 54 | { |
| 2057 | 58 | [fileManager moveItemAtPath:oldAlbumArtCachePath toPath:[CachedAlbumArtDirectory() path] error:NULL]; | 55 | [fileManager moveItemAtPath:oldAlbumArtCachePath toPath:[CachedAlbumArtDirectory() path] error:NULL]; |
| 2058 | 59 | } | 56 | } |
| 2059 | 60 | [fileManager release]; | ||
| 2060 | 61 | } | 57 | } |
| 2061 | 62 | 58 | ||
| 2062 | 63 | #pragma mark - View lifecycle | 59 | #pragma mark - View lifecycle |
| 2063 | 64 | 60 | ||
| 2064 | 65 | - (void)viewDidLoad | ||
| 2065 | 66 | { | ||
| 2066 | 67 | [super viewDidLoad]; | ||
| 2067 | 68 | } | ||
| 2068 | 69 | |||
| 2069 | 70 | - (void)viewDidAppear:(BOOL)animated; | 61 | - (void)viewDidAppear:(BOOL)animated; |
| 2070 | 71 | { | 62 | { |
| 2071 | 72 | [self.spinner startAnimating]; | 63 | [self.spinner startAnimating]; |
| 2072 | 73 | 64 | ||
| 2073 | === modified file 'view_controllers/U1MigrationViewController.xib' | |||
| 2074 | --- view_controllers/U1MigrationViewController.xib 2012-02-16 17:09:14 +0000 | |||
| 2075 | +++ view_controllers/U1MigrationViewController.xib 2012-09-19 03:34:23 +0000 | |||
| 2076 | @@ -1,20 +1,20 @@ | |||
| 2077 | 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2078 | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> | 2 | <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> |
| 2079 | 3 | <data> | 3 | <data> |
| 2085 | 4 | <int key="IBDocument.SystemTarget">1280</int> | 4 | <int key="IBDocument.SystemTarget">1296</int> |
| 2086 | 5 | <string key="IBDocument.SystemVersion">10K549</string> | 5 | <string key="IBDocument.SystemVersion">12B19</string> |
| 2087 | 6 | <string key="IBDocument.InterfaceBuilderVersion">1938</string> | 6 | <string key="IBDocument.InterfaceBuilderVersion">2549</string> |
| 2088 | 7 | <string key="IBDocument.AppKitVersion">1038.36</string> | 7 | <string key="IBDocument.AppKitVersion">1187</string> |
| 2089 | 8 | <string key="IBDocument.HIToolboxVersion">461.00</string> | 8 | <string key="IBDocument.HIToolboxVersion">624.00</string> |
| 2090 | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | 9 | <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> |
| 2091 | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 10 | <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
| 2093 | 11 | <string key="NS.object.0">933</string> | 11 | <string key="NS.object.0">1498</string> |
| 2094 | 12 | </object> | 12 | </object> |
| 2095 | 13 | <array key="IBDocument.IntegratedClassDependencies"> | 13 | <array key="IBDocument.IntegratedClassDependencies"> |
| 2096 | 14 | <string>IBProxyObject</string> | ||
| 2097 | 14 | <string>IBUIActivityIndicatorView</string> | 15 | <string>IBUIActivityIndicatorView</string> |
| 2098 | 16 | <string>IBUILabel</string> | ||
| 2099 | 15 | <string>IBUIView</string> | 17 | <string>IBUIView</string> |
| 2100 | 16 | <string>IBUILabel</string> | ||
| 2101 | 17 | <string>IBProxyObject</string> | ||
| 2102 | 18 | </array> | 18 | </array> |
| 2103 | 19 | <array key="IBDocument.PluginDependencies"> | 19 | <array key="IBDocument.PluginDependencies"> |
| 2104 | 20 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | 20 | <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> |
| 2105 | @@ -42,6 +42,7 @@ | |||
| 2106 | 42 | <string key="NSFrame">{{150, 234}, {20, 20}}</string> | 42 | <string key="NSFrame">{{150, 234}, {20, 20}}</string> |
| 2107 | 43 | <reference key="NSSuperview" ref="191373211"/> | 43 | <reference key="NSSuperview" ref="191373211"/> |
| 2108 | 44 | <reference key="NSWindow"/> | 44 | <reference key="NSWindow"/> |
| 2109 | 45 | <reference key="NSNextKeyView"/> | ||
| 2110 | 45 | <bool key="IBUIOpaque">NO</bool> | 46 | <bool key="IBUIOpaque">NO</bool> |
| 2111 | 46 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 47 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
| 2112 | 47 | <bool key="IBUIHidesWhenStopped">NO</bool> | 48 | <bool key="IBUIHidesWhenStopped">NO</bool> |
| 2113 | @@ -53,6 +54,7 @@ | |||
| 2114 | 53 | <string key="NSFrame">{{124, 191}, {89, 21}}</string> | 54 | <string key="NSFrame">{{124, 191}, {89, 21}}</string> |
| 2115 | 54 | <reference key="NSSuperview" ref="191373211"/> | 55 | <reference key="NSSuperview" ref="191373211"/> |
| 2116 | 55 | <reference key="NSWindow"/> | 56 | <reference key="NSWindow"/> |
| 2117 | 57 | <reference key="NSNextKeyView" ref="62664637"/> | ||
| 2118 | 56 | <bool key="IBUIOpaque">NO</bool> | 58 | <bool key="IBUIOpaque">NO</bool> |
| 2119 | 57 | <bool key="IBUIClipsSubviews">YES</bool> | 59 | <bool key="IBUIClipsSubviews">YES</bool> |
| 2120 | 58 | <int key="IBUIContentMode">7</int> | 60 | <int key="IBUIContentMode">7</int> |
| 2121 | @@ -60,8 +62,11 @@ | |||
| 2122 | 60 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 62 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
| 2123 | 61 | <string key="IBUIText">Migrating…</string> | 63 | <string key="IBUIText">Migrating…</string> |
| 2124 | 62 | <object class="NSColor" key="IBUITextColor"> | 64 | <object class="NSColor" key="IBUITextColor"> |
| 2127 | 63 | <int key="NSColorSpace">1</int> | 65 | <int key="NSColorSpace">3</int> |
| 2128 | 64 | <bytes key="NSRGB">MCAwIDAAA</bytes> | 66 | <bytes key="NSWhite">MQA</bytes> |
| 2129 | 67 | <object class="NSColorSpace" key="NSCustomColorSpace"> | ||
| 2130 | 68 | <int key="NSID">2</int> | ||
| 2131 | 69 | </object> | ||
| 2132 | 65 | </object> | 70 | </object> |
| 2133 | 66 | <nil key="IBUIHighlightedColor"/> | 71 | <nil key="IBUIHighlightedColor"/> |
| 2134 | 67 | <int key="IBUIBaselineAdjustment">1</int> | 72 | <int key="IBUIBaselineAdjustment">1</int> |
| 2135 | @@ -80,12 +85,10 @@ | |||
| 2136 | 80 | <string key="NSFrame">{{0, 20}, {320, 460}}</string> | 85 | <string key="NSFrame">{{0, 20}, {320, 460}}</string> |
| 2137 | 81 | <reference key="NSSuperview"/> | 86 | <reference key="NSSuperview"/> |
| 2138 | 82 | <reference key="NSWindow"/> | 87 | <reference key="NSWindow"/> |
| 2139 | 88 | <reference key="NSNextKeyView" ref="672147677"/> | ||
| 2140 | 83 | <object class="NSColor" key="IBUIBackgroundColor"> | 89 | <object class="NSColor" key="IBUIBackgroundColor"> |
| 2146 | 84 | <int key="NSColorSpace">3</int> | 90 | <int key="NSColorSpace">1</int> |
| 2147 | 85 | <bytes key="NSWhite">MQA</bytes> | 91 | <bytes key="NSRGB">MSAwLjUgMAA</bytes> |
| 2143 | 86 | <object class="NSColorSpace" key="NSCustomColorSpace"> | ||
| 2144 | 87 | <int key="NSID">2</int> | ||
| 2145 | 88 | </object> | ||
| 2148 | 89 | </object> | 92 | </object> |
| 2149 | 90 | <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> | 93 | <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> |
| 2150 | 91 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | 94 | <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> |
| 2151 | @@ -190,8 +193,12 @@ | |||
| 2152 | 190 | </object> | 193 | </object> |
| 2153 | 191 | <int key="IBDocument.localizationMode">0</int> | 194 | <int key="IBDocument.localizationMode">0</int> |
| 2154 | 192 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | 195 | <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> |
| 2155 | 196 | <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> | ||
| 2156 | 197 | <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> | ||
| 2157 | 198 | <real value="1296" key="NS.object.0"/> | ||
| 2158 | 199 | </object> | ||
| 2159 | 193 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | 200 | <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> |
| 2160 | 194 | <int key="IBDocument.defaultPropertyAccessControl">3</int> | 201 | <int key="IBDocument.defaultPropertyAccessControl">3</int> |
| 2162 | 195 | <string key="IBCocoaTouchPluginVersion">933</string> | 202 | <string key="IBCocoaTouchPluginVersion">1498</string> |
| 2163 | 196 | </data> | 203 | </data> |
| 2164 | 197 | </archive> | 204 | </archive> |
| 2165 | 198 | 205 | ||
| 2166 | === modified file 'view_controllers/UOMusicLoginController.m' | |||
| 2167 | --- view_controllers/UOMusicLoginController.m 2012-08-27 22:59:41 +0000 | |||
| 2168 | +++ view_controllers/UOMusicLoginController.m 2012-09-19 03:34:23 +0000 | |||
| 2169 | @@ -14,40 +14,20 @@ | |||
| 2170 | 14 | // along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | // along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 2171 | 15 | 15 | ||
| 2172 | 16 | #import "UOMusicLoginController.h" | 16 | #import "UOMusicLoginController.h" |
| 2173 | 17 | |||
| 2174 | 18 | #import "OAuthConsumer.h" | ||
| 2175 | 19 | #import "NSString+Extras.h" | ||
| 2176 | 20 | |||
| 2177 | 21 | #import "Subsonic.h" | ||
| 2178 | 22 | #import "UOHTTPFetchOperation.h" | ||
| 2179 | 23 | #import "UOJSONFetchOperation.h" | ||
| 2180 | 24 | #import "UOSSOCredentialsViewController.h" | 17 | #import "UOSSOCredentialsViewController.h" |
| 2196 | 25 | #import "UOSSOMusicCredsFetchOperation.h" | 18 | |
| 2197 | 26 | 19 | #import "UOAuthManager.h" | |
| 2183 | 27 | |||
| 2184 | 28 | static NSString *const UOSingleSignOnBaseURL = @"https://login.ubuntu.com/api/1.0/"; | ||
| 2185 | 29 | |||
| 2186 | 30 | static NSString *UOSSOEncodedStringFromParametersDictionary(NSDictionary *arguments); | ||
| 2187 | 31 | |||
| 2188 | 32 | |||
| 2189 | 33 | @interface UOMusicLoginController () | ||
| 2190 | 34 | @property (retain) UIViewController *loginViewController; | ||
| 2191 | 35 | @property (retain) NSOperationQueue *operationQueue; | ||
| 2192 | 36 | - (void)loginWithUsername:(NSString*)username password:(NSString*)password; | ||
| 2193 | 37 | - (void)handleError:(NSError*)error; | ||
| 2194 | 38 | @end | ||
| 2195 | 39 | |||
| 2198 | 40 | 20 | ||
| 2199 | 41 | @implementation UOMusicLoginController | 21 | @implementation UOMusicLoginController |
| 2200 | 42 | 22 | ||
| 2202 | 43 | @synthesize delegate, loginViewController, operationQueue; | 23 | @synthesize delegate, loginViewController; |
| 2203 | 44 | 24 | ||
| 2204 | 45 | - (id)init; | 25 | - (id)init; |
| 2205 | 46 | { | 26 | { |
| 2206 | 47 | if (!(self = [super init])) | 27 | if (!(self = [super init])) |
| 2207 | 48 | return nil; | 28 | return nil; |
| 2208 | 49 | 29 | ||
| 2210 | 50 | UOSSOCredentialsViewController *rootController = [[[UOSSOCredentialsViewController alloc] initWithNibName:@"UOSSOCredentialsViewController" bundle:nil] autorelease]; | 30 | UOSSOCredentialsViewController *rootController = [[UOSSOCredentialsViewController alloc] initWithNibName:@"UOSSOCredentialsViewController" bundle:nil]; |
| 2211 | 51 | 31 | ||
| 2212 | 52 | __block id this = self; | 32 | __block id this = self; |
| 2213 | 53 | rootController.loginAction = ^ (NSString *username, NSString *password) | 33 | rootController.loginAction = ^ (NSString *username, NSString *password) |
| 2214 | @@ -60,123 +40,52 @@ | |||
| 2215 | 60 | navController.navigationBarHidden = YES; | 40 | navController.navigationBarHidden = YES; |
| 2216 | 61 | loginViewController = navController; | 41 | loginViewController = navController; |
| 2217 | 62 | 42 | ||
| 2218 | 63 | operationQueue = [[NSOperationQueue alloc] init]; | ||
| 2219 | 64 | |||
| 2220 | 65 | return self; | 43 | return self; |
| 2221 | 66 | } | 44 | } |
| 2222 | 67 | 45 | ||
| 2223 | 68 | - (void)dealloc | 46 | - (void)dealloc |
| 2224 | 69 | { | 47 | { |
| 2225 | 70 | delegate = nil; | 48 | delegate = nil; |
| 2226 | 71 | [loginViewController release]; | ||
| 2227 | 72 | [operationQueue release]; | ||
| 2228 | 73 | [super dealloc]; | ||
| 2229 | 74 | } | 49 | } |
| 2230 | 75 | 50 | ||
| 2231 | 76 | - (void)loginWithUsername:(NSString*)username password:(NSString*)password; | 51 | - (void)loginWithUsername:(NSString*)username password:(NSString*)password; |
| 2232 | 77 | { | 52 | { |
| 2335 | 78 | // - show login spinner | 53 | [self.loginViewController.view setUserInteractionEnabled:NO]; |
| 2336 | 79 | [self.loginViewController.view setUserInteractionEnabled:NO]; | 54 | |
| 2337 | 80 | 55 | UOAuthManager *authManager = [UOAuthManager sharedAuthManager]; | |
| 2338 | 81 | // 1. get/create U1 oauth token | 56 | id completionBlock = ^(){ |
| 2339 | 82 | NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys: | 57 | id subsonicCompletionBlock = ^(NSString *username) { |
| 2340 | 83 | @"authenticate", @"ws.op", | 58 | [self.delegate loginControllerDidLoginWithUsername:username]; |
| 2341 | 84 | @"Ubuntu One @ iOS", @"token_name", | 59 | }; |
| 2342 | 85 | nil]; | 60 | id subsonicErrorBlock = ^(NSError *error) { |
| 2343 | 86 | NSString * paramsString = UOSSOEncodedStringFromParametersDictionary(params); | 61 | UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Ubuntu One", nil) message:[error localizedDescription] delegate:self cancelButtonTitle:@"Dismiss" otherButtonTitles:nil]; |
| 2344 | 87 | 62 | [alert show]; | |
| 2345 | 88 | NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@authentications?%@", UOSingleSignOnBaseURL, paramsString]]; | 63 | [self.loginViewController.view setUserInteractionEnabled:YES]; |
| 2346 | 89 | NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url]; | 64 | UOSSOCredentialsViewController *loginController = (id)[(UINavigationController*)[self loginViewController] topViewController]; |
| 2347 | 90 | [request setHTTPMethod:@"GET"]; | 65 | [loginController reset]; |
| 2348 | 91 | 66 | }; | |
| 2349 | 92 | NSURLCredential *credential = [NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceNone]; | 67 | [authManager fetchSubsonicCredentials:subsonicCompletionBlock errorBlock:subsonicErrorBlock]; |
| 2350 | 93 | UOJSONFetchOperation *jsonOperation = [UOJSONFetchOperation jsonOperationWithRequest:request action:^(NSObject *jsonResult, NSError *error) { | 68 | }; |
| 2351 | 94 | 69 | id errorBlock = ^(NSError *error) { | |
| 2352 | 95 | // 2. import the new token into Ubuntu One | 70 | NSString *errorMessage = nil;[error localizedDescription]; |
| 2353 | 96 | NSDictionary *oauthResponse = (id)jsonResult; | 71 | switch (error.code) { |
| 2354 | 97 | 72 | case 401: | |
| 2355 | 98 | if (error) | 73 | errorMessage = NSLocalizedString(@"Incorrect username or password.", nil); |
| 2356 | 99 | { | 74 | break; |
| 2357 | 100 | [self handleError:error]; | 75 | default: |
| 2358 | 101 | return; | 76 | errorMessage = [error localizedDescription]; |
| 2359 | 102 | } | 77 | if (errorMessage == nil) { |
| 2360 | 103 | 78 | errorMessage = NSLocalizedString(@"An error occured trying to sign in, please try again.", @"Login Error Message"); | |
| 2361 | 104 | NSString *encodedUsername = [username urlParameterEncodedString]; | 79 | } |
| 2362 | 105 | NSURL *u1TokenURL = [NSURL URLWithString:[NSString stringWithFormat:@"https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/%@", encodedUsername]]; | 80 | break; |
| 2363 | 106 | 81 | } | |
| 2364 | 107 | OAConsumer *consumer = [[[OAConsumer alloc] initWithKey:[oauthResponse objectForKey:@"consumer_key"] secret:[oauthResponse objectForKey:@"consumer_secret"]] autorelease]; | 82 | UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Ubuntu One", nil) message:errorMessage delegate:self cancelButtonTitle:@"Dismiss" otherButtonTitles:nil]; |
| 2365 | 108 | OAToken *token = [[[OAToken alloc] initWithKey:[oauthResponse objectForKey:@"token"] secret:[oauthResponse objectForKey:@"token_secret"]] autorelease]; | 83 | [alert show]; |
| 2366 | 109 | OAPlaintextSignatureProvider *signatureProvider = [[[OAPlaintextSignatureProvider alloc] init] autorelease]; | 84 | [self.loginViewController.view setUserInteractionEnabled:YES]; |
| 2367 | 110 | OAMutableURLRequest *oauthRequest = [[[OAMutableURLRequest alloc] initWithURL:u1TokenURL consumer:consumer token:token realm:nil signatureProvider:signatureProvider] autorelease]; | 85 | UOSSOCredentialsViewController *loginController = (id)[(UINavigationController*)[self loginViewController] topViewController]; |
| 2368 | 111 | [oauthRequest prepare]; | 86 | [loginController reset]; |
| 2369 | 112 | UOHTTPFetchOperation *tokenOperation = [UOHTTPFetchOperation httpOperationWithRequest:oauthRequest action:^(NSString *responseBody, NSError *error) { | 87 | }; |
| 2370 | 113 | 88 | [authManager loginWithUsername:username andPassword:password completionBlock:completionBlock errorBlock:errorBlock]; | |
| 2269 | 114 | // 3. Get the phone creds using the new token | ||
| 2270 | 115 | |||
| 2271 | 116 | if (error) | ||
| 2272 | 117 | { | ||
| 2273 | 118 | [self handleError:error]; | ||
| 2274 | 119 | return; | ||
| 2275 | 120 | } | ||
| 2276 | 121 | |||
| 2277 | 122 | NSURL *credsURL = [NSURL URLWithString:@"https://one.ubuntu.com/phones/creds/ios?scheme=x-ubuntuone-music"]; | ||
| 2278 | 123 | OAMutableURLRequest *credsRequest = [[[OAMutableURLRequest alloc] initWithURL:credsURL consumer:consumer token:token realm:nil signatureProvider:signatureProvider] autorelease]; | ||
| 2279 | 124 | [credsRequest setHTTPMethod:@"GET"]; | ||
| 2280 | 125 | [credsRequest prepare]; | ||
| 2281 | 126 | __block UOSSOMusicCredsFetchOperation *credsOperation = nil; | ||
| 2282 | 127 | credsOperation = (id)[UOSSOMusicCredsFetchOperation httpOperationWithRequest:credsRequest action:^(NSString *responseBody, NSError *error) { | ||
| 2283 | 128 | |||
| 2284 | 129 | if (error) | ||
| 2285 | 130 | { | ||
| 2286 | 131 | [self handleError:error]; | ||
| 2287 | 132 | return; | ||
| 2288 | 133 | } | ||
| 2289 | 134 | |||
| 2290 | 135 | NSString *musicUsername = credsOperation.username; | ||
| 2291 | 136 | NSString *musicPassword = credsOperation.password; | ||
| 2292 | 137 | |||
| 2293 | 138 | if (musicUsername && musicPassword) | ||
| 2294 | 139 | { | ||
| 2295 | 140 | [[Subsonic sharedSubsonic] storeUsername:musicUsername password:musicPassword]; | ||
| 2296 | 141 | [self.delegate loginControllerDidLoginWithUsername:musicUsername]; | ||
| 2297 | 142 | } | ||
| 2298 | 143 | else | ||
| 2299 | 144 | { | ||
| 2300 | 145 | NSString *subscriptionRequiredMessage = NSLocalizedString(@"You need an Ubuntu One Music Streaming account to use this app.", nil); | ||
| 2301 | 146 | NSError *error = [NSError errorWithDomain:@"UOMusicLoginControllerErrorDomain" | ||
| 2302 | 147 | code:-1 | ||
| 2303 | 148 | userInfo:[NSDictionary dictionaryWithObjectsAndKeys: | ||
| 2304 | 149 | subscriptionRequiredMessage, NSLocalizedDescriptionKey, | ||
| 2305 | 150 | nil]]; | ||
| 2306 | 151 | [self handleError:error]; | ||
| 2307 | 152 | } | ||
| 2308 | 153 | |||
| 2309 | 154 | [self.loginViewController.view setUserInteractionEnabled:YES]; | ||
| 2310 | 155 | }]; | ||
| 2311 | 156 | [self.operationQueue addOperation:credsOperation]; | ||
| 2312 | 157 | |||
| 2313 | 158 | }]; | ||
| 2314 | 159 | [self.operationQueue addOperation:tokenOperation]; | ||
| 2315 | 160 | |||
| 2316 | 161 | }]; | ||
| 2317 | 162 | jsonOperation.credential = credential; | ||
| 2318 | 163 | [self.operationQueue addOperation:jsonOperation]; | ||
| 2319 | 164 | } | ||
| 2320 | 165 | |||
| 2321 | 166 | - (void)handleError:(NSError*)error; | ||
| 2322 | 167 | { | ||
| 2323 | 168 | NSString *errorMessage = [error localizedDescription]; | ||
| 2324 | 169 | if ([error code] == 401) | ||
| 2325 | 170 | errorMessage = NSLocalizedString(@"Incorrect username or password.", nil); | ||
| 2326 | 171 | else if (errorMessage == nil) | ||
| 2327 | 172 | errorMessage = NSLocalizedString(@"An error occured trying to sign in, please try again.", @"Login Error Message"); | ||
| 2328 | 173 | |||
| 2329 | 174 | UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Ubuntu One", nil) message:errorMessage delegate:self cancelButtonTitle:@"Dismiss" otherButtonTitles:nil]; | ||
| 2330 | 175 | [alert show]; | ||
| 2331 | 176 | [alert release]; | ||
| 2332 | 177 | [self.loginViewController.view setUserInteractionEnabled:YES]; | ||
| 2333 | 178 | UOSSOCredentialsViewController *loginController = (id)[(UINavigationController*)[self loginViewController] topViewController]; | ||
| 2334 | 179 | [loginController reset]; | ||
| 2371 | 180 | } | 89 | } |
| 2372 | 181 | 90 | ||
| 2373 | 182 | @end | 91 | @end |
| 2374 | 183 | 92 | ||
| 2375 | === modified file 'view_controllers/UOSSOCredentialsViewController.h' | |||
| 2376 | --- view_controllers/UOSSOCredentialsViewController.h 2011-07-11 21:22:24 +0000 | |||
| 2377 | +++ view_controllers/UOSSOCredentialsViewController.h 2012-09-19 03:34:23 +0000 | |||
| 2378 | @@ -17,13 +17,6 @@ | |||
| 2379 | 17 | 17 | ||
| 2380 | 18 | 18 | ||
| 2381 | 19 | @interface UOSSOCredentialsViewController : UIViewController <UITextFieldDelegate> | 19 | @interface UOSSOCredentialsViewController : UIViewController <UITextFieldDelegate> |
| 2382 | 20 | { | ||
| 2383 | 21 | UITextField *emailField; | ||
| 2384 | 22 | UITextField *passwordField; | ||
| 2385 | 23 | UIView *patternView; | ||
| 2386 | 24 | UIActivityIndicatorView *spinner; | ||
| 2387 | 25 | UIButton *loginButton; | ||
| 2388 | 26 | } | ||
| 2389 | 27 | 20 | ||
| 2390 | 28 | @property (nonatomic, retain) IBOutlet UITextField *emailField; | 21 | @property (nonatomic, retain) IBOutlet UITextField *emailField; |
| 2391 | 29 | @property (nonatomic, retain) IBOutlet UITextField *passwordField; | 22 | @property (nonatomic, retain) IBOutlet UITextField *passwordField; |
| 2392 | 30 | 23 | ||
| 2393 | === modified file 'view_controllers/UOSSOCredentialsViewController.m' | |||
| 2394 | --- view_controllers/UOSSOCredentialsViewController.m 2011-07-13 01:16:11 +0000 | |||
| 2395 | +++ view_controllers/UOSSOCredentialsViewController.m 2012-09-19 03:34:23 +0000 | |||
| 2396 | @@ -25,17 +25,6 @@ | |||
| 2397 | 25 | @synthesize loginButton; | 25 | @synthesize loginButton; |
| 2398 | 26 | @synthesize loginAction; | 26 | @synthesize loginAction; |
| 2399 | 27 | 27 | ||
| 2400 | 28 | - (void)dealloc; | ||
| 2401 | 29 | { | ||
| 2402 | 30 | [emailField release]; | ||
| 2403 | 31 | [passwordField release]; | ||
| 2404 | 32 | [loginAction release]; | ||
| 2405 | 33 | [patternView release]; | ||
| 2406 | 34 | [loginButton release]; | ||
| 2407 | 35 | [spinner release]; | ||
| 2408 | 36 | [super dealloc]; | ||
| 2409 | 37 | } | ||
| 2410 | 38 | |||
| 2411 | 39 | - (void)viewDidUnload; | 28 | - (void)viewDidUnload; |
| 2412 | 40 | { | 29 | { |
| 2413 | 41 | [self setEmailField:nil]; | 30 | [self setEmailField:nil]; |
| 2414 | @@ -51,12 +40,9 @@ | |||
| 2415 | 51 | [super viewDidLoad]; | 40 | [super viewDidLoad]; |
| 2416 | 52 | 41 | ||
| 2417 | 53 | UIImage *backgroundImage = [UIImage imageNamed:@"header_bg"]; | 42 | UIImage *backgroundImage = [UIImage imageNamed:@"header_bg"]; |
| 2419 | 54 | UIColor *backgroundColor = [[[UIColor alloc] initWithPatternImage:backgroundImage] autorelease]; | 43 | UIColor *backgroundColor = [[UIColor alloc] initWithPatternImage:backgroundImage]; |
| 2420 | 55 | [self.patternView setBackgroundColor:backgroundColor]; | 44 | [self.patternView setBackgroundColor:backgroundColor]; |
| 2421 | 56 | [self.patternView setOpaque:NO]; | 45 | [self.patternView setOpaque:NO]; |
| 2422 | 57 | // The following should not be necessary but without it the pattern color is opaque... | ||
| 2423 | 58 | // http://stackoverflow.com/questions/3899398/uicolor-colorwithpatternimage-alpha-blending-problem-solution-ios-sdk-4-1/5348396#5348396 | ||
| 2424 | 59 | [self.patternView.layer setOpaque:NO]; | ||
| 2425 | 60 | } | 46 | } |
| 2426 | 61 | 47 | ||
| 2427 | 62 | - (IBAction)logIn:(id)sender; | 48 | - (IBAction)logIn:(id)sender; |
