From 84c92835bc6feed44265d405d36a18a361c00ed6 Mon Sep 17 00:00:00 2001 From: Benjamin Verdier Date: Thu, 14 Jun 2018 12:10:37 +0200 Subject: [PATCH] Add flag for checking updates --- Classes/LinphoneManager.m | 2 ++ linphone.xcodeproj/project.pbxproj | 50 ++++++++++-------------------- 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 08b9a31cd..535e445f4 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -3055,6 +3055,8 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { } - (void)checkNewVersion { + if (!CHECK_VERSION_UPDATE) + return; if (theLinphoneCore == nil) return; NSString *curVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index f9f384e3f..ebfd5d388 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -860,20 +860,6 @@ remoteGlobalIDString = FAB8A0141CAC546A00C6DFC1; remoteInfo = KIFFrameworkConsumerTests; }; - 8CA63D6420AF249800D12B41 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8CD87D4C1EF5105800ACA260; - remoteInfo = LinphoneManager; - }; - 8CA63D6620AF249800D12B41 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8CD87D541EF5105900ACA260; - remoteInfo = LinphoneManagerTests; - }; F08F119119C09C6B007D70C2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -2428,8 +2414,6 @@ 63058A071B4E816A00EFAE36 /* KIF.framework */, 633FC7C81CD7466400774B8B /* KIFFrameworkConsumer.app */, 633FC7CA1CD7466400774B8B /* KIFFrameworkConsumerTests.xctest */, - 8CA63D6520AF249800D12B41 /* LinphoneManager.framework */, - 8CA63D6720AF249800D12B41 /* LinphoneManagerTests.xctest */, ); name = Products; sourceTree = ""; @@ -3367,20 +3351,6 @@ remoteRef = 633FC7C91CD7466400774B8B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 8CA63D6520AF249800D12B41 /* LinphoneManager.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = LinphoneManager.framework; - remoteRef = 8CA63D6420AF249800D12B41 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 8CA63D6720AF249800D12B41 /* LinphoneManagerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = LinphoneManagerTests.xctest; - remoteRef = 8CA63D6620AF249800D12B41 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -4744,7 +4714,10 @@ LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\""; + OTHER_CFLAGS = ( + "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"", + "-DCHECK_VERSION_UPDATE=FALSE", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; @@ -4842,7 +4815,10 @@ LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\""; + OTHER_CFLAGS = ( + "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"", + "-DCHECK_VERSION_UPDATE=FALSE", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; @@ -4940,7 +4916,10 @@ LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\""; + OTHER_CFLAGS = ( + "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"", + "-DCHECK_VERSION_UPDATE=FALSE", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; @@ -5038,7 +5017,10 @@ LIBRARY_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\""; + OTHER_CFLAGS = ( + "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"", + "-DCHECK_VERSION_UPDATE=FALSE", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone;