Fixing merge issues

gpambrozio · Nov 15, 2010 · 402ecf9 · 402ecf9
1 parent 76fe385
commit 402ecf9
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 84 deletions.
diff --git a/Classes/ShareKit/Core/Base Sharer Classes/SHKOAuthSharer.m b/Classes/ShareKit/Core/Base Sharer Classes/SHKOAuthSharer.m
@@ -142,7 +142,7 @@ - (void)tokenAuthorize
 {	
 	NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@?oauth_token=%@", authorizeURL.absoluteString, requestToken.key]];
 
-	SHKOAuthView *auth = [(SHKOAuthView*)[SHKOAuthView alloc] initWithURL:url delegate:self];
+	SHKOAuthView *auth = [[SHKOAuthView alloc] initWithURL:url delegate:self];
 	[[SHK currentHelper] showViewController:auth];	
 	[auth release];
 }

diff --git a/Classes/ShareKit/Core/Base Sharer Classes/SHKSharer.h b/Classes/ShareKit/Core/Base Sharer Classes/SHKSharer.h
@@ -183,12 +183,5 @@ typedef enum
 
 @end
 
-// JAB: Just to get the bloody things declared.
-@protocol AuthEvents
-- (void)authFinished:(SHKRequest *)aRequest;
-- (void)tokenFinished:(SHKRequest *)aRequest;
-- (void)sendFinished:(SHKRequest *)aRequest;
-@end
-
 
 
diff --git a/Classes/ShareKit/Core/Base Sharer Classes/SHKSharer.m b/Classes/ShareKit/Core/Base Sharer Classes/SHKSharer.m
@@ -127,14 +127,9 @@ + (BOOL)canShareType:(SHKShareType)type
 		case SHKShareTypeFile:
 			return [self canShareFile];
 			break;
-<<<<<<< HEAD
 
 		default: 
 			return NO;
-=======
-    default:
-      return NO;
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 	}
 	return NO;
 }
@@ -575,9 +570,9 @@ - (BOOL)validateItem
 		case SHKShareTypeFile:
 			return (item.data != nil);
 			break;
-    default:
-      return NO;
 	}
+
+	return NO;
 }
 
 - (BOOL)tryToSend
@@ -663,14 +658,9 @@ - (void)tryPendingAction
 		case SHKPendingShare:
 			[self share];
 			break;
-<<<<<<< HEAD
 		default:
 			break;
 
-=======
-    default:
-      return;      
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 	}
 }
 

diff --git a/Classes/ShareKit/Core/SHK.m b/Classes/ShareKit/Core/SHK.m
@@ -35,7 +35,6 @@
 #import <objc/runtime.h>
 #import <objc/message.h>
 #import <MessageUI/MessageUI.h>
-#import "SHKMail.h"
 
 
 @implementation SHK
@@ -297,14 +296,9 @@ + (NSArray *)favoriteSharersForType:(SHKShareType)type
 			case SHKShareTypeFile:
 				favoriteSharers = [NSArray arrayWithObjects:@"SHKMail",@"SHKEvernote",nil];
 				break;
-<<<<<<< HEAD
 
 			default:
 				favoriteSharers = [NSArray array];
-=======
-      default:
-        return nil;
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 		}
 
 		// Save defaults to prefs

diff --git a/Classes/ShareKit/Core/SHKSharers.plist b/Classes/ShareKit/Core/SHKSharers.plist
@@ -7,7 +7,6 @@
 		<string>SHKPhotoAlbum</string>
 		<string>SHKCopy</string>
 		<string>SHKMail</string>
-		<string>SHKTextMessage</string>
 		<string>SHKSafari</string>
 		<string>SHKTextMessage</string>
 	</array>

diff --git a/Classes/ShareKit/Sharers/Actions/Text Message/SHKTextMessage.m b/Classes/ShareKit/Sharers/Actions/Text Message/SHKTextMessage.m
@@ -34,14 +34,9 @@ - (void)SHKviewDidDisappear:(BOOL)animated
 {
 	[super viewDidDisappear:animated];
 
-<<<<<<< HEAD
 	// Remove the SHK view wrapper from the window (but only if the view doesn't have another modal over it)
 	if (self.modalViewController == nil)
 		[[SHK currentHelper] viewWasDismissed];
-=======
-	// Remove the SHK view wrapper from the window
-	[[SHK currentHelper] viewWasDismissed];
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 }
 
 @end
@@ -55,11 +50,7 @@ @implementation SHKTextMessage
 
 + (NSString *)sharerTitle
 {
-<<<<<<< HEAD
 	return @"SMS";
-=======
-	return @"Text";
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 }
 
 + (BOOL)canShareText
@@ -125,11 +116,7 @@ - (BOOL)sendText
 {	
 	MFMessageComposeViewController *composeView = [[[MFMessageComposeViewController alloc] init] autorelease];
 	composeView.messageComposeDelegate = self;
-<<<<<<< HEAD
 
-=======
-
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 	NSString * body = [item customValueForKey:@"body"];
 
 	if (!body) {
@@ -151,37 +138,19 @@ - (BOOL)sendText
 		if (body == nil)
 			body = @"";
 
-<<<<<<< HEAD
 		// save changes to body
 		[item setCustomValue:body forKey:@"body"];
 	}
 
-=======
-		// sig
-		if (SHKSharedWithSignature)
-		{
-			body = [body stringByAppendingString:@"<br/><br/>"];
-			body = [body stringByAppendingString:SHKLocalizedString(@"Sent from %@", SHKMyAppName)];
-		}
-
-		// save changes to body
-		[item setCustomValue:body forKey:@"body"];
-	}
-
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 	[composeView setBody:body];
 	[[SHK currentHelper] showViewController:composeView];
 
 	return YES;
 }
 
 - (void)messageComposeViewController:(MFMessageComposeViewController *)controller 
-<<<<<<< HEAD
 				 didFinishWithResult:(MessageComposeResult)result 
 {
-=======
-				 didFinishWithResult:(MessageComposeResult)result {
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 
 	[[SHK currentHelper] hideCurrentViewControllerAnimated:YES];
 

diff --git a/Classes/ShareKit/Sharers/Services/Google Reader/SHKGoogleReader.m b/Classes/ShareKit/Sharers/Services/Google Reader/SHKGoogleReader.m
@@ -37,11 +37,6 @@
 
 #import "SHKGoogleReader.h"
 
-@interface SHKGoogleReader (Private)
-- (void)authFinished:(SHKRequest *)aRequest;
-- (void)tokenFinished:(SHKRequest *)aRequest;
-- (void)sendFinished:(SHKRequest *)aRequest;
-@end
 
 @implementation SHKGoogleReader
 

diff --git a/Classes/ShareKit/UI/SHKActionSheet.m b/Classes/ShareKit/UI/SHKActionSheet.m
@@ -49,11 +49,7 @@ + (SHKActionSheet *)actionSheetForType:(SHKShareType)type
 											 cancelButtonTitle:nil
 										destructiveButtonTitle:nil
 											 otherButtonTitles:nil];
-<<<<<<< HEAD
 	as.delegate = as;
-=======
-  as.delegate = as;
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 	as.item = [[[SHKItem alloc] init] autorelease];
 	as.item.shareType = type;
 

diff --git a/Classes/ShareKit/UI/SHKFormFieldCell.m b/Classes/ShareKit/UI/SHKFormFieldCell.m
@@ -143,8 +143,6 @@ - (void)setValue:(NSString *)value
 		case SHKFormFieldTypePassword:
 			textField.text = value;
 			break;
-    default:
-      return;
 	}
 }
 
@@ -155,8 +153,6 @@ - (NSString *)getValue
 		case SHKFormFieldTypeSwitch:
 			return toggle.on ? SHKFormFieldSwitchOn : SHKFormFieldSwitchOff;
 			break;
-    default:
-      break;
 	}
 
 	return textField.text;

diff --git a/ShareKit.xcodeproj/project.pbxproj b/ShareKit.xcodeproj/project.pbxproj
@@ -168,6 +168,7 @@
 		4379F3251291B86500D2A41E /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = Classes/ShareKit/Localization/fr.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		4379F3B01291C45700D2A41E /* SHKTextMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKTextMessage.h; sourceTree = "<group>"; };
 		4379F3B11291C45700D2A41E /* SHKTextMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKTextMessage.m; sourceTree = "<group>"; };
+		4379F3EA1291CA1700D2A41E /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = Classes/ShareKit/Localization/ko.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		43A5367411DBE3B9004A1712 /* SHKOAuthSharer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKOAuthSharer.h; sourceTree = "<group>"; };
 		43A5367511DBE3B9004A1712 /* SHKOAuthSharer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKOAuthSharer.m; sourceTree = "<group>"; };
 		43A5367611DBE3B9004A1712 /* SHKSharer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKSharer.h; sourceTree = "<group>"; };
@@ -309,7 +310,6 @@
 		43EF406D11D3FFF800B1F700 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		43FF9C7312270E9F00ADE53C /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = Classes/ShareKit/Localization/en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		43FF9C7512270EB900ADE53C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = Classes/ShareKit/Localization/de.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
-		43FF9C7712270ED900ADE53C /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = Classes/ShareKit/Localization/ko.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
 		8D1107310486CEB800E47090 /* ShareKit-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "ShareKit-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -933,6 +933,7 @@
 				zh_CN,
 				eu,
 				fr,
+				ko,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
@@ -1062,16 +1063,13 @@
 			children = (
 				43FF9C7312270E9F00ADE53C /* en */,
 				43FF9C7512270EB900ADE53C /* de */,
-<<<<<<< HEAD
 				4379F2D31291ACD800D2A41E /* ja */,
 				4379F2D41291ACE600D2A41E /* eu */,
 				4379F2D51291ACF700D2A41E /* nl */,
 				4379F2D61291AD0300D2A41E /* vi */,
 				4379F2D71291AD0F00D2A41E /* zh_CN */,
 				4379F3251291B86500D2A41E /* fr */,
-=======
-				43FF9C7712270ED900ADE53C /* ko */,
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
+				4379F3EA1291CA1700D2A41E /* ko */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1092,11 +1090,7 @@
 				INFOPLIST_FILE = "ShareKit-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
 				PRODUCT_NAME = ShareKit;
-<<<<<<< HEAD
 				SDKROOT = iphoneos;
-=======
-				SDKROOT = iphoneos4.1;
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1128,11 +1122,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
 				PREBINDING = NO;
-<<<<<<< HEAD
 				SDKROOT = iphoneos;
-=======
-				SDKROOT = iphoneos4.1;
->>>>>>> ca11f25750bfab8732343db72ad1767a82a7a0d7
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;