Skip to content

Commit

Permalink
Merge pull request #219 from apptentive/branch_5.1.2
Browse files Browse the repository at this point in the history 
Release 5.1.2
  • Loading branch information
@frankus
frankus authored Jul 6, 2018
2 parents 4c003b7 + 69ff395 commit 992ca13
Show file tree
Hide file tree
Showing 20 changed files with 121 additions and 494 deletions.
151 changes: 5 additions & 146 deletions Apptentive/Apptentive.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
0116D5281E92F516001DA5CF /* ApptentiveMessageStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0116D5261E92F516001DA5CF /* ApptentiveMessageStore.m */; };
01201AD31FC637BE00EB3593 /* CodePointAndInteractionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 01201AD21FC637BD00EB3593 /* CodePointAndInteractionTests.m */; };
01216C501EBBB53E0062BD0D /* RequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01216C4F1EBBB53E0062BD0D /* RequestTests.swift */; };
012285481E4A81AD00DD2F58 /* Apptentive_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A2CFAB1E490A9600C2103A /* Apptentive_Private.h */; settings = {ATTRIBUTES = (Public, ); }; };
012285491E4A831500DD2F58 /* Apptentive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01A2CF911E49062700C2103A /* Apptentive.framework */; };
0123005F20531698000EC3C3 /* ClauseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0123005E20531698000EC3C3 /* ClauseTests.m */; };
012ED9292072F33F003D87F3 /* ApptentiveRetryPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 012ED9272072F33F003D87F3 /* ApptentiveRetryPolicy.h */; };
012ED92A2072F33F003D87F3 /* ApptentiveRetryPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 012ED9282072F33F003D87F3 /* ApptentiveRetryPolicy.m */; };
Expand Down Expand Up @@ -352,10 +350,6 @@
01A2D26B1E4946D600C2103A /* testJsonDiffing.1.old.json in Resources */ = {isa = PBXBuildFile; fileRef = 01A2D2301E4946D600C2103A /* testJsonDiffing.1.old.json */; };
01A2D26C1E4946D600C2103A /* testJsonDiffing.2.new.json in Resources */ = {isa = PBXBuildFile; fileRef = 01A2D2311E4946D600C2103A /* testJsonDiffing.2.new.json */; };
01A2D26D1E4946D600C2103A /* testJsonDiffing.2.old.json in Resources */ = {isa = PBXBuildFile; fileRef = 01A2D2321E4946D600C2103A /* testJsonDiffing.2.old.json */; };
01A2D28C1E49609100C2103A /* ApptentiveDebugging.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A2D27E1E49609100C2103A /* ApptentiveDebugging.h */; settings = {ATTRIBUTES = (Public, ); }; };
01A2D2951E4960E100C2103A /* Apptentive+Debugging.h in Headers */ = {isa = PBXBuildFile; fileRef = 01A2D2931E4960E100C2103A /* Apptentive+Debugging.h */; settings = {ATTRIBUTES = (Public, ); }; };
01A2D2961E4960E100C2103A /* Apptentive+Debugging.m in Sources */ = {isa = PBXBuildFile; fileRef = 01A2D2941E4960E100C2103A /* Apptentive+Debugging.m */; };
01A2D2971E49614A00C2103A /* Apptentive+Debugging.m in Sources */ = {isa = PBXBuildFile; fileRef = 01A2D2941E4960E100C2103A /* Apptentive+Debugging.m */; };
01A2D2981E49638A00C2103A /* ATDataModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 01A2D0B01E490A9700C2103A /* ATDataModel.xcdatamodeld */; };
01A2D2991E4963A500C2103A /* ATDataModel v1 to v2.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 01A2D0AB1E490A9700C2103A /* ATDataModel v1 to v2.xcmappingmodel */; };
01A2D29A1E4963A500C2103A /* ATDataModel v2 to v3.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 01A2D0AC1E490A9700C2103A /* ATDataModel v2 to v3.xcmappingmodel */; };
Expand Down Expand Up @@ -437,13 +431,6 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
012285461E4A814300DD2F58 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 01A2CF881E49062700C2103A /* Project object */;
proxyType = 1;
remoteGlobalIDString = 01A2CF901E49062700C2103A;
remoteInfo = Apptentive;
};
01A2CF9C1E49062800C2103A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 01A2CF881E49062700C2103A /* Project object */;
Expand Down Expand Up @@ -827,11 +814,6 @@
01A2D2301E4946D600C2103A /* testJsonDiffing.1.old.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = testJsonDiffing.1.old.json; sourceTree = "<group>"; };
01A2D2311E4946D600C2103A /* testJsonDiffing.2.new.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = testJsonDiffing.2.new.json; sourceTree = "<group>"; };
01A2D2321E4946D600C2103A /* testJsonDiffing.2.old.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = testJsonDiffing.2.old.json; sourceTree = "<group>"; };
01A2D27C1E49609100C2103A /* ApptentiveDebugging.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ApptentiveDebugging.framework; sourceTree = BUILT_PRODUCTS_DIR; };
01A2D27E1E49609100C2103A /* ApptentiveDebugging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApptentiveDebugging.h; sourceTree = "<group>"; };
01A2D27F1E49609100C2103A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
01A2D2931E4960E100C2103A /* Apptentive+Debugging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Apptentive+Debugging.h"; sourceTree = "<group>"; };
01A2D2941E4960E100C2103A /* Apptentive+Debugging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Apptentive+Debugging.m"; sourceTree = "<group>"; };
01A2D29E1E4963F700C2103A /* v2CorruptDatabase */ = {isa = PBXFileReference; lastKnownFileType = folder; path = v2CorruptDatabase; sourceTree = "<group>"; };
01A2D29F1E4963F700C2103A /* v2WALDatabase */ = {isa = PBXFileReference; lastKnownFileType = folder; path = v2WALDatabase; sourceTree = "<group>"; };
01A2D2A01E4963F700C2103A /* v3WALDatabase */ = {isa = PBXFileReference; lastKnownFileType = folder; path = v3WALDatabase; sourceTree = "<group>"; };
Expand Down Expand Up @@ -925,14 +907,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
01A2D2781E49609100C2103A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
012285491E4A831500DD2F58 /* Apptentive.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -1007,7 +981,6 @@
isa = PBXGroup;
children = (
01A2CF931E49062700C2103A /* Apptentive */,
01A2D27D1E49609100C2103A /* ApptentiveDebugging */,
01A2CF9E1E49062800C2103A /* ApptentiveTests */,
01A2CF921E49062700C2103A /* Products */,
);
Expand All @@ -1018,7 +991,6 @@
children = (
01A2CF911E49062700C2103A /* Apptentive.framework */,
01A2CF9A1E49062800C2103A /* ApptentiveTests.xctest */,
01A2D27C1E49609100C2103A /* ApptentiveDebugging.framework */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -1725,17 +1697,6 @@
path = criteria;
sourceTree = "<group>";
};
01A2D27D1E49609100C2103A /* ApptentiveDebugging */ = {
isa = PBXGroup;
children = (
01A2D2931E4960E100C2103A /* Apptentive+Debugging.h */,
01A2D2941E4960E100C2103A /* Apptentive+Debugging.m */,
01A2D27E1E49609100C2103A /* ApptentiveDebugging.h */,
01A2D27F1E49609100C2103A /* Info.plist */,
);
path = ApptentiveDebugging;
sourceTree = "<group>";
};
01AD54981E8706800057D10C /* Message Center */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1948,16 +1909,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
01A2D2791E49609100C2103A /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
01A2D28C1E49609100C2103A /* ApptentiveDebugging.h in Headers */,
012285481E4A81AD00DD2F58 /* Apptentive_Private.h in Headers */,
01A2D2951E4960E100C2103A /* Apptentive+Debugging.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -1997,25 +1948,6 @@
productReference = 01A2CF9A1E49062800C2103A /* ApptentiveTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
01A2D27B1E49609100C2103A /* ApptentiveDebugging */ = {
isa = PBXNativeTarget;
buildConfigurationList = 01A2D28D1E49609100C2103A /* Build configuration list for PBXNativeTarget "ApptentiveDebugging" */;
buildPhases = (
01A2D2771E49609100C2103A /* Sources */,
01A2D2781E49609100C2103A /* Frameworks */,
01A2D2791E49609100C2103A /* Headers */,
01A2D27A1E49609100C2103A /* Resources */,
);
buildRules = (
);
dependencies = (
012285471E4A814300DD2F58 /* PBXTargetDependency */,
);
name = ApptentiveDebugging;
productName = ApptentiveDebugging;
productReference = 01A2D27C1E49609100C2103A /* ApptentiveDebugging.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -2036,11 +1968,6 @@
LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
01A2D27B1E49609100C2103A = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = 86WML2UN43;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 01A2CF8B1E49062700C2103A /* Build configuration list for PBXProject "Apptentive" */;
Expand Down Expand Up @@ -2076,7 +2003,6 @@
targets = (
01A2CF901E49062700C2103A /* Apptentive */,
01A2CF991E49062800C2103A /* ApptentiveTests */,
01A2D27B1E49609100C2103A /* ApptentiveDebugging */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -2186,13 +2112,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
01A2D27A1E49609100C2103A /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -2380,7 +2299,6 @@
01216C501EBBB53E0062BD0D /* RequestTests.swift in Sources */,
EFF4D2A91EC3806300FD4EFE /* ApptentiveConversationMigrationTests.m in Sources */,
01A2D2981E49638A00C2103A /* ATDataModel.xcdatamodeld in Sources */,
01A2D2971E49614A00C2103A /* Apptentive+Debugging.m in Sources */,
010FE33B203E2D900021C246 /* CriteriaDescriptionTests.swift in Sources */,
01A2D2401E4946D600C2103A /* ApptentiveConnectTests.m in Sources */,
01A2D2991E4963A500C2103A /* ATDataModel v1 to v2.xcmappingmodel in Sources */,
Expand All @@ -2390,22 +2308,9 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
01A2D2771E49609100C2103A /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
01A2D2961E4960E100C2103A /* Apptentive+Debugging.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
012285471E4A814300DD2F58 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 01A2CF901E49062700C2103A /* Apptentive */;
targetProxy = 012285461E4A814300DD2F58 /* PBXContainerItemProxy */;
};
01A2CF9D1E49062800C2103A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 01A2CF901E49062700C2103A /* Apptentive */;
Expand Down Expand Up @@ -2477,7 +2382,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14;
CURRENT_PROJECT_VERSION = 15;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -2535,7 +2440,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14;
CURRENT_PROJECT_VERSION = 15;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -2567,7 +2472,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 86WML2UN43;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 14;
DYLIB_CURRENT_VERSION = 15;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "APPTENTIVE_DEBUG=1";
Expand All @@ -2589,7 +2494,7 @@
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 86WML2UN43;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 14;
DYLIB_CURRENT_VERSION = 15;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_PREFIX_HEADER = "Apptentive/Misc/ApptentiveConnect-Prefix.pch";
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
Expand Down Expand Up @@ -2633,44 +2538,7 @@
};
name = Release;
};
01A2D28E1E49609100C2103A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 86WML2UN43;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 14;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = ApptentiveDebugging/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.apptentive.ApptentiveDebugging;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
};
name = Debug;
};
01A2D28F1E49609100C2103A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 86WML2UN43;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 14;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = ApptentiveDebugging/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.apptentive.ApptentiveDebugging;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
};
name = Release;
};

/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -2701,15 +2569,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
01A2D28D1E49609100C2103A /* Build configuration list for PBXNativeTarget "ApptentiveDebugging" */ = {
isa = XCConfigurationList;
buildConfigurations = (
01A2D28E1E49609100C2103A /* Debug */,
01A2D28F1E49609100C2103A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCVersionGroup section */
Expand Down
10 changes: 9 additions & 1 deletion Apptentive/Apptentive/Apptentive.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FOUNDATION_EXPORT double ApptentiveVersionNumber;
FOUNDATION_EXPORT const unsigned char ApptentiveVersionString[];

/** The version number of the Apptentive SDK. */
#define kApptentiveVersionString @"5.1.1"
#define kApptentiveVersionString @"5.1.2"

/** The version number of the Apptentive API platform. */
#define kApptentiveAPIVersionString @"9"
Expand Down Expand Up @@ -782,6 +782,14 @@ typedef NS_ENUM(NSUInteger, ApptentiveLogLevel) {
*/
@property (copy, nonatomic) ApptentiveAuthenticationFailureCallback authenticationFailureCallback;

/**
Updates the login token with the provided one. Used to refresh a token that has expired or may expire soon.
@param token The new authorization token.
@param completion handler indicating success or failure.
*/
- (void)updateToken:(NSString *)token completion:(nullable void(^)(BOOL))completion;

///---------------------------------
/// @name Logging System
///---------------------------------
Expand Down
27 changes: 27 additions & 0 deletions Apptentive/Apptentive/Apptentive.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
NSString *const ApptentiveErrorDomain = @"com.apptentive";

static Apptentive *_sharedInstance;
static Apptentive *_nullInstance;


@implementation ApptentiveConfiguration
Expand Down Expand Up @@ -100,6 +101,12 @@ @implementation Apptentive
+ (instancetype)sharedConnection {
if (_sharedInstance == nil) {
ApptentiveLogWarning(@"Apptentive instance is not initialized. Make sure you've registered it with your app key and signature.");

if (_nullInstance == nil) {
_nullInstance = [Apptentive nullInstance];
}

return _nullInstance;
}
return _sharedInstance;
}
Expand All @@ -108,6 +115,10 @@ + (instancetype)shared {
return [self sharedConnection];
}

+ (instancetype)nullInstance {
return [[Apptentive alloc] init];
}

- (id)initWithConfiguration:(ApptentiveConfiguration *)configuration {
self = [super init];

Expand Down Expand Up @@ -162,6 +173,8 @@ + (void)registerWithConfiguration:(ApptentiveConfiguration *)configuration {
} @catch (NSException *e) {
ApptentiveLogCrit(@"Exception while initializing Apptentive instance (%@).", e);
}

_nullInstance = nil;
}

- (id<ApptentiveStyle>)styleSheet {
Expand Down Expand Up @@ -204,6 +217,10 @@ - (void)setPersonEmailAddress:(nullable NSString *)personEmailAddress {
self.backend.personEmailAddress = personEmailAddress;
}

- (void)setMParticleId:(NSString *)mParticleId {
[self.backend setMParticleId:mParticleId];
}

- (void)sendAttachmentText:(NSString *)text {
[self.operationQueue dispatchAsync:^{
if (self.backend.conversationManager.activeConversation == nil) {
Expand Down Expand Up @@ -944,6 +961,16 @@ - (void)logOut {
}];
}

- (void)updateToken:(NSString *)token completion:(nullable void (^)(BOOL))completion {
[self.operationQueue dispatchAsync:^{
BOOL success = [self.backend.conversationManager updateToken:token];

if (completion != nil) {
completion(success);
}
}];
}

- (ApptentiveAuthenticationFailureCallback)authenticationFailureCallback {
return self.backend.authenticationFailureCallback;
}
Expand Down
Loading

0 comments on commit 992ca13

Please sign in to comment.