Skip to content

Commit

Permalink
Merge pull request #230 from adjust/v490
Browse files Browse the repository at this point in the history
V490
  • Loading branch information
uerceg authored Sep 7, 2016
2 parents 06f5874 + 51e2f49 commit 8f4809a
Show file tree
Hide file tree
Showing 163 changed files with 9,641 additions and 3,322 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ Pods

# Adjust
Frameworks

# Code style
uncrustify.cfg
4 changes: 2 additions & 2 deletions Adjust.podspec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Pod::Spec.new do |s|
s.name = "Adjust"
s.version = "4.8.5"
s.version = "4.9.0"
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
s.homepage = "http://adjust.com"
s.license = { :type => 'MIT', :file => 'MIT-LICENSE' }
s.author = { "Christian Wellenbrock" => "welle@adjust.com" }
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.8.5" }
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.9.0" }
s.ios.deployment_target = '6.0'
s.tvos.deployment_target = '9.0'
s.framework = 'SystemConfiguration'
Expand Down
1,230 changes: 770 additions & 460 deletions Adjust.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
43 changes: 37 additions & 6 deletions Adjust/ADJActivityHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
@property (nonatomic, assign) BOOL enabled;
@property (nonatomic, assign) BOOL offline;
@property (nonatomic, assign) BOOL background;

@property (nonatomic, assign) BOOL delayStart;
@property (nonatomic, assign) BOOL updatePackages;
- (id)init;

- (BOOL)isEnabled;
Expand All @@ -23,12 +24,16 @@
- (BOOL)isOnline;
- (BOOL)isBackground;
- (BOOL)isForeground;
- (BOOL)isDelayStart;
- (BOOL)isToStartNow;
- (BOOL)isToUpdatePackages;

@end

@protocol ADJActivityHandler <NSObject>

- (id)initWithConfig:(ADJConfig *)adjustConfig;
- (id)initWithConfig:(ADJConfig *)adjustConfig
sessionParametersActionsArray:(NSArray*)sessionParametersActionsArray;

- (void)applicationDidBecomeActive;
- (void)applicationWillResignActive;
Expand All @@ -48,20 +53,46 @@
- (void)setAttribution:(ADJAttribution*)attribution;
- (void)setAskingAttribution:(BOOL)askingAttribution;

- (BOOL)updateAttribution:(ADJAttribution *)attribution;
- (BOOL)updateAttributionI:(id<ADJActivityHandler>)selfI attribution:(ADJAttribution *)attribution;
- (void)setIadDate:(NSDate*)iAdImpressionDate withPurchaseDate:(NSDate*)appPurchaseDate;
- (void)setIadDetails:(NSDictionary *)attributionDetails
error:(NSError *)error
retriesLeft:(int)retriesLeft;

- (void) setOfflineMode:(BOOL)offline;
- (void)setOfflineMode:(BOOL)offline;
- (ADJInternalState*) internalState;

- (void)sendFirstPackages;

- (void)addSessionCallbackParameter:(NSString *)key
value:(NSString *)value;
- (void)addSessionPartnerParameter:(NSString *)key
value:(NSString *)value;
- (void)removeSessionCallbackParameter:(NSString *)key;
- (void)removeSessionPartnerParameter:(NSString *)key;
- (void)resetSessionCallbackParameters;
- (void)resetSessionPartnerParameters;

- (void)teardown:(BOOL)deleteState;
@end

@interface ADJActivityHandler : NSObject <ADJActivityHandler>

+ (id<ADJActivityHandler>)handlerWithConfig:(ADJConfig *)adjustConfig;
+ (id<ADJActivityHandler>)handlerWithConfig:(ADJConfig *)adjustConfig
sessionParametersActionsArray:(NSArray*)sessionParametersActionsArray;
- (ADJAttribution*) attribution;

- (void)addSessionCallbackParameterI:(ADJActivityHandler *)selfI
key:(NSString *)key
value:(NSString *)value;

- (void)addSessionPartnerParameterI:(ADJActivityHandler *)selfI
key:(NSString *)key
value:(NSString *)value;
- (void)removeSessionCallbackParameterI:(ADJActivityHandler *)selfI
key:(NSString *)key;
- (void)removeSessionPartnerParameterI:(ADJActivityHandler *)selfI
key:(NSString *)key;
- (void)resetSessionCallbackParametersI:(ADJActivityHandler *)selfI;
- (void)resetSessionPartnerParametersI:(ADJActivityHandler *)selfI;

@end
Loading

0 comments on commit 8f4809a

Please sign in to comment.