diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 77c822dc..9aec621e 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -8936,7 +8936,7 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 1.6.0; + MARKETING_VERSION = 1.7.0; ONLY_ACTIVE_ARCH = YES; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der"; OTHER_LDFLAGS = ( @@ -8985,7 +8985,7 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 1.6.0; + MARKETING_VERSION = 1.7.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", diff --git a/GME Remit/APIs/RestApiManager.swift b/GME Remit/APIs/RestApiManager.swift index 887600ed..0d45d9e6 100644 --- a/GME Remit/APIs/RestApiManager.swift +++ b/GME Remit/APIs/RestApiManager.swift @@ -88,22 +88,22 @@ class RestApiMananger { let lang = Utility.getLanguageHeader(for: currentLanguage) //live value -// return [ -// "Authorization": "Bearer " + accessCode, -// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", -// "Content-Type": "application/json", -// "clientId": Utility.getMyKftcClientId(), -// "lang" : lang -// ] + return [ + "Authorization": "Bearer " + accessCode, + "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", + "Content-Type": "application/json", + "clientId": Utility.getMyKftcClientId(), + "lang" : lang + ] //uat value - return [ - "Authorization": "Bearer " + accessCode, - "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", - "Content-Type": "application/json", - "clientId": Utility.getMyKftcClientId(), - "lang" : lang - ] +// return [ +// "Authorization": "Bearer " + accessCode, +// "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", +// "Content-Type": "application/json", +// "clientId": Utility.getMyKftcClientId(), +// "lang" : lang +// ] } func request( diff --git a/GME Remit/APIs/Router/APIRouter.swift b/GME Remit/APIs/Router/APIRouter.swift index 91f4ae60..057d653b 100644 --- a/GME Remit/APIs/Router/APIRouter.swift +++ b/GME Remit/APIs/Router/APIRouter.swift @@ -141,30 +141,30 @@ extension APIRouter: ApiServiceType { let currentLanguage = Localize.currentLanguage() let lang = Utility.getLanguageHeader(for: currentLanguage) - //live value -// let authValue = "5220221D2E737FD60C28243:fUjXn2r5:\(uuid)".toBase64() +// live value + let authValue = "5220221D2E737FD60C28243:fUjXn2r5:\(uuid)".toBase64() - // uat value - let authValue = "162021E171B825A55C52024823:cQeThWmZ:11i;\(uuid)".toBase64() - - //live value -// return [ -// "Authorization": "Basic \(authValue)", -// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", -// "Content-Type": "application/json", -// "lang" : lang, -// "uuid" : self.uuid -// ] - -// uat value +// // uat value +// let authValue = "162021E171B825A55C52024823:cQeThWmZ:11i;\(uuid)".toBase64() +// live value return [ "Authorization": "Basic \(authValue)", - "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", + "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", "Content-Type": "application/json", "lang" : lang, "uuid" : self.uuid ] + +// uat value + +// return [ +// "Authorization": "Basic \(authValue)", +// "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", +// "Content-Type": "application/json", +// "lang" : lang, +// "uuid" : self.uuid +// ] } private var afterLoginHeader: [String: String] { @@ -174,28 +174,28 @@ extension APIRouter: ApiServiceType { //live token -// return [ -// "Authorization": "Bearer " + accessCode, -// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", -// "Content-Type": "application/json", -// "clientId": Utility.getMyKftcClientId(), -// "lang" : lang, -// "uuid" : self.uuid -// ] - - - - - //uat token return [ "Authorization": "Bearer " + accessCode, - "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", + "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", "Content-Type": "application/json", "clientId": Utility.getMyKftcClientId(), "lang" : lang, "uuid" : self.uuid ] + + + + //uat token +// return [ +// "Authorization": "Bearer " + accessCode, +// "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", +// "Content-Type": "application/json", +// "clientId": Utility.getMyKftcClientId(), +// "lang" : lang, +// "uuid" : self.uuid +// ] + } func json( diff --git a/GME Remit/APIs/UrlManager.swift b/GME Remit/APIs/UrlManager.swift index b515050a..ec8843ad 100644 --- a/GME Remit/APIs/UrlManager.swift +++ b/GME Remit/APIs/UrlManager.swift @@ -17,7 +17,7 @@ class UrlManager { let baseSocialURL = "" - let liveServerUrl = "https://sandboxapi.japanremit.com:8083/api/" // "https://mobile.japanremit.com:8443/api/" + let liveServerUrl = "https://mobile.japanremit.com:8443/api/" // "https://mobile.japanremit.com:8443/api/" let testUrl = "https://sandboxapi.japanremit.com:8083/api/" //"http://202.166.220.36:8083/api/" init() { diff --git a/GME Remit/Modules/AppUpdate/User Interface/View/AppUpdateViewController.swift b/GME Remit/Modules/AppUpdate/User Interface/View/AppUpdateViewController.swift index 2a082891..c0673480 100644 --- a/GME Remit/Modules/AppUpdate/User Interface/View/AppUpdateViewController.swift +++ b/GME Remit/Modules/AppUpdate/User Interface/View/AppUpdateViewController.swift @@ -37,6 +37,7 @@ class AppUpdateViewController: UIViewController { // MARK: IBActions @IBAction func dismiss(_ sender: Any) { + self.dismiss() } @@ -45,6 +46,9 @@ class AppUpdateViewController: UIViewController { } @IBAction func backButtonPressed(_ sender: Any) { + if (Utility.isCriticalUpdate()) { + return + } self.dismiss(animated: true, completion: nil) } // MARK: Other Functions @@ -52,6 +56,7 @@ class AppUpdateViewController: UIViewController { private func setup() { let shouldHideDismiss = Utility.isCriticalUpdate() self.notNowButton.isHidden = shouldHideDismiss + configureUpdateButton() configureText() }