Merge pull request #14 from adjust/v4100_copy

Version 4.10.0
adjust · Nov 7, 2016 · cb7b7fc · cb7b7fc
2 parents 4de6cd2 + ebb6436
commit cb7b7fc
Show file tree

Hide file tree

Showing 53 changed files with 4,235 additions and 1,031 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
-$ cat .gitignore
+# OS X
+.DS_Store
+
+# Nuget
 nuget
 *.nupkg
 
@@ -126,4 +129,4 @@ ClientBin/
 *.pfx
 *.publishsettings
 node_modules/
-bower_components/
+bower_components/
diff --git a/Adjust/ADJAdjust2dx.h b/Adjust/ADJAdjust2dx.h
@@ -24,9 +24,18 @@ class ADJAdjust2dx {
     static void trackSubsessionStart();
     static void trackSubsessionEnd();
     static void setEnabled(bool isEnabled);
-    static void appWillOpenUrl(void* url);
+    static void appWillOpenUrl(std::string url);
     static void setDeviceToken(std::string deviceToken);
     static void setOfflineMode(bool isOffline);
+
+    static void sendFirstPackages();
+    static void addSessionCallbackParameter(std::string key, std::string value);
+    static void addSessionPartnerParameter(std::string key, std::string value);
+    static void removeSessionCallbackParameter(std::string key);
+    static void removeSessionPartnerParameter(std::string key);
+    static void resetSessionCallbackParameters();
+    static void resetSessionPartnerParameters();
+
     static bool isEnabled();
     static std::string getIdfa();
 };

diff --git a/Adjust/ADJAdjust2dx.mm b/Adjust/ADJAdjust2dx.mm
@@ -32,8 +32,8 @@
     [Adjust setEnabled:isEnabled];
 }
 
-void ADJAdjust2dx::appWillOpenUrl(void* url) {
-    NSURL *pUrl = (NSURL *)url;
+void ADJAdjust2dx::appWillOpenUrl(std::string url) {
+    NSURL *pUrl = [NSURL URLWithString:[NSString stringWithUTF8String:url.c_str()]];
     [Adjust appWillOpenUrl:pUrl];
 }
 
@@ -47,11 +47,40 @@
     [Adjust setOfflineMode:isOffline];
 }
 
+void ADJAdjust2dx::sendFirstPackages() {
+    [Adjust sendFirstPackages];
+}
+
+void ADJAdjust2dx::addSessionCallbackParameter(std::string key, std::string value) {
+    [Adjust addSessionCallbackParameter:[NSString stringWithUTF8String:key.c_str()] value:[NSString stringWithUTF8String:value.c_str()]];
+}
+
+void ADJAdjust2dx::addSessionPartnerParameter(std::string key, std::string value) {
+    [Adjust addSessionPartnerParameter:[NSString stringWithUTF8String:key.c_str()] value:[NSString stringWithUTF8String:value.c_str()]];
+}
+
+void ADJAdjust2dx::removeSessionCallbackParameter(std::string key) {
+    [Adjust removeSessionCallbackParameter:[NSString stringWithUTF8String:key.c_str()]];
+}
+
+void ADJAdjust2dx::removeSessionPartnerParameter(std::string key) {
+    [Adjust removeSessionPartnerParameter:[NSString stringWithUTF8String:key.c_str()]];
+}
+
+void ADJAdjust2dx::resetSessionCallbackParameters() {
+    [Adjust resetSessionCallbackParameters];
+}
+
+void ADJAdjust2dx::resetSessionPartnerParameters() {
+    [Adjust resetSessionPartnerParameters];
+}
+
+
 bool ADJAdjust2dx::isEnabled() {
     return [Adjust isEnabled];
 }
 
 std::string ADJAdjust2dx::getIdfa() {
     std::string idfa = std::string([[Adjust idfa] UTF8String]);
     return idfa;
-}
+}
diff --git a/Adjust/ADJConfig2dx.h b/Adjust/ADJConfig2dx.h
@@ -10,33 +10,61 @@
 #define _ADJUST_ADJUSTCONFIG2DX_H_
 
 #include <iostream>
+
 #include "AdjustAttribution2dx.h"
+#include "AdjustEventFailure2dx.h"
+#include "AdjustEventSuccess2dx.h"
+#include "AdjustSessionSuccess2dx.h"
+#include "AdjustSessionFailure2dx.h"
 
 enum ADJLogLevel2dx {
-    ADJLogLevel2dxVerbose = 1,
-    ADJLogLevel2dxDebug   = 2,
-    ADJLogLevel2dxInfo    = 3,
-    ADJLogLevel2dxWarn    = 4,
-    ADJLogLevel2dxError   = 5,
-    ADJLogLevel2dxAssert  = 6 };
+    ADJLogLevel2dxVerbose   = 1,
+    ADJLogLevel2dxDebug     = 2,
+    ADJLogLevel2dxInfo      = 3,
+    ADJLogLevel2dxWarn      = 4,
+    ADJLogLevel2dxError     = 5,
+    ADJLogLevel2dxAssert    = 6,
+    ADJLogLevel2dxSuppress  = 7 };
 
 class ADJConfig2dx {
 private:
     void* config;
-    void (*callback)(AdjustAttribution2dx attribution);
-    void initConfig(std::string appToken, std::string environment, std::string sdkPrefix);
+
+    void (*attributionCallback)(AdjustAttribution2dx attribution);
+    void (*eventSuccessCallback)(AdjustEventSuccess2dx eventSuccess);
+    void (*eventFailureCallback)(AdjustEventFailure2dx eventFailure);
+    void (*sessionSuccessCallback)(AdjustSessionSuccess2dx sessionSuccess);
+    void (*sessionFailureCallback)(AdjustSessionFailure2dx sessionFailure);
+    bool (*deferredDeeplinkCallback)(std::string deeplink);
+
+    void initConfig(std::string appToken, std::string environment, bool allowSuppressLogLevel, std::string sdkPrefix);
 
 public:
     ADJConfig2dx() {}
+
     ADJConfig2dx(std::string appToken, std::string environment, std::string sdkPrefix) {
-        initConfig(appToken, environment, sdkPrefix);
+        initConfig(appToken, environment, false, sdkPrefix);
+    }
+
+    ADJConfig2dx(std::string appToken, std::string environment, bool allowSuppressLogLevel, std::string sdkPrefix) {
+        initConfig(appToken, environment, allowSuppressLogLevel, sdkPrefix);
     }
 
+    void setDelayStart(double delayStart);
     void setLogLevel(ADJLogLevel2dx logLevel);
-    void setDefaultTracker(std::string defaultTracker);
+
+    void setSendInBackground(bool isEnabled);
     void setEventBufferingEnabled(bool isEnabled);
 
-    void setAttributionCallback(void (*callbackMethod)(AdjustAttribution2dx attribution));
+    void setUserAgent(std::string userAgent);
+    void setDefaultTracker(std::string defaultTracker);
+
+    void setAttributionCallback(void(*callbackMethod)(AdjustAttribution2dx attribution));
+    void setEventSuccessCallback(void(*callbackMethod)(AdjustEventSuccess2dx eventSuccess));
+    void setEventFailureCallback(void(*callbackMethod)(AdjustEventFailure2dx eventFailure));
+    void setSessionSuccessCallback(void(*callbackMethod)(AdjustSessionSuccess2dx sessionSuccess));
+    void setSessionFailureCallback(void(*callbackMethod)(AdjustSessionFailure2dx sessionFailure));
+    void setDeferredDeeplinkCallback(bool(*callbackMethod)(std::string deeplink));
 
     void* getConfig();
 };