diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index 325e34c..9672810 100644 Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index dfbaa09..5bdcc5f 100644 --- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -42,11 +42,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "491357363.968778" + timestampString = "491736743.483848" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "161" - endingLineNumber = "161" + startingLineNumber = "162" + endingLineNumber = "162" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -90,11 +90,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "491357363.968778" + timestampString = "491736743.483848" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "260" - endingLineNumber = "260" + startingLineNumber = "261" + endingLineNumber = "261" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -106,11 +106,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "491396358.880255" + timestampString = "491736743.483848" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "286" - endingLineNumber = "286" + startingLineNumber = "287" + endingLineNumber = "287" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -202,11 +202,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "491395746.298372" + timestampString = "491736743.483848" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "289" - endingLineNumber = "289" + startingLineNumber = "290" + endingLineNumber = "290" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -218,11 +218,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "491705640.842647" + timestampString = "491736743.483848" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "340" - endingLineNumber = "340" + startingLineNumber = "341" + endingLineNumber = "341" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -234,11 +234,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "491705640.842647" + timestampString = "491736743.483848" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "366" - endingLineNumber = "366" + startingLineNumber = "367" + endingLineNumber = "367" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -266,7 +266,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.140832" + timestampString = "491916683.662552" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "216" @@ -281,7 +281,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.141037" + timestampString = "491916683.662727" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "219" @@ -410,7 +410,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.144996" + timestampString = "491916683.666156" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "637" @@ -425,7 +425,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.145161" + timestampString = "491916683.666254" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "639" @@ -458,7 +458,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.146074" + timestampString = "491916683.667527" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "637" @@ -473,7 +473,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.146223" + timestampString = "491916683.667718" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "639" @@ -490,11 +490,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "491434159.311411" + timestampString = "491736743.483848" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "272" - endingLineNumber = "272" + startingLineNumber = "273" + endingLineNumber = "273" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -506,12 +506,12 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift" - timestampString = "491705859.147976" + timestampString = "491916683.668862" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "272" - endingLineNumber = "272" - offsetFromSymbolStart = "59097"> + startingLineNumber = "273" + endingLineNumber = "273" + offsetFromSymbolStart = "59110"> @@ -554,7 +554,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.149401" + timestampString = "491916683.670801" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "637" @@ -569,7 +569,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.14957" + timestampString = "491916683.671638" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "639" @@ -602,7 +602,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.151383" + timestampString = "491916683.674426" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "637" @@ -617,7 +617,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.151719" + timestampString = "491916683.675322" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "639" @@ -666,7 +666,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.153852" + timestampString = "491916683.677127" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "637" @@ -681,7 +681,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/EtsyRESTAPIManager.swift" - timestampString = "491705859.154091" + timestampString = "491916683.677311" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "639" @@ -746,11 +746,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "491663148.106172" + timestampString = "491736743.483848" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "319" - endingLineNumber = "319" + startingLineNumber = "320" + endingLineNumber = "320" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -762,12 +762,12 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift" - timestampString = "491705859.15903" + timestampString = "491916683.680171" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "319" - endingLineNumber = "319" - offsetFromSymbolStart = "63607"> + startingLineNumber = "320" + endingLineNumber = "320" + offsetFromSymbolStart = "63620"> @@ -842,11 +842,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "491705464.709697" + timestampString = "491736743.483848" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "326" - endingLineNumber = "326" + startingLineNumber = "327" + endingLineNumber = "327" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -867,5 +867,69 @@ landmarkType = "5"> + + + + + + + + + + + + + + + + diff --git a/Vendoo/EbayWebServiceManager.swift b/Vendoo/EbayWebServiceManager.swift index 748bd93..fe89ecb 100644 --- a/Vendoo/EbayWebServiceManager.swift +++ b/Vendoo/EbayWebServiceManager.swift @@ -15,8 +15,8 @@ protocol EbayWebServiceManagerDelegate { class EbayWebServiceManager: NSObject { - - + + //API Manager class variables //----------------------------------------------// let baseURL = "https://api.sandbox.ebay.com/ws/api.dll" @@ -39,7 +39,7 @@ class EbayWebServiceManager: NSObject { override init(){ super.init() - // self.tradingClient.debug = true + // self.tradingClient.debug = true if let path = NSBundle.mainBundle().pathForResource("Services", ofType: "plist"), dict = NSDictionary(contentsOfFile: path) as? [String: AnyObject] { self.apiKey = ((dict["Ebay"] as! Dictionary)["consumerKey"] as! String) @@ -58,7 +58,7 @@ class EbayWebServiceManager: NSObject { EbayWebServiceManager.settingsDictionary = (NSUserDefaults.standardUserDefaults().objectForKey("ebaySettings") as? Dictionary)! } else{ - + EbayWebServiceManager.settingsDictionary = ([ "listingType":"FixedPriceItem", "condition":"1500", @@ -82,13 +82,13 @@ class EbayWebServiceManager: NSObject { NSUserDefaults.standardUserDefaults().setBool(true, forKey: "ebayDefaultsOverriden") } - + } } func reinit() { - + EbayWebServiceManager.settingsDictionary = (NSUserDefaults.standardUserDefaults().objectForKey("ebaySettings") as? Dictionary)! } @@ -117,7 +117,7 @@ extension EbayWebServiceManager { var mutableData : Void = NSMutableData.initialize() } } - + func authorizeApp(){ let soapMessage = "" + @@ -128,10 +128,10 @@ extension EbayWebServiceManager { let url = NSURL(string: self.baseURL) let theRequest = NSMutableURLRequest(URL: url!) theRequest.addValue("GetSessionID", forHTTPHeaderField: "X-EBAY-API-CALL-NAME") - + self.requestMaker(soapMessage, theRequest: theRequest) - + } func deauthorizeApp(){ @@ -170,12 +170,12 @@ extension EbayWebServiceManager { func fetchToken() { let soapMessage = "" + - "\(self.xmlResponseDictionary["SessionID"] as! String!)" + "\(self.xmlResponseDictionary["SessionID"] as! String!)" let url = NSURL(string: self.baseURL) let theRequest = NSMutableURLRequest(URL: url!) theRequest.addValue("FetchToken", forHTTPHeaderField: "X-EBAY-API-CALL-NAME") - + self.requestMaker(soapMessage, theRequest: theRequest) } } @@ -195,13 +195,14 @@ extension EbayWebServiceManager: NSURLConnectionDelegate { func connectionDidFinishLoading(connection: NSURLConnection!) { let response = NSString(data: mutableData, encoding: NSUTF8StringEncoding) + print(response) let xmlParser = NSXMLParser(data: mutableData) xmlParser.delegate = self xmlParser.parse() xmlParser.shouldResolveExternalEntities = true } - + func connection(connection: NSURLConnection, willSendRequestForAuthenticationChallenge challenge: NSURLAuthenticationChallenge) { challenge.sender!.performDefaultHandlingForAuthenticationChallenge!(challenge) @@ -282,6 +283,20 @@ extension EbayWebServiceManager: NSXMLParserDelegate { print(string) EbayWebServiceManager.settingsDictionary["userID"] = string NSUserDefaults.standardUserDefaults().setObject(EbayWebServiceManager.settingsDictionary, forKey: "ebaySettings") + print(self.xmlResponseDictionary["eBayAuthToken"]) + let soapmessage = "" + + "" + + "\(self.xmlResponseDictionary["eBayAuthToken"] as! String)" + + "0ReturnAll1" + + "" + + let url = NSURL(string: self.baseURL) + let theRequest = NSMutableURLRequest(URL: url!) + theRequest.addValue("GetCategories", forHTTPHeaderField: "X-EBAY-API-CALL-NAME") + + self.requestMaker(soapmessage, theRequest: theRequest) + break + case "" : break default: //print(string) diff --git a/Vendoo/ListingPreviewViewController.swift b/Vendoo/ListingPreviewViewController.swift index bb908a1..2a9ee25 100644 --- a/Vendoo/ListingPreviewViewController.swift +++ b/Vendoo/ListingPreviewViewController.swift @@ -145,6 +145,7 @@ extension ListingPreviewViewController { //post to ebay if(self.networksDictionary["ebay"]!){ + dispatch_group_enter(postingGroup) }