From 3e3598357119408763729058dafb36e6950fcc88 Mon Sep 17 00:00:00 2001 From: Pedro Date: Fri, 16 Oct 2015 13:58:32 +0200 Subject: [PATCH 0001/2131] Catch exceptions from reading files --- .../main/java/com/adjust/sdk/ActivityHandler.java | 14 ++++++++++++-- .../main/java/com/adjust/sdk/PackageHandler.java | 7 ++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java index 4f4d8370f..9a97aa80d 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java @@ -779,11 +779,21 @@ private void timerFiredInternal() { } private void readActivityState() { - activityState = Util.readObject(adjustConfig.context, ACTIVITY_STATE_FILENAME, ACTIVITY_STATE_NAME); + try { + activityState = Util.readObject(adjustConfig.context, ACTIVITY_STATE_FILENAME, ACTIVITY_STATE_NAME); + } catch (Exception e) { + logger.error("Failed to read %s file (%s)", ACTIVITY_STATE_NAME, e.getMessage()); + activityState = null; + } } private void readAttribution() { - attribution = Util.readObject(adjustConfig.context, ATTRIBUTION_FILENAME, ATTRIBUTION_NAME); + try { + attribution = Util.readObject(adjustConfig.context, ATTRIBUTION_FILENAME, ATTRIBUTION_NAME); + } catch (Exception e) { + logger.error("Failed to read %s file (%s)", ATTRIBUTION_NAME, e.getMessage()); + attribution = null; + } } private synchronized void writeActivityState() { diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/PackageHandler.java b/Adjust/adjust/src/main/java/com/adjust/sdk/PackageHandler.java index 80d079917..62be9b321 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/PackageHandler.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/PackageHandler.java @@ -196,7 +196,12 @@ private void sendNextInternal() { } private void readPackageQueue() { - packageQueue = Util.readObject(context, PACKAGE_QUEUE_FILENAME, PACKAGE_QUEUE_NAME); + try { + packageQueue = Util.readObject(context, PACKAGE_QUEUE_FILENAME, PACKAGE_QUEUE_NAME); + } catch (Exception e) { + logger.error("Failed to read %s file (%s)", PACKAGE_QUEUE_NAME, e.getMessage()); + packageQueue = null; + } if (packageQueue != null) { logger.debug("Package handler read %d packages", packageQueue.size()); From d726ad210173c52e65dcf69b9541300938609844 Mon Sep 17 00:00:00 2001 From: Pedro Date: Fri, 16 Oct 2015 14:02:54 +0200 Subject: [PATCH 0002/2131] New version v4.1.3 --- Adjust/adjust/build.gradle | 2 +- Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java | 2 +- Adjust/example/build.gradle | 2 +- Adjust/pom.xml | 2 +- .../java/com/adjust/sdk/test/TestActivityPackage.java | 2 +- README.md | 2 +- VERSION | 2 +- doc/migrate.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Adjust/adjust/build.gradle b/Adjust/adjust/build.gradle index e143917c4..1a15a95b8 100644 --- a/Adjust/adjust/build.gradle +++ b/Adjust/adjust/build.gradle @@ -8,7 +8,7 @@ android { minSdkVersion 9 targetSdkVersion 21 versionCode 1 - versionName "4.1.2" + versionName "4.1.3" } } diff --git a/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java b/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java index ac61b9c49..0a50651f6 100644 --- a/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java +++ b/Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java @@ -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.2"; + String CLIENT_SDK = "android4.1.3"; String LOGTAG = "Adjust"; String REFTAG = "reftag"; diff --git a/Adjust/example/build.gradle b/Adjust/example/build.gradle index 3c1c6e652..82360f0e1 100644 --- a/Adjust/example/build.gradle +++ b/Adjust/example/build.gradle @@ -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.2' + //compile 'com.adjust.sdk:adjust-android:4.1.3' } diff --git a/Adjust/pom.xml b/Adjust/pom.xml index 187653576..ff7b34923 100644 --- a/Adjust/pom.xml +++ b/Adjust/pom.xml @@ -5,7 +5,7 @@ 4.0.0 adjust-android com.adjust.sdk - 4.1.2 + 4.1.3 jar Adjust Android SDK https://github.com/adjust/android_sdk diff --git a/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestActivityPackage.java b/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestActivityPackage.java index e5e0ad758..0459679bb 100644 --- a/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestActivityPackage.java +++ b/Adjust/test/src/androidTest/java/com/adjust/sdk/test/TestActivityPackage.java @@ -49,7 +49,7 @@ public TestActivityPackage(ActivityPackage activityPackage) { // default values appToken = "123456789012"; environment = "sandbox"; - clientSdk = "android4.1.2"; + clientSdk = "android4.1.3"; suffix = ""; attribution = new AdjustAttribution(); } diff --git a/README.md b/README.md index 2eb6c7471..9278136f3 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ compile project(":adjust") If you are using Maven, add this line instead: ``` -compile 'com.adjust.sdk:adjust-android:4.1.2' +compile 'com.adjust.sdk:adjust-android:4.1.3' ``` ### 4. Add Google Play Services diff --git a/VERSION b/VERSION index 4d0dcda01..de197cc33 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.2 +4.1.3 diff --git a/doc/migrate.md b/doc/migrate.md index 75648f26c..7fffd42a4 100644 --- a/doc/migrate.md +++ b/doc/migrate.md @@ -1,4 +1,4 @@ -## Migrate your adjust SDK for Android to 4.1.2 from 3.6.2 +## Migrate your adjust SDK for Android to 4.1.3 from 3.6.2 ### The Application class From 61276762d89e2b85c99d4123ecf9ebc9078fc370 Mon Sep 17 00:00:00 2001 From: uerceg Date: Wed, 21 Oct 2015 14:34:13 +0200 Subject: [PATCH 0003/2131] Example app update --- Adjust/example/src/main/AndroidManifest.xml | 11 +- .../com/adjust/example/GlobalApplication.java | 4 +- .../java/com/adjust/example/MainActivity.java | 66 ++++++++-- .../src/main/res/layout/activity_main.xml | 118 ++++++++++++------ .../example/src/main/res/values/strings.xml | 15 ++- 5 files changed, 160 insertions(+), 54 deletions(-) diff --git a/Adjust/example/src/main/AndroidManifest.xml b/Adjust/example/src/main/AndroidManifest.xml index c85a77e26..3d6a3faa8 100644 --- a/Adjust/example/src/main/AndroidManifest.xml +++ b/Adjust/example/src/main/AndroidManifest.xml @@ -6,11 +6,12 @@ + android:theme="@style/AppTheme"> + @@ -18,13 +19,17 @@ + + android:configChanges="orientation|keyboardHidden" + android:label="@string/app_name" + android:screenOrientation="portrait"> + diff --git a/Adjust/example/src/main/java/com/adjust/example/GlobalApplication.java b/Adjust/example/src/main/java/com/adjust/example/GlobalApplication.java index 5d4c08a07..9da4623ba 100644 --- a/Adjust/example/src/main/java/com/adjust/example/GlobalApplication.java +++ b/Adjust/example/src/main/java/com/adjust/example/GlobalApplication.java @@ -17,7 +17,7 @@ public class GlobalApplication extends Application { public void onCreate() { super.onCreate(); // configure Adjust - String appToken = "{yourAppToken}"; + String appToken = "{YourAppToken}"; String environment = AdjustConfig.ENVIRONMENT_SANDBOX; AdjustConfig config = new AdjustConfig(this, appToken, environment); @@ -94,6 +94,4 @@ public void onActivityStarted(Activity activity) { } } */ - - } diff --git a/Adjust/example/src/main/java/com/adjust/example/MainActivity.java b/Adjust/example/src/main/java/com/adjust/example/MainActivity.java index 02c32c2e8..144f1bed5 100644 --- a/Adjust/example/src/main/java/com/adjust/example/MainActivity.java +++ b/Adjust/example/src/main/java/com/adjust/example/MainActivity.java @@ -7,11 +7,17 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.widget.Button; +import android.widget.Toast; import com.adjust.sdk.Adjust; import com.adjust.sdk.AdjustEvent; public class MainActivity extends ActionBarActivity { + private static final String EVENT_TOKEN_SIMPLE = "{YourEventToken}"; + private static final String EVENT_TOKEN_REVENUE = "{YourEventToken}"; + private static final String EVENT_TOKEN_CALLBACK = "{YourEventToken}"; + private static final String EVENT_TOKEN_PARTNER = "{YourEventToken}"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -21,8 +27,16 @@ protected void onCreate(Bundle savedInstanceState) { Intent intent = getIntent(); Uri data = intent.getData(); Adjust.appWillOpenUrl(data); - } + // Adjust UI according to SDK state. + Button btnEnableDisableSDK = (Button)findViewById(R.id.btnEnableDisableSDK); + + if (Adjust.isEnabled()) { + btnEnableDisableSDK.setText(R.string.txt_disable_sdk); + } else { + btnEnableDisableSDK.setText(R.string.txt_enable_sdk); + } + } @Override public boolean onCreateOptionsMenu(Menu menu) { @@ -38,7 +52,6 @@ public boolean onOptionsItemSelected(MenuItem item) { // as you specify a parent activity in AndroidManifest.xml. int id = item.getItemId(); - //noinspection SimplifiableIfStatement if (id == R.id.action_settings) { return true; } @@ -59,35 +72,66 @@ public void onPause() { } public void onTrackSimpleEventClick(View v) { - AdjustEvent event = new AdjustEvent("{eventToken}"); + AdjustEvent event = new AdjustEvent(EVENT_TOKEN_SIMPLE); Adjust.trackEvent(event); } public void onTrackRevenueEventClick(View v) { - AdjustEvent event = new AdjustEvent("{eventToken}"); + AdjustEvent event = new AdjustEvent(EVENT_TOKEN_REVENUE); - // add revenue 1 cent of an euro + // Add revenue 1 cent of an euro. event.setRevenue(0.01, "EUR"); Adjust.trackEvent(event); } - public void onTrackEventWithCallbackClick(View v) { - AdjustEvent event = new AdjustEvent("{eventToken}"); + public void onTrackCallbackEventClick(View v) { + AdjustEvent event = new AdjustEvent(EVENT_TOKEN_CALLBACK); - // add callback parameters to this parameter + // Add callback parameters to this parameter. event.addCallbackParameter("key", "value"); Adjust.trackEvent(event); } - public void onTrackEventWithPartnerClick(View v) { - AdjustEvent event = new AdjustEvent("{eventToken}"); + public void onTrackPartnerEventClick(View v) { + AdjustEvent event = new AdjustEvent(EVENT_TOKEN_PARTNER); - // add partner parameters to this parameter + // Add partner parameters to this parameter. event.addPartnerParameter("foo", "bar"); Adjust.trackEvent(event); } + + public void onEnableDisableOfflineModeClick(View v) { + if (((Button)v).getText().equals( + getApplicationContext().getResources().getString(R.string.txt_enable_offline_mode))) { + Adjust.setOfflineMode(true); + ((Button)v).setText(R.string.txt_disable_offline_mode); + } else { + Adjust.setOfflineMode(false); + ((Button)v).setText(R.string.txt_enable_offline_mode); + } + } + + public void onEnableDisableSDKClick(View v) { + if (Adjust.isEnabled()) { + Adjust.setEnabled(false); + ((Button)v).setText(R.string.txt_enable_sdk); + } else { + Adjust.setEnabled(true); + ((Button)v).setText(R.string.txt_disable_sdk); + } + } + + public void onIsSDKEnabledClick(View v) { + if (Adjust.isEnabled()) { + Toast.makeText(getApplicationContext(), R.string.txt_sdk_is_enabled, + Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(getApplicationContext(), R.string.txt_sdk_is_disabled, + Toast.LENGTH_SHORT).show(); + } + } } diff --git a/Adjust/example/src/main/res/layout/activity_main.xml b/Adjust/example/src/main/res/layout/activity_main.xml index ecab379a0..5801cda53 100644 --- a/Adjust/example/src/main/res/layout/activity_main.xml +++ b/Adjust/example/src/main/res/layout/activity_main.xml @@ -1,57 +1,103 @@ - - + android:layout_gravity="center_horizontal" + android:layout_marginBottom="5dp" + android:layout_marginLeft="30dp" + android:layout_marginRight="30dp" + android:layout_marginTop="5dp" + android:layout_weight="0.143" + android:onClick="onTrackSimpleEventClick" + android:text="@string/btn_simple_event" />