Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
MrShiY committed Dec 11, 2020
2 parents ee92d4d + ee668fa commit fbce6d2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
18 changes: 8 additions & 10 deletions Buddies.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,6 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Buddies/Pods-Buddies-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/AlamofireObjectMapper/AlamofireObjectMapper.framework",
"${BUILT_PRODUCTS_DIR}/Cartography/Cartography.framework",
"${BUILT_PRODUCTS_DIR}/FontAwesome.swift/FontAwesome_swift.framework",
"${BUILT_PRODUCTS_DIR}/GTMNSStringHTMLAdditions/GTMNSStringHTMLAdditions.framework",
Expand All @@ -561,7 +560,6 @@
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AlamofireObjectMapper.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cartography.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FontAwesome_swift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMNSStringHTMLAdditions.framework",
Expand Down Expand Up @@ -710,13 +708,13 @@
CODE_SIGN_ENTITLEMENTS = BuddiesBroadcastExtension/BuddiesBroadcastExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "$(SRCROOT)/BuddiesBroadcastExtension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie.BuddiesBroadcastExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -735,13 +733,13 @@
CODE_SIGN_ENTITLEMENTS = BuddiesBroadcastExtension/BuddiesBroadcastExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "$(SRCROOT)/BuddiesBroadcastExtension/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie.BuddiesBroadcastExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -873,12 +871,12 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
INFOPLIST_FILE = Buddies/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand All @@ -898,12 +896,12 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
INFOPLIST_FILE = Buddies/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
Expand Down
2 changes: 1 addition & 1 deletion Buddies/Controller/BaseViewControllers/MainViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class MainViewController: UIViewController, UserOptionDelegate{
"msgToken": msgToken,
"personId": User.CurrentUser.id
]
Alamofire.request("https://ios-demo-pushnoti-server.herokuapp.com/register", method: .post, parameters: webHookServiceParamater, encoding: JSONEncoding.default).validate().response { res in
AF.request("https://ios-demo-pushnoti-server.herokuapp.com/register", method: .post, parameters: webHookServiceParamater, encoding: JSONEncoding.default).validate().response { res in
KTActivityIndicator.singleton.hide()
completionHandler?(true)
if(res.error == nil){
Expand Down
4 changes: 2 additions & 2 deletions Buddies/Model/User.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ class User: Contact {
/* Remove Message/Voip token from Webhook Server*/
DispatchQueue.global().async(group: threahSpace, execute: DispatchWorkItem(block: {
if let token = UserDefaults.standard.string(forKey: "com.cisco.webex-ios-sdk.Buddies.data.device_voip_token") {
Alamofire.request("https://ios-demo-pushnoti-server.herokuapp.com/register/\(token)", method: .delete).response { res in
AF.request("https://ios-demo-pushnoti-server.herokuapp.com/register/\(token)", method: .delete).response { res in

}
}
}))

DispatchQueue.global().async(group: threahSpace, execute: DispatchWorkItem(block: {
if let token = UserDefaults.standard.string(forKey: "com.cisco.webex-ios-sdk.Buddies.data.device_msg_token") {
Alamofire.request("https://ios-demo-pushnoti-server.herokuapp.com/register/\(token)", method: .delete).response { res in
AF.request("https://ios-demo-pushnoti-server.herokuapp.com/register/\(token)", method: .delete).response { res in

}
}
Expand Down

0 comments on commit fbce6d2

Please sign in to comment.