Changeset 749

Timestamp:

06/29/10 18:05:40 (3 years ago)

Author:

henri

Message:

Added support for base64-encoded data

Location:

apps/iphone/superbook/trunk

Files:

: 2 added
: 3 modified

DotTel_SDK/Classes/NSData+HAAdditions.h (added)
DotTel_SDK/Classes/NSData+HAAdditions.m (added)
DotTel_SDK/Classes/RecordNaptr.h (modified) (1 diff)
DotTel_SDK/Classes/RecordNaptr.m (modified) (3 diffs)
LocateThem.xcodeproj/project.pbxproj (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordNaptr.h

r546	r749
30	30	#import <ldns/ldns.h>
31	31	#import "idna.h"
	32	#import "NSData+HAAdditions.h"
32	33
33	34	// Shorthand for getting localized strings

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordNaptr.m

r736	r749
84	84	isValid = NO;
85	85
86		locationIndicatorHints = [[NSArray arrayWithObjects:
87		@"x-mobile",
88		@"x-work",
89		@"x-main",
90		@"x-home",
91		@"x-transit",
92		@"x-prs",
93		nil
94		] retain];
	86	if (!locationIndicatorHints) {
	87	locationIndicatorHints = [[NSArray arrayWithObjects:
	88	@"x-mobile",
	89	@"x-work",
	90	@"x-main",
	91	@"x-home",
	92	@"x-transit",
	93	@"x-prs",
	94	nil
	95	] retain];
	96	}
95	97	if (!rr)
96	98	return self;
…	…
146	148	if ([uriContent hasPrefix:@"data:,"]) {
147	149	uriContent = [uriContent stringByReplacingCharactersInRange:NSMakeRange(0, [@"data:," length]) withString:@""];
148		}
	150	} else if ([uriContent hasPrefix:@"data:;base64,"]) {
	151	uriContent = [uriContent stringByReplacingCharactersInRange:NSMakeRange(0, [@"data:;base64," length]) withString:@""];
	152	NSData *contentData = [NSData dataWithBase64String:uriContent];
	153	uriContent = [[[NSString alloc] initWithData:contentData encoding:NSUTF8StringEncoding] autorelease];
	154	if (uriContent == nil) {
	155	uriContent = @"<unknown data type>";
	156	}
	157	}
	158
149	159
150	160	labelDescription = [[self generateLabelDescription] retain];
…	…
418	428
419	429	- (void)dealloc {
420		[locationIndicatorHints release];
	430	// [locationIndicatorHints release];
421	431	[super dealloc];
422	432	}

apps/iphone/superbook/trunk/LocateThem.xcodeproj/project.pbxproj

r742	r749
13	13	1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks / = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 / UIKit.framework */; };
14	14	28D7ACF80DDB3853001CB0EB /* LocateThem_ViewController.m in Sources / = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB / LocateThem_ViewController.m */; };
	15	3803234511DA3A860030E7C8 /* NSData+HAAdditions.m in Sources / = {isa = PBXBuildFile; fileRef = 3803234411DA3A860030E7C8 / NSData+HAAdditions.m */; };
15	16	3803AF980FF2783300E8C699 /* topbar.png in Resources / = {isa = PBXBuildFile; fileRef = 3803AF970FF2783200E8C699 / topbar.png */; };
16	17	3803B22E0FF37C4D00E8C699 /* button-pin-refresh.png in Resources / = {isa = PBXBuildFile; fileRef = 3803B22D0FF37C4D00E8C699 / button-pin-refresh.png */; };
…	…
97	98	29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
98	99	32CA4F630368D1EE00C91783 /* LocateThem_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocateThem_Prefix.pch; sourceTree = "<group>"; };
	100	3803234311DA3A860030E7C8 /* NSData+HAAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+HAAdditions.h"; sourceTree = "<group>"; };
	101	3803234411DA3A860030E7C8 /* NSData+HAAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+HAAdditions.m"; sourceTree = "<group>"; };
99	102	3803AF970FF2783200E8C699 /* topbar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = topbar.png; sourceTree = "<group>"; };
100	103	3803B22D0FF37C4D00E8C699 /* button-pin-refresh.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button-pin-refresh.png"; sourceTree = "<group>"; };
…	…
395	398	38D8DDF21151415100FD0DEF /* TelDomain.h */,
396	399	38D8DDF31151415100FD0DEF /* TelDomain.m */,
	400	3803234311DA3A860030E7C8 /* NSData+HAAdditions.h */,
	401	3803234411DA3A860030E7C8 /* NSData+HAAdditions.m */,
397	402	);
398	403	path = Classes;
…	…
599	604	38D8DDF41151415100FD0DEF /* TelDomain.m in Sources */,
600	605	380B0B7811B907ED00F7FAF7 /* HABadgeViewController.m in Sources */,
	606	3803234511DA3A860030E7C8 /* NSData+HAAdditions.m in Sources */,
601	607	);
602	608	runOnlyForDeploymentPostprocessing = 0;