Skip to content

Commit

Permalink
Merge pull request #152 from adjust/criteo_deeplink
Browse files Browse the repository at this point in the history
Criteo deeplink
  • Loading branch information
nonelse committed Nov 30, 2015
2 parents ed109c8 + 10165eb commit 7467bfa
Show file tree
Hide file tree
Showing 19 changed files with 582 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Adjust/adjust/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
minSdkVersion 9
targetSdkVersion 21
versionCode 1
versionName "4.1.4"
versionName "4.1.5"
}
}

Expand Down
2 changes: 1 addition & 1 deletion Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public interface Constants {
String BASE_URL = "https://app.adjust.com";
String SCHEME = "https";
String AUTHORITY = "app.adjust.com";
String CLIENT_SDK = "android4.1.4";
String CLIENT_SDK = "android4.1.5";
String LOGTAG = "Adjust";
String REFTAG = "reftag";

Expand Down
2 changes: 1 addition & 1 deletion Adjust/example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ dependencies {
// running mvn package
//compile fileTree(dir: '../target', include: ['*.jar'])
// using maven repository
//compile 'com.adjust.sdk:adjust-android:4.1.4'
//compile 'com.adjust.sdk:adjust-android:4.1.5'
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.adjust.sdk.plugin;

import android.net.Uri;

import com.adjust.sdk.AdjustEvent;
import com.adjust.sdk.AdjustFactory;
import com.adjust.sdk.ILogger;
Expand Down Expand Up @@ -104,11 +106,22 @@ public static void injectPartnerIdIntoCriteoEvents(String partnerId) {
partnerIdInternal = partnerId;
}

public static void injectDeeplinkIntoEvent(AdjustEvent event, Uri url) {
if (url == null) {
return;
}

event.addPartnerParameter("criteo_deeplink", url.toString());

injectOptionalParams(event);
}

private static void injectOptionalParams(AdjustEvent event) {
injectHashEmail(event);
injectSearchDates(event);
injectPartnerId(event);
}

private static void injectHashEmail(AdjustEvent event) {
if (hashEmailInternal == null || hashEmailInternal.isEmpty()) {
return;
Expand All @@ -135,7 +148,6 @@ private static void injectPartnerId(AdjustEvent event) {
event.addPartnerParameter("criteo_partner_id", partnerIdInternal);
}


private static String createCriteoVLFromProducts(List<String> productIds) {
if (productIds == null) {
logger.warn("Criteo View Listing product ids list is null. It will sent as empty.");
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public static void injectProductIntoEvent(AdjustEvent event, String productId, M
return;
}

Map<String, List<Map<String, Object>>> po = new HashMap<>(1);
Map<String, List<Map<String, Object>>> po = new HashMap<String, List<Map<String, Object>>>(1);
List<Map<String, Object>> productList;
Map<String, Object> product;

Expand All @@ -186,8 +186,8 @@ public static void injectCartIntoEvent(AdjustEvent event, List products) {
return;
}

Map<String, List<Map<String, Object>>> po = new HashMap<>(1);
List<Map<String, Object>> productList = new ArrayList<>();
Map<String, List<Map<String, Object>>> po = new HashMap<String, List<Map<String, Object>>>(1);
List<Map<String, Object>> productList = new ArrayList<Map<String, Object>>();

for (Object product: products) {
Map<String, Object> _product = new HashMap<String, Object>();
Expand Down Expand Up @@ -237,9 +237,9 @@ private static void injectTransactionIntoEvent(AdjustEvent event, String transac
return;
}

Map<String, Map<String, Object>> to = new HashMap<>(1);
Map<String, List<Map<String, Object>>> po = new HashMap<>(1);
List<Map<String, Object>> productList = new ArrayList<>();
Map<String, Map<String, Object>> to = new HashMap<String, Map<String, Object>>(1);
Map<String, List<Map<String, Object>>> po = new HashMap<String, List<Map<String, Object>>>(1);
List<Map<String, Object>> productList = new ArrayList<Map<String, Object>>();

for (Object product: products) {
Map<String, Object> _product = new HashMap<String, Object>();
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Adjust/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>adjust-android</artifactId>
<groupId>com.adjust.sdk</groupId>
<version>4.1.4</version>
<version>4.1.5</version>
<packaging>jar</packaging>
<name>Adjust Android SDK</name>
<url>https://github.com/adjust/android_sdk</url>
Expand Down
169 changes: 169 additions & 0 deletions Adjust/pom_criteo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>adjust-android-criteo</artifactId>
<groupId>com.adjust.sdk</groupId>
<version>4.1.5</version>
<packaging>jar</packaging>
<name>Adjust Android SDK</name>
<url>https://github.com/adjust/android_sdk</url>
<description>The Adjust SDK for Android</description>
<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>
<developers>
<developer>
<name>Pedro Silva</name>
<email>[email protected]</email>
<organization>adjust GmbH</organization>
<organizationUrl>http://www.adjust.com</organizationUrl>
</developer>
<developer>
<name>Ugljesa Erceg</name>
<email>[email protected]</email>
<organization>adjust GmbH</organization>
<organizationUrl>http://www.adjust.com</organizationUrl>
</developer>
</developers>
<scm>
<connection>scm:git:[email protected]:adjust/android_sdk.git</connection>
<developerConnection>scm:git:[email protected]:adjust/android_sdk.git</developerConnection>
<url>[email protected]:adjust/android_sdk.git</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<android.version>4.1.1.4</android.version>
<android.version.platform>16</android.version.platform>
</properties>
<dependencies>
<dependency>
<artifactId>android</artifactId>
<version>${android.version}</version>
<groupId>com.google.android</groupId>
<scope>provided</scope>
</dependency>
</dependencies>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<build>
<sourceDirectory>adjust/src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>3.5.3</version>
<extensions>true</extensions>
<configuration>
<sdk>
<platform>${android.version.platform}</platform>
</sdk>
</configuration>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.2</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>plugin/Criteo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit 7467bfa

Please sign in to comment.