use runAsync func

volodg · Jun 30, 2015 · ceddbcc · ceddbcc
1 parent ba9c0e5
commit ceddbcc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 62 deletions.
diff --git a/iAsync.social/Facebook/AsyncAdapters/JAsyncFacebook.swift b/iAsync.social/Facebook/AsyncAdapters/JAsyncFacebook.swift
@@ -44,8 +44,8 @@ private class JFacebookGeneralRequestLoader : JAsyncInterface {
     }
 
     func asyncWithResultCallback(
-        finishCallback: JAsyncTypes<ResultType>.JDidFinishAsyncCallback,
-        stateCallback: JAsyncChangeStateCallback,
+        finishCallback  : JAsyncTypes<ResultType>.JDidFinishAsyncCallback,
+        stateCallback   : JAsyncChangeStateCallback,
         progressCallback: JAsyncProgressCallback)
     {
         let fbRequest = FBSDKGraphRequest(

diff --git a/iAsync.social/Facebook/AsyncAdapters/JAsyncFacebookLogin.swift b/iAsync.social/Facebook/AsyncAdapters/JAsyncFacebookLogin.swift
@@ -32,8 +32,8 @@ private class JAsyncFacebookLogin : JAsyncInterface {
     }
 
     func asyncWithResultCallback(
-        finishCallback: JAsyncTypes<ResultType>.JDidFinishAsyncCallback,
-        stateCallback: JAsyncChangeStateCallback,
+        finishCallback  : JAsyncTypes<ResultType>.JDidFinishAsyncCallback,
+        stateCallback   : JAsyncChangeStateCallback,
         progressCallback: JAsyncProgressCallback)
     {
         let currPermissions: Set<String>

diff --git a/iAsync.social/Facebook/AsyncAdapters/JAsyncFacebookLogout.swift b/iAsync.social/Facebook/AsyncAdapters/JAsyncFacebookLogout.swift
@@ -52,8 +52,8 @@ private class JAsyncFacebookLogout : JAsyncInterface {
     var manager: FBSDKLoginManager?
 
     func asyncWithResultCallback(
-        finishCallback: JAsyncTypes<ResultType>.JDidFinishAsyncCallback,
-        stateCallback: JAsyncChangeStateCallback,
+        finishCallback  : JAsyncTypes<ResultType>.JDidFinishAsyncCallback,
+        stateCallback   : JAsyncChangeStateCallback,
         progressCallback: JAsyncProgressCallback)
     {
         self.finishCallback = finishCallback

diff --git a/iAsync.social/Facebook/JSocialFacebook.swift b/iAsync.social/Facebook/JSocialFacebook.swift
@@ -53,8 +53,8 @@ public class JSocialFacebook: NSObject {
 
         return { (
             progressCallback: JAsyncProgressCallback?,
-            stateCallback: JAsyncChangeStateCallback?,
-            doneCallback: JAsyncTypes<FBSDKAccessToken>.JDidFinishAsyncCallback?) -> JAsyncHandler in
+            stateCallback   : JAsyncChangeStateCallback?,
+            doneCallback    : JAsyncTypes<FBSDKAccessToken>.JDidFinishAsyncCallback?) -> JAsyncHandler in
 
             let permissions = Set(self.defaultAuthPermissions)
 
@@ -95,60 +95,6 @@ public class JSocialFacebook: NSObject {
         }
     }
 
-//    class func authFacebookSessionWithPublishPermissions(permissions: [String]) -> JAsyncTypes<FBSession>.JAsync {
-//        
-//        let loader = { (
-//            progressCallback: JAsyncProgressCallback?,
-//            stateCallback: JAsyncChangeStateCallback?,
-//            doneCallback: JAsyncTypes<FBSession>.JDidFinishAsyncCallback?) -> JAsyncHandler in
-//            
-//            let session = self.facebookSession
-//            
-//            var currPermissions = Set(session.permissions as! [String])
-//            
-//            currPermissions.unionInPlace(permissions)
-//            
-//            let loader = jffFacebookLoginWithPublishPermissions(session, Array(currPermissions))
-//            
-//            let doneCallbackWrapper = { (result: Result<FBSession>) -> () in
-//                
-//                switch result {
-//                case let .Success(v):
-//                    self.facebookSession = v.value
-//                default:
-//                    break
-//                }
-//                
-//                doneCallback?(result: result)
-//            }
-//            
-//            return loader(
-//                progressCallback: progressCallback,
-//                stateCallback   : stateCallback   ,
-//                finishCallback  : doneCallbackWrapper)
-//        }
-//        
-//        let mergeParams: HashableDictionary<String, NSObject> = HashableDictionary(dict:
-//        [
-//            "methodName"  : __FUNCTION__,
-//            "permissions" : Array(Set(permissions))
-//        ])
-//        return cachedAsyncOp.asyncOpMerger(loader, uniqueKey:mergeParams)
-//    }
-//    
-//    class func publishStreamAccessSessionLoader() -> JAsyncTypes<FBSession>.JAsync {
-//        
-//        let authLoader = authFacebookSessionLoader()
-//        
-//        let binder = { (session: FBSession) -> JAsyncTypes<FBSession>.JAsync in
-//            
-//            let permissions = ["publish_stream", "user_birthday", "email"]
-//            return jffFacebookPublishAccessRequest(session, permissions)
-//        }
-//        
-//        return bindSequenceOfAsyncs(authLoader, binder)
-//    }
-
     public class func userInfoLoader() -> JAsyncTypes<SocialFacebookUser>.JAsync {
 
         let fields = ["id", "email", "name", "gender", "birthday", "picture", "bio"]