ios sdk: memory management for delegates

src/FBDialog.m

@@ -349,7 +349,6 @@ - (id)init {
 - (void)dealloc {
   _webView.delegate = nil;
   [_webView release];
-  [_delegate release];
   [_params release];
   [_serverURL release];
   [_spinner release];
@@ -514,7 +513,7 @@ - (id)initWithURL: (NSString *) serverURL
   self = [self init];
   _serverURL = [serverURL retain];
   _params = [params retain];
-  _delegate = [delegate retain];
+  _delegate = delegate;
 
   return self;
 }

src/FBLoginDialog.m

@@ -34,7 +34,7 @@ - (id)initWithURL:(NSString*) loginURL
   self = [super init];
   _serverURL = [loginURL retain];
   _params = [params retain];
-  _loginDelegate = [delegate retain];
+  _loginDelegate = delegate;
   return self;
 }
 
@@ -87,13 +87,5 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
     [_loginDelegate fbDialogNotLogin];
   }
 }
-
-/**
- * Override FBDialog : free the space
- */
-- (void)dealloc {
-  [_loginDelegate release];
-  [super dealloc];
-}
 
 @end

src/FBRequest.h

@@ -37,12 +37,12 @@
 /**
  * The URL which will be contacted to execute the request.
  */
-@property(nonatomic,assign) NSString* url;
+@property(nonatomic,copy) NSString* url;
 
 /**
  * The API method which will be called.
  */
-@property(nonatomic,assign) NSString* httpMethod;
+@property(nonatomic,copy) NSString* httpMethod;
 
 /**
  * The dictionary of parameters to pass to the method.

src/FBRequest.m

@@ -45,7 +45,7 @@ + (FBRequest *)getRequestWithParams:(NSMutableDictionary *) params
                            delegate:(id<FBRequestDelegate>) delegate
                          requestURL:(NSString *) url {
   FBRequest* request    = [[[FBRequest alloc] init] autorelease];
-  request.delegate      = [delegate retain]; 
+  request.delegate      = delegate; 
   request.url           = [url retain];
   request.httpMethod    = [httpMethod retain];
   request.params        = [params retain];

src/Facebook.h

@@ -35,11 +35,11 @@
 
 }
 
-@property(nonatomic, retain) NSString* accessToken;
+@property(nonatomic, copy) NSString* accessToken;
 
-@property(nonatomic, retain) NSDate* expirationDate;
+@property(nonatomic, copy) NSDate* expirationDate;
 
-@property(nonatomic, retain) id<FBSessionDelegate> sessionDelegate;
+@property(nonatomic, assign) id<FBSessionDelegate> sessionDelegate;
 
 
 - (void) authorize:(NSString*) application_id

src/Facebook.m

@@ -125,11 +125,7 @@ - (void) authorize:(NSString*)application_id
     [params setValue:scope forKey:@"scope"];
   }
 
-  if (_sessionDelegate) {
-    [_sessionDelegate release];
-     _sessionDelegate = nil;
-  }
-  _sessionDelegate = [delegate retain];
+  _sessionDelegate = delegate;
 
   [_loginDialog release];
   _loginDialog = [[FBLoginDialog alloc] initWithURL:kOAuthURL 
@@ -151,11 +147,7 @@ - (void) authorize:(NSString*)application_id
  */
 - (void)logout:(id<FBSessionDelegate>)delegate {
 
-  if (_sessionDelegate) {
-    [_sessionDelegate release];
-    _sessionDelegate = nil;
-  }
-  _sessionDelegate = [delegate retain];
+  _sessionDelegate = delegate;
 
   NSMutableDictionary * params = [[NSMutableDictionary alloc] init]; 
   [self requestWithMethodName:@"auth.expireSession" 
@@ -443,7 +435,6 @@ - (void)request:(FBRequest*)request didFailWithError:(NSError*)error{
 - (void)dealloc {
   [_accessToken release];
   [_expirationDate release];
-  [_sessionDelegate release];
   [_request release];
   [_loginDialog release];
   [_fbDialog release];