From 578c637071a01c98a936703a066c9c5bac9691f9 Mon Sep 17 00:00:00 2001 From: Pedro Date: Wed, 8 Oct 2014 14:54:34 +0200 Subject: [PATCH 1/5] Passing Context instead of Activity --- Adjust/src/com/adjust/sdk/ActivityHandler.java | 14 +++++++------- Adjust/src/com/adjust/sdk/Adjust.java | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Adjust/src/com/adjust/sdk/ActivityHandler.java b/Adjust/src/com/adjust/sdk/ActivityHandler.java index d5a9f47bc..c454e8d3c 100644 --- a/Adjust/src/com/adjust/sdk/ActivityHandler.java +++ b/Adjust/src/com/adjust/sdk/ActivityHandler.java @@ -75,21 +75,21 @@ public class ActivityHandler extends HandlerThread { private String clientSdk; private Map pluginKeys; - public ActivityHandler(Activity activity) { + public ActivityHandler(Context context) { super(LOGTAG, MIN_PRIORITY); - initActivityHandler(activity); + initActivityHandler(context); Message message = Message.obtain(); message.arg1 = SessionHandler.INIT_BUNDLE; sessionHandler.sendMessage(message); } - public ActivityHandler(Activity activity, String appToken, + public ActivityHandler(Context context, String appToken, String environment, String logLevel, boolean eventBuffering) { super(LOGTAG, MIN_PRIORITY); - initActivityHandler(activity); + initActivityHandler(context); this.environment = environment; this.eventBuffering = eventBuffering; @@ -101,7 +101,7 @@ public ActivityHandler(Activity activity, String appToken, sessionHandler.sendMessage(message); } - private void initActivityHandler(Activity activity) { + private void initActivityHandler(Context context) { setDaemon(true); start(); @@ -109,9 +109,9 @@ private void initActivityHandler(Activity activity) { SESSION_INTERVAL = AdjustFactory.getSessionInterval(); SUBSESSION_INTERVAL = AdjustFactory.getSubsessionInterval(); sessionHandler = new SessionHandler(getLooper(), this); - context = activity.getApplicationContext(); + this.context = context.getApplicationContext(); clientSdk = Constants.CLIENT_SDK; - pluginKeys = Util.getPluginKeys(context); + pluginKeys = Util.getPluginKeys(this.context); enabled = true; logger = AdjustFactory.getLogger(); diff --git a/Adjust/src/com/adjust/sdk/Adjust.java b/Adjust/src/com/adjust/sdk/Adjust.java index 6b886d351..03d769f1d 100644 --- a/Adjust/src/com/adjust/sdk/Adjust.java +++ b/Adjust/src/com/adjust/sdk/Adjust.java @@ -9,12 +9,12 @@ package com.adjust.sdk; -import static com.adjust.sdk.Constants.NO_ACTIVITY_HANDLER_FOUND; +import android.content.Context; +import android.net.Uri; import java.util.Map; -import android.app.Activity; -import android.net.Uri; +import static com.adjust.sdk.Constants.NO_ACTIVITY_HANDLER_FOUND; /** * The main interface to Adjust. @@ -30,11 +30,11 @@ public class Adjust { * This is used to initialize Adjust and keep track of the current session state. * Call this in the onResume method of every activity of your app. * - * @param activity The activity that has just resumed. + * @param context The context of the activity that has just resumed. */ - public static void onResume(Activity activity) { + public static void onResume(Context context) { if (null == activityHandler) { - activityHandler = new ActivityHandler(activity); + activityHandler = new ActivityHandler(context); } logger = AdjustFactory.getLogger(); activityHandler.trackSubsessionStart(); @@ -161,8 +161,8 @@ public static void appWillOpenUrl(Uri url) { // Special appDidLaunch method used by SDK wrappers such as our Adobe Air SDK. - public static void appDidLaunch(Activity activity, String appToken, String environment, String logLevel, boolean eventBuffering) { - activityHandler = new ActivityHandler(activity, appToken, environment, logLevel, eventBuffering); + public static void appDidLaunch(Context context, String appToken, String environment, String logLevel, boolean eventBuffering) { + activityHandler = new ActivityHandler(context, appToken, environment, logLevel, eventBuffering); } // Special method used by SDK wrappers such as our Adobe Air SDK. From 88df38677255f83fc058252ea2b977705676ea71 Mon Sep 17 00:00:00 2001 From: Pedro Date: Wed, 8 Oct 2014 15:24:18 +0200 Subject: [PATCH 2/5] New version 3.6.1 --- Adjust/build.gradle | 2 +- Adjust/pom.xml | 2 +- Adjust/src/com/adjust/sdk/Constants.java | 2 +- .../test/src/com/adjust/sdk/test/TestActivityHandler.java | 2 +- VERSION | 2 +- doc/migrate.md | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Adjust/build.gradle b/Adjust/build.gradle index 33007e769..764ad933e 100644 --- a/Adjust/build.gradle +++ b/Adjust/build.gradle @@ -24,7 +24,7 @@ android { compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) defaultConfig { versionCode 11 - versionName '3.6.0' + versionName '3.6.1' minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) } diff --git a/Adjust/pom.xml b/Adjust/pom.xml index 33dbe22af..ae8932dc8 100644 --- a/Adjust/pom.xml +++ b/Adjust/pom.xml @@ -5,7 +5,7 @@ 4.0.0 adjust-android com.adjust.sdk - 3.6.0 + 3.6.1 jar Adjust Android SDK https://github.com/adjust/android_sdk diff --git a/Adjust/src/com/adjust/sdk/Constants.java b/Adjust/src/com/adjust/sdk/Constants.java index 2abd12574..26a1302b4 100644 --- a/Adjust/src/com/adjust/sdk/Constants.java +++ b/Adjust/src/com/adjust/sdk/Constants.java @@ -23,7 +23,7 @@ public interface Constants { int THIRTY_MINUTES = 30 * ONE_MINUTE; String BASE_URL = "https://app.adjust.io"; - String CLIENT_SDK = "android3.6.0"; + String CLIENT_SDK = "android3.6.1"; String LOGTAG = "Adjust"; String SESSION_STATE_FILENAME = "AdjustIoActivityState"; diff --git a/Adjust/test/src/com/adjust/sdk/test/TestActivityHandler.java b/Adjust/test/src/com/adjust/sdk/test/TestActivityHandler.java index 64cad9831..81136d2ba 100644 --- a/Adjust/test/src/com/adjust/sdk/test/TestActivityHandler.java +++ b/Adjust/test/src/com/adjust/sdk/test/TestActivityHandler.java @@ -93,7 +93,7 @@ public void testFirstSession() { // check the Sdk version is being tested assertEquals(activityPackage.getExtendedString(), - "android3.6.0", activityPackage.getClientSdk()); + "android3.6.1", activityPackage.getClientSdk()); // check the server url assertEquals(Constants.BASE_URL, "https://app.adjust.io"); diff --git a/VERSION b/VERSION index 40c341bdc..9575d51ba 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.6.0 +3.6.1 diff --git a/doc/migrate.md b/doc/migrate.md index 2484d543a..3404d4583 100644 --- a/doc/migrate.md +++ b/doc/migrate.md @@ -1,4 +1,4 @@ -## Migrate your adjust SDK for Android to 3.6.0 from v2.1.x +## Migrate your adjust SDK for Android to 3.6.1 from v2.1.x We renamed the main class `com.adeven.adjustio.AdjustIo` to `com.adjust.sdk.Adjust`. Follow these steps to update all adjust SDK calls. @@ -24,7 +24,7 @@ We renamed the main class `com.adeven.adjustio.AdjustIo` to 4. In the same fashion, replace `adeven.adjustio` with `adjust.sdk` in all manifest files to update the package name of the `ReferrerReceiver`. -5. Download version v3.6.0 and create a new Android project from the `Adjust` folder. +5. Download version v3.6.1 and create a new Android project from the `Adjust` folder. ![][import] @@ -36,7 +36,7 @@ We renamed the main class `com.adeven.adjustio.AdjustIo` to 8. Build your project to confirm that everything is properly connected again. -The adjust SDK v3.6.0 added delegate notifications. Check out the [README] for +The adjust SDK v3.6.1 added delegate notifications. Check out the [README] for details. From 96eaea9be79708206f938d1457731cbf9798ebe7 Mon Sep 17 00:00:00 2001 From: Pedro Date: Mon, 28 Jul 2014 16:04:13 +0200 Subject: [PATCH 3/5] Changed default value tracking_enabled --- Adjust/src/com/adjust/sdk/Reflection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Adjust/src/com/adjust/sdk/Reflection.java b/Adjust/src/com/adjust/sdk/Reflection.java index 6cb2c20c1..8fafe93bc 100644 --- a/Adjust/src/com/adjust/sdk/Reflection.java +++ b/Adjust/src/com/adjust/sdk/Reflection.java @@ -21,7 +21,7 @@ public static String getPlayAdId(Context context) { } } - public static boolean isPlayTrackingEnabled(Context context) { + public static Boolean isPlayTrackingEnabled(Context context) { try { Object AdvertisingInfoObject = getAdvertisingInfoObject(context); @@ -30,7 +30,7 @@ public static boolean isPlayTrackingEnabled(Context context) { return !isLimitedTrackingEnabled; } catch (Throwable t) { - return false; + return null; } } From afcc1bf1359ef36f056d61d0e6a47856c02116a9 Mon Sep 17 00:00:00 2001 From: Pedro Date: Tue, 5 Aug 2014 16:26:40 +0200 Subject: [PATCH 4/5] Updated pom.xml for maven --- Adjust/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/Adjust/pom.xml b/Adjust/pom.xml index ae8932dc8..fc0c755c3 100644 --- a/Adjust/pom.xml +++ b/Adjust/pom.xml @@ -42,6 +42,16 @@ provided + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + src @@ -57,12 +67,12 @@ org.apache.maven.plugins maven-source-plugin - 2.2 + 2.2.1 attach-sources - jar + jar-no-fork @@ -70,10 +80,10 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9 + 2.9.1 - attach-javadoc + attach-javadocs jar @@ -91,6 +101,44 @@ + + maven-deploy-plugin + 2.8.1 + + + default-deploy + deploy + + deploy + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.2 + true + + ossrh + https://oss.sonatype.org/ + false + + From 79916085c6aa8c33454befa55624a06e8faa60c8 Mon Sep 17 00:00:00 2001 From: Pedro Date: Wed, 8 Oct 2014 16:10:54 +0200 Subject: [PATCH 5/5] Replace static logger with factory --- Adjust/src/com/adjust/sdk/Adjust.java | 29 ++++++++++----------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/Adjust/src/com/adjust/sdk/Adjust.java b/Adjust/src/com/adjust/sdk/Adjust.java index 03d769f1d..b306dfb66 100644 --- a/Adjust/src/com/adjust/sdk/Adjust.java +++ b/Adjust/src/com/adjust/sdk/Adjust.java @@ -36,7 +36,6 @@ public static void onResume(Context context) { if (null == activityHandler) { activityHandler = new ActivityHandler(context); } - logger = AdjustFactory.getLogger(); activityHandler.trackSubsessionStart(); } @@ -48,11 +47,10 @@ public static void onResume(Context context) { */ public static void onPause() { try { - logger.debug("onPause"); + getLogger().debug("onPause"); activityHandler.trackSubsessionEnd(); } catch (NullPointerException e) { - if(logger != null) - logger.error(NO_ACTIVITY_HANDLER_FOUND); + getLogger().error(NO_ACTIVITY_HANDLER_FOUND); } } @@ -60,8 +58,7 @@ public static void setOnFinishedListener(OnFinishedListener listener) { try { activityHandler.setOnFinishedListener(listener); } catch (NullPointerException e) { - if(logger != null) - logger.error(NO_ACTIVITY_HANDLER_FOUND); + getLogger().error(NO_ACTIVITY_HANDLER_FOUND); } } @@ -86,8 +83,7 @@ public static void trackEvent(String eventToken, Map parameters) try { activityHandler.trackEvent(eventToken, parameters); } catch (NullPointerException e) { - if(logger != null) - logger.error(NO_ACTIVITY_HANDLER_FOUND); + getLogger().error(NO_ACTIVITY_HANDLER_FOUND); } } @@ -117,8 +113,7 @@ public static void trackRevenue(double amountInCents, String eventToken, Map