diff --git a/samples/Android/ADBMobileSamples/.idea/.name b/samples/Android/ADBMobileSamples/.idea/.name
deleted file mode 100644
index 99134dce..00000000
--- a/samples/Android/ADBMobileSamples/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-ADBMobileSamples
\ No newline at end of file
diff --git a/samples/Android/ADBMobileSamples/.idea/compiler.xml b/samples/Android/ADBMobileSamples/.idea/compiler.xml
deleted file mode 100644
index 9a8b7e5c..00000000
--- a/samples/Android/ADBMobileSamples/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/Android/ADBMobileSamples/.idea/copyright/profiles_settings.xml b/samples/Android/ADBMobileSamples/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf33..00000000
--- a/samples/Android/ADBMobileSamples/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/samples/Android/ADBMobileSamples/.idea/encodings.xml b/samples/Android/ADBMobileSamples/.idea/encodings.xml
deleted file mode 100644
index 97626ba4..00000000
--- a/samples/Android/ADBMobileSamples/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/Android/ADBMobileSamples/.idea/gradle.xml b/samples/Android/ADBMobileSamples/.idea/gradle.xml
deleted file mode 100644
index 508b3d9b..00000000
--- a/samples/Android/ADBMobileSamples/.idea/gradle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/Android/ADBMobileSamples/.idea/misc.xml b/samples/Android/ADBMobileSamples/.idea/misc.xml
deleted file mode 100644
index c45a76f7..00000000
--- a/samples/Android/ADBMobileSamples/.idea/misc.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/Android/ADBMobileSamples/.idea/modules.xml b/samples/Android/ADBMobileSamples/.idea/modules.xml
deleted file mode 100644
index f0b5c680..00000000
--- a/samples/Android/ADBMobileSamples/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/Android/ADBMobileSamples/.idea/runConfigurations.xml b/samples/Android/ADBMobileSamples/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d..00000000
--- a/samples/Android/ADBMobileSamples/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/samples/Android/ADBMobileSamples/app/build.gradle b/samples/Android/ADBMobileSamples/app/build.gradle
index eb318f61..6a6e70ba 100644
--- a/samples/Android/ADBMobileSamples/app/build.gradle
+++ b/samples/Android/ADBMobileSamples/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 23
- buildToolsVersion "23.0.2"
+ buildToolsVersion '25.0.0'
defaultConfig {
applicationId "com.adobe.adbmobilesamples"
diff --git a/samples/Android/ADBMobileSamples/app/libs/adobeMobileLibrary-4.10.0.jar b/samples/Android/ADBMobileSamples/app/libs/adobeMobileLibrary-4.10.0.jar
deleted file mode 100644
index 53ba4436..00000000
Binary files a/samples/Android/ADBMobileSamples/app/libs/adobeMobileLibrary-4.10.0.jar and /dev/null differ
diff --git a/samples/Android/ADBMobileSamples/app/libs/adobeMobileLibrary-4.14.0.jar b/samples/Android/ADBMobileSamples/app/libs/adobeMobileLibrary-4.14.0.jar
new file mode 100644
index 00000000..74bde0ce
Binary files /dev/null and b/samples/Android/ADBMobileSamples/app/libs/adobeMobileLibrary-4.14.0.jar differ
diff --git a/samples/Android/ADBMobileSamples/app/src/main/AndroidManifest.xml b/samples/Android/ADBMobileSamples/app/src/main/AndroidManifest.xml
index bd2d99de..b0a1a2a5 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/AndroidManifest.xml
+++ b/samples/Android/ADBMobileSamples/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
+
@@ -41,23 +42,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/MenuActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/MenuActivity.java
index 2f670077..6e30f2d8 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/MenuActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/MenuActivity.java
@@ -21,7 +21,6 @@
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Bundle;
-import android.util.Log;
import android.view.View;
import android.view.Window;
import android.widget.Toast;
@@ -34,11 +33,11 @@
import com.adobe.adbmobilesamples.messaging.InAppMessagingActivity;
import com.adobe.adbmobilesamples.messaging.RegistrationIntentService;
import com.adobe.adbmobilesamples.postbacks.PostbackActivity;
+import com.adobe.adbmobilesamples.target.TargetPrefetchActivity;
import com.adobe.adbmobilesamples.target.TargetingLocationActivity;
import com.adobe.mobile.*;
import java.io.*;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -183,6 +182,11 @@ public void targetingLocations(View view) {
startActivity(targetingIntent);
}
+ public void targetPrefetch(View view) {
+ Intent prefetchIntent = new Intent(this, TargetPrefetchActivity.class);
+ startActivity(prefetchIntent);
+ }
+
public void lifetimeValue(View view) {
Intent lifetimeValueIntent = new Intent(this, LifetimeValueActivity.class);
startActivity(lifetimeValueIntent);
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/PrivacyActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/PrivacyActivity.java
index ef481e96..3788b627 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/PrivacyActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/PrivacyActivity.java
@@ -26,10 +26,13 @@
public class PrivacyActivity extends Activity {
private MobilePrivacyStatus currentStatus;
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.privacy_example);
+
+ Config.setContext(this.getApplicationContext());
}
@Override
@@ -108,4 +111,4 @@ public void trackActionPrivacy(View view) {
*/
Analytics.trackAction("privacyStatusCheck", null);
}
-}
\ No newline at end of file
+}
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/LifetimeValueActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/LifetimeValueActivity.java
index 25a43608..5b72f2b1 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/LifetimeValueActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/LifetimeValueActivity.java
@@ -32,6 +32,7 @@ public class LifetimeValueActivity extends Activity {
private TextView _lblText;
private LinearLayout _layout;
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -40,6 +41,8 @@ public void onCreate(Bundle savedInstanceState) {
_lblText = (TextView)findViewById(R.id.lblLifetimeValueText);
_layout = (LinearLayout)findViewById(R.id.layoutLifetimeValue);
updateLTVLabel();
+
+ Config.setContext(this.getApplicationContext());
}
@Override
@@ -150,4 +153,4 @@ private void updateLTVLabel() {
*/
ltvLabel.setText(String.format("%.02f", Config.getLifetimeValue()));
}
-}
\ No newline at end of file
+}
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/MediaActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/MediaActivity.java
index f091a5bb..2235c8dd 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/MediaActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/MediaActivity.java
@@ -27,6 +27,7 @@ public class MediaActivity extends Activity {
private ToggleButton _toggleTrackMilestones, _toggleSegmentMilestones, _toggleTrackOffsetMilestones,
_toggleSegmentOffsetMilestones, _toggleTrackEvery30;
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -40,6 +41,8 @@ public void onCreate(Bundle savedInstanceState) {
_toggleTrackMilestones.setChecked(true);
_toggleSegmentMilestones.setChecked(true);
+
+ Config.setContext(this.getApplicationContext());
}
@Override
@@ -146,4 +149,4 @@ else if (_toggleTrackEvery30.isChecked()) {
startActivity(videoPlayerIntent);
}
-}
\ No newline at end of file
+}
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/SimpleTrackingActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/SimpleTrackingActivity.java
index 90b4d888..f7bf2a11 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/SimpleTrackingActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/SimpleTrackingActivity.java
@@ -26,10 +26,13 @@
import java.util.HashMap;
public class SimpleTrackingActivity extends Activity {
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.simple_tracking);
+
+ Config.setContext(this.getApplicationContext());
}
@Override
@@ -105,4 +108,4 @@ public void trackAction(View view) {
*/
Analytics.trackAction("trackAction:data: button pushed", contextData);
}
-}
\ No newline at end of file
+}
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/TimedActionsActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/TimedActionsActivity.java
index 5ac19c1d..1646f497 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/TimedActionsActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/TimedActionsActivity.java
@@ -26,10 +26,13 @@
import java.util.Map;
public class TimedActionsActivity extends Activity {
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.timed_actions);
+
+ Config.setContext(this.getApplicationContext());
}
@Override
@@ -134,4 +137,4 @@ public void run() {
}
});
}
-}
\ No newline at end of file
+}
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/VideoPlayerActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/VideoPlayerActivity.java
index 619c5089..40978e72 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/VideoPlayerActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/VideoPlayerActivity.java
@@ -31,11 +31,14 @@ public class VideoPlayerActivity extends Activity {
private static final String PLAYER_ID = "VideoView1";
private static final double MEDIA_LENGTH = 146;
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.video_player);
+ Config.setContext(this.getApplicationContext());
+
/*
* Adobe Tracking - Media
*
@@ -142,4 +145,4 @@ protected void onResume() {
*/
Config.collectLifecycleData();
}
-}
\ No newline at end of file
+}
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/deeplinks/ParseDeepLinkActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/deeplinks/ParseDeepLinkActivity.java
index 02006d55..6d3ef0e6 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/deeplinks/ParseDeepLinkActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/deeplinks/ParseDeepLinkActivity.java
@@ -39,6 +39,7 @@ public class ParseDeepLinkActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ Config.setContext(this.getApplicationContext());
Config.collectLifecycleData(this);
Intent intent = getIntent();
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/gallery/GalleryActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/gallery/GalleryActivity.java
index 80a8e7ae..d386ea3b 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/gallery/GalleryActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/gallery/GalleryActivity.java
@@ -69,11 +69,14 @@ public boolean onPreDraw() {
}
};
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.gallery);
+ Config.setContext(this.getApplicationContext());
+
_progressBar = (ProgressBar)findViewById(R.id.progressBar);
// get a reference for the potential promo banner
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/messaging/InAppMessagingActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/messaging/InAppMessagingActivity.java
index 44167ee7..881549ba 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/messaging/InAppMessagingActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/messaging/InAppMessagingActivity.java
@@ -32,6 +32,8 @@ public class InAppMessagingActivity extends Activity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.in_app_messages);
+
+ Config.setContext(this.getApplicationContext());
}
@Override
@@ -94,4 +96,4 @@ public void showLocalNotification(View view) {
exampleContextData.put("local", "notification");
Analytics.trackAction("local notification sample", exampleContextData);
}
-}
\ No newline at end of file
+}
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/postbacks/PostbackActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/postbacks/PostbackActivity.java
index 012fdcef..3eccf874 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/postbacks/PostbackActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/postbacks/PostbackActivity.java
@@ -8,24 +8,33 @@
import com.adobe.adbmobilesamples.R;
import com.adobe.mobile.Analytics;
+import com.adobe.mobile.Config;
import java.util.HashMap;
public class PostbackActivity extends Activity {
+
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.postback);
+
+ Config.setContext(this.getApplicationContext());
}
@Override
protected void onPause() {
super.onPause();
+
+ Config.pauseCollectingLifecycleData();
}
@Override
protected void onResume() {
super.onResume();
+
+ Config.collectLifecycleData(this);
}
public void sendPostback(View view) {
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/target/TargetPrefetchActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/target/TargetPrefetchActivity.java
new file mode 100644
index 00000000..cfa8d06d
--- /dev/null
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/target/TargetPrefetchActivity.java
@@ -0,0 +1,157 @@
+package com.adobe.adbmobilesamples.target;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.adobe.adbmobilesamples.R;
+import com.adobe.mobile.Config;
+import com.adobe.mobile.Target;
+import com.adobe.mobile.TargetPrefetchObject;
+import com.adobe.mobile.TargetRequestObject;
+import com.adobe.mobile.Visitor;
+import com.adobe.mobile.VisitorID;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class TargetPrefetchActivity extends Activity {
+ private TextView lblLoadRequestResponse;
+ private TextView lblPrefetchCache;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ setContentView(R.layout.target_prefetch);
+
+ Config.setContext(this.getApplicationContext());
+ Visitor.syncIdentifier("testType", "testID", VisitorID.VisitorIDAuthenticationState.VISITOR_ID_AUTHENTICATION_STATE_LOGGED_OUT);
+
+ lblLoadRequestResponse = (TextView)findViewById(R.id.lblLoadRequestResponse);
+ lblPrefetchCache = (TextView)findViewById(R.id.lblPrefetchCache);
+ }
+
+ public void prefetchTest(View view) {
+ List prefetchList = new ArrayList<>();
+ prefetchList.add(Target.createTargetPrefetchObject("prefetchTest1", new HashMap() {{
+ put("ad", "1");
+ }}));
+ Target.TargetCallback callback = new Target.TargetCallback() {
+ @Override
+ public void call(final Boolean status) {
+ TargetPrefetchActivity.this.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ String cachingStatus = status ? "YES" : "NO";
+ lblPrefetchCache.setText("Content was cached: " + cachingStatus);
+ }
+ });
+ }};
+
+ Target.prefetchContent(prefetchList, new HashMap(), callback);
+ }
+
+ public void prefetchTest2 (View view){
+ List prefetchList = new ArrayList<>();
+ prefetchList.add(Target.createTargetPrefetchObject("prefetchTest2", new HashMap() {{
+ put("ad", "2");
+ }}, new HashMap() {
+ {
+ put("id", "34");
+ put("total", 125.34);
+ put("purchasedProductIds", "34, 125, 99");
+ }}, null));
+
+ Target.TargetCallback callback = new Target.TargetCallback() {
+ @Override
+ public void call(final Boolean status) {
+ TargetPrefetchActivity.this.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ String cachingStatus = status ? "YES" : "NO";
+ lblPrefetchCache.setText("Content was cached: " + cachingStatus);
+ }
+ });
+ }};
+
+ Target.prefetchContent(prefetchList, new HashMap(), callback);
+ }
+
+ public void loadRequest(View view) {
+ EditText etMboxName = (EditText)findViewById(R.id.etMboxName);
+ String mboxName = etMboxName.getText().toString();
+ Target.TargetCallback callback = new Target.TargetCallback() {
+ @Override
+ public void call(final String content) {
+ TargetPrefetchActivity.this.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ lblLoadRequestResponse.setText("Returned content: " + content);
+ }
+ });
+ }};
+
+ if (mboxName != null && !mboxName.isEmpty()) {
+ Target.loadRequest(mboxName, "default content", null, null, null, callback);
+ }
+ }
+
+ public void loadRequest2(View view) {
+ EditText etMboxName = (EditText)findViewById(R.id.etMboxName);
+ String mboxName = etMboxName.getText().toString();
+ Target.TargetCallback callback = new Target.TargetCallback() {
+ @Override
+ public void call(final String content) {
+ TargetPrefetchActivity.this.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ lblLoadRequestResponse.setText("Returned content: " + content);
+ }
+ });
+ }};
+
+ if (mboxName != null && !mboxName.isEmpty()) {
+ Target.loadRequest(mboxName, "default content", null, null, null, callback);
+ }
+ }
+
+ public void loadBatchRequest(View view) {
+
+ ArrayList locationRequests = new ArrayList();
+
+ Target.TargetCallback callback1 = new Target.TargetCallback() {
+ @Override
+ public void call(final String content) {
+ TargetPrefetchActivity.this.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ lblLoadRequestResponse.setText("Returned content: " + content);
+ }
+ });
+ }};
+
+ TargetRequestObject firstRequest = Target.createTargetRequestObject("prefetchTest1", "default1", null, callback1);
+ locationRequests.add(firstRequest);
+
+ Target.TargetCallback callback2 = new Target.TargetCallback() {
+ @Override
+ public void call(final String content) {
+ TargetPrefetchActivity.this.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ lblLoadRequestResponse.setText("Returned content: " + content);
+ }
+ });
+ }};
+
+ TargetRequestObject secondRequest = Target.createTargetRequestObject("prefetchTest2", "default2", null, callback2);
+ locationRequests.add(secondRequest);
+
+ Target.loadRequests(locationRequests, null);
+ }
+}
diff --git a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/target/TargetingLocationActivity.java b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/target/TargetingLocationActivity.java
index ecb3d03f..82c25f2c 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/target/TargetingLocationActivity.java
+++ b/samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/target/TargetingLocationActivity.java
@@ -34,11 +34,14 @@ public class TargetingLocationActivity extends Activity {
private TextView _lblText;
private LinearLayout _layout;
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.targeting_location);
+ Config.setContext(this.getApplicationContext());
+
_lblText = (TextView)findViewById(R.id.lblTargetText);
_layout = (LinearLayout)findViewById(R.id.layoutTarget);
@@ -163,4 +166,4 @@ public void run() {
});
}
-}
\ No newline at end of file
+}
diff --git a/samples/Android/ADBMobileSamples/app/src/main/res/layout/main.xml b/samples/Android/ADBMobileSamples/app/src/main/res/layout/main.xml
index f696e00c..0b696eeb 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/res/layout/main.xml
+++ b/samples/Android/ADBMobileSamples/app/src/main/res/layout/main.xml
@@ -69,13 +69,23 @@
android:layout_marginRight="20dp" android:layout_marginBottom="20dp" android:background="#505050"
android:textColor="@android:color/white" android:minHeight="30dp" android:maxHeight="45dp"
android:enabled="true"/>
-
-
+
+
-
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:text="Postback"
+ android:id="@+id/button8" android:layout_gravity="center"
+ android:onClick="postback" android:layout_marginLeft="20dp"
+ android:layout_marginRight="20dp" android:layout_marginBottom="20dp" android:background="#505050"
+ android:textColor="@android:color/white" android:minHeight="30dp" android:maxHeight="45dp"/>
diff --git a/samples/Android/ADBMobileSamples/app/src/main/res/layout/target_prefetch.xml b/samples/Android/ADBMobileSamples/app/src/main/res/layout/target_prefetch.xml
new file mode 100644
index 00000000..8676dff1
--- /dev/null
+++ b/samples/Android/ADBMobileSamples/app/src/main/res/layout/target_prefetch.xml
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/samples/Android/ADBMobileSamples/app/src/main/res/values/strings.xml b/samples/Android/ADBMobileSamples/app/src/main/res/values/strings.xml
index 90f2f646..f90cb84d 100644
--- a/samples/Android/ADBMobileSamples/app/src/main/res/values/strings.xml
+++ b/samples/Android/ADBMobileSamples/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
When set to Opt In, hits will be sent.\n\nWhen set to Opt Out, hits are discarded.\n\nThe config file is set to track offline, so when set to Opt Unknown, hits will be saved until status goes back to Opt In (saved hits are sent) or Opt Out (saved hits are discarded).
Starting a timed action that is already running will restart that action.\n\nTry backgrounding the app while a timed action is running, then stopping the action after relaunching the app.
Use Adobe Target in conjunction with trackLocation(...) to target your users based on their geographical location.
+ Use Adobe Target prefetchContent(...) in order to retrieve target content for multiple mboxes as a batch
Use Lifetime Value to track the value of a user through the lifetime of use in the app.
Use Adobe Target in conjunction with trackLocation(...) to target your users based on their geographical location.
In-App messages allow you to provide your users with targeted messages or offers. Messages are triggered off of Analytics data. They can be created, updated, and removed remotely via Adobe Mobile Services. Please see the source code for more information.
diff --git a/samples/Android/ADBMobileSamples/build.gradle b/samples/Android/ADBMobileSamples/build.gradle
index e0b366a7..c2eea8e2 100644
--- a/samples/Android/ADBMobileSamples/build.gradle
+++ b/samples/Android/ADBMobileSamples/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.5.0'
+ classpath 'com.android.tools.build:gradle:2.3.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/samples/Android/ADBMobileSamples/gradle/wrapper/gradle-wrapper.properties b/samples/Android/ADBMobileSamples/gradle/wrapper/gradle-wrapper.properties
index f23df6e4..7fe12d90 100644
--- a/samples/Android/ADBMobileSamples/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/Android/ADBMobileSamples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Fri Aug 11 10:27:17 MDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/samples/Android/ADBMobileSamples/settings.gradle b/samples/Android/ADBMobileSamples/settings.gradle
index e7b4def4..9d495b34 100644
--- a/samples/Android/ADBMobileSamples/settings.gradle
+++ b/samples/Android/ADBMobileSamples/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app'
\ No newline at end of file
diff --git a/samples/Android/AndroidWearableSample/.idea/workspace.xml b/samples/Android/AndroidWearableSample/.idea/workspace.xml
new file mode 100644
index 00000000..9e8dd6ed
--- /dev/null
+++ b/samples/Android/AndroidWearableSample/.idea/workspace.xml
@@ -0,0 +1,3298 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Error syncing config
+ Failed to send the Wearable request, containing app should get launched before Wearable app.
+ syncConfigFromHandheld
+ abdmobile
+ statnd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510694253262
+
+
+ 1510694253262
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jar://$PROJECT_DIR$/mobile/libs/adobeMobileLibrary-4.5.0.jar!/com/adobe/mobile/WearableFunction.class
+ 29
+
+
+
+ jar://$PROJECT_DIR$/mobile/libs/adobeMobileLibrary-4.14.0.jar!/com/adobe/mobile/ConfigSynchronizer.class
+ 102
+
+
+
+
+ jar://$PROJECT_DIR$/mobile/libs/adobeMobileLibrary-4.14.0.jar!/com/adobe/mobile/ConfigSynchronizer.class
+ 129
+
+
+
+
+ jar://$PROJECT_DIR$/mobile/libs/adobeMobileLibrary-4.14.0.jar!/com/adobe/mobile/ConfigSynchronizer.class
+ 255
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/samples/Android/AndroidWearableSample/AndroidWearableSample.iml b/samples/Android/AndroidWearableSample/AndroidWearableSample.iml
index 40671c08..a876fa97 100644
--- a/samples/Android/AndroidWearableSample/AndroidWearableSample.iml
+++ b/samples/Android/AndroidWearableSample/AndroidWearableSample.iml
@@ -1,5 +1,5 @@
-
+
@@ -8,12 +8,12 @@
-
+
-
+
\ No newline at end of file
diff --git a/samples/Android/AndroidWearableSample/build.gradle b/samples/Android/AndroidWearableSample/build.gradle
index d3ff69d6..723c3ce7 100644
--- a/samples/Android/AndroidWearableSample/build.gradle
+++ b/samples/Android/AndroidWearableSample/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.1.0'
+ classpath 'com.android.tools.build:gradle:3.0.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -15,5 +15,9 @@ buildscript {
allprojects {
repositories {
jcenter()
+ maven {
+ url "https://maven.google.com"
+ }
}
+
}
diff --git a/samples/Android/AndroidWearableSample/gradle/wrapper/gradle-wrapper.properties b/samples/Android/AndroidWearableSample/gradle/wrapper/gradle-wrapper.properties
index 0c71e760..61f90d27 100644
--- a/samples/Android/AndroidWearableSample/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/Android/AndroidWearableSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Tue Nov 14 14:19:42 MST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/samples/Android/AndroidWearableSample/local.properties b/samples/Android/AndroidWearableSample/local.properties
index 609e8152..9af1d6f9 100644
--- a/samples/Android/AndroidWearableSample/local.properties
+++ b/samples/Android/AndroidWearableSample/local.properties
@@ -1,10 +1,11 @@
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
-# This file should *NOT* be checked into Version Control Systems,
+# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=/Volumes/Data/android-sdk-macosx
\ No newline at end of file
+#Tue Nov 14 14:17:33 MST 2017
+-sdk.dir=/Volumes/Data/android-sdk-macosx
diff --git a/samples/Android/AndroidWearableSample/mobile/build.gradle b/samples/Android/AndroidWearableSample/mobile/build.gradle
index 9af113eb..bd90d4bf 100644
--- a/samples/Android/AndroidWearableSample/mobile/build.gradle
+++ b/samples/Android/AndroidWearableSample/mobile/build.gradle
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 22
- buildToolsVersion "21.1.2"
+ compileSdkVersion 26
+ buildToolsVersion '26.0.2'
defaultConfig {
applicationId "com.adobe.mobile.androidwearablesample"
minSdkVersion 19
- targetSdkVersion 22
+ targetSdkVersion 26
versionCode 1
versionName "1.0"
}
@@ -23,5 +23,5 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
wearApp project(':wear')
compile 'com.android.support:appcompat-v7:22.0.0'
- compile 'com.google.android.gms:play-services:7.0.0'
+ compile 'com.google.android.gms:play-services-wearable:11.6.0'
}
diff --git a/samples/Android/AndroidWearableSample/mobile/libs/adobeMobileLibrary-4.14.0.jar b/samples/Android/AndroidWearableSample/mobile/libs/adobeMobileLibrary-4.14.0.jar
new file mode 100644
index 00000000..7dd25920
Binary files /dev/null and b/samples/Android/AndroidWearableSample/mobile/libs/adobeMobileLibrary-4.14.0.jar differ
diff --git a/samples/Android/AndroidWearableSample/mobile/libs/adobeMobileLibrary-4.5.0.jar b/samples/Android/AndroidWearableSample/mobile/libs/adobeMobileLibrary-4.5.0.jar
deleted file mode 100644
index 79b64f17..00000000
Binary files a/samples/Android/AndroidWearableSample/mobile/libs/adobeMobileLibrary-4.5.0.jar and /dev/null differ
diff --git a/samples/Android/AndroidWearableSample/mobile/mobile.iml b/samples/Android/AndroidWearableSample/mobile/mobile.iml
index 0ef38dcb..aacf89cd 100644
--- a/samples/Android/AndroidWearableSample/mobile/mobile.iml
+++ b/samples/Android/AndroidWearableSample/mobile/mobile.iml
@@ -1,5 +1,5 @@
-
+
@@ -9,13 +9,11 @@
-
-
-
-
-
+
+ generateDebugSources
+
@@ -24,91 +22,115 @@
-
+
-
+
+
-
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/samples/Android/AndroidWearableSample/mobile/src/main/AndroidManifest.xml b/samples/Android/AndroidWearableSample/mobile/src/main/AndroidManifest.xml
index d9a914f9..e340c81e 100644
--- a/samples/Android/AndroidWearableSample/mobile/src/main/AndroidManifest.xml
+++ b/samples/Android/AndroidWearableSample/mobile/src/main/AndroidManifest.xml
@@ -24,7 +24,8 @@
-
+
+
diff --git a/samples/Android/AndroidWearableSample/mobile/src/main/assets/ADBMobileConfig.json b/samples/Android/AndroidWearableSample/mobile/src/main/assets/ADBMobileConfig.json
index 327ae68a..0c650e0f 100644
--- a/samples/Android/AndroidWearableSample/mobile/src/main/assets/ADBMobileConfig.json
+++ b/samples/Android/AndroidWearableSample/mobile/src/main/assets/ADBMobileConfig.json
@@ -1,17 +1,20 @@
{
"version" : "1.0",
- "analytics" : {
- "rsids" : "appleWatchExample",
- "server" : "192.168.1.142:50001",
- "charset" : "UTF-8",
- "ssl" : false,
- "offlineEnabled" : true,
- "lifecycleTimeout" : 300,
- "referrerTimeout" : 0,
- "batchLimit" : 0,
- "privacyDefault" : "optedin",
- "poi" : []
- },
+ "analytics": {
+ "rsids": "rsids",
+ "server": "obumobile4.sc.omtrdc.net",
+ "ssl": false,
+ "offlineEnabled": true,
+ "charset": "UTF-8",
+ "lifecycleTimeout": 300,
+ "privacyDefault": "optedin",
+ "batchLimit": 0,
+ "timezone": "MST",
+ "timezoneOffset": -420,
+ "referrerTimeout": 5,
+ "backdateSessionInfo": false,
+ "poi": []
+ },
"target" : {
"clientCode" : "",
"timeout" : 5
diff --git a/samples/Android/AndroidWearableSample/wear/build.gradle b/samples/Android/AndroidWearableSample/wear/build.gradle
index 0442186c..0a09cb83 100644
--- a/samples/Android/AndroidWearableSample/wear/build.gradle
+++ b/samples/Android/AndroidWearableSample/wear/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
android {
- compileSdkVersion 22
- buildToolsVersion "21.1.2"
+ compileSdkVersion 26
+ buildToolsVersion '26.0.2'
sourceSets {
main {
@@ -14,7 +14,7 @@ android {
defaultConfig {
applicationId "com.adobe.mobile.androidwearablesample"
minSdkVersion 20
- targetSdkVersion 22
+ targetSdkVersion 26
versionCode 1
versionName "1.0"
}
@@ -29,5 +29,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.google.android.support:wearable:1.1.0'
- compile 'com.google.android.gms:play-services-wearable:7.0.0'
+ compile 'com.google.android.gms:play-services-wearable:11.6.0'
}
diff --git a/samples/Android/AndroidWearableSample/wear/libs/adobeMobileLibrary-4.14.0.jar b/samples/Android/AndroidWearableSample/wear/libs/adobeMobileLibrary-4.14.0.jar
new file mode 100644
index 00000000..7dd25920
Binary files /dev/null and b/samples/Android/AndroidWearableSample/wear/libs/adobeMobileLibrary-4.14.0.jar differ
diff --git a/samples/Android/AndroidWearableSample/wear/libs/adobeMobileLibrary-4.5.0.jar b/samples/Android/AndroidWearableSample/wear/libs/adobeMobileLibrary-4.5.0.jar
deleted file mode 100644
index 79b64f17..00000000
Binary files a/samples/Android/AndroidWearableSample/wear/libs/adobeMobileLibrary-4.5.0.jar and /dev/null differ
diff --git a/samples/Android/AndroidWearableSample/wear/src/main/AndroidManifest.xml b/samples/Android/AndroidWearableSample/wear/src/main/AndroidManifest.xml
index deb736b8..3baeb75e 100644
--- a/samples/Android/AndroidWearableSample/wear/src/main/AndroidManifest.xml
+++ b/samples/Android/AndroidWearableSample/wear/src/main/AndroidManifest.xml
@@ -4,6 +4,10 @@
+
+
+
+
-
-
+
+
+
diff --git a/samples/Android/AndroidWearableSample/wear/wear.iml b/samples/Android/AndroidWearableSample/wear/wear.iml
index 6fff1853..ae3bc0fe 100644
--- a/samples/Android/AndroidWearableSample/wear/wear.iml
+++ b/samples/Android/AndroidWearableSample/wear/wear.iml
@@ -1,5 +1,5 @@
-
+
@@ -9,13 +9,11 @@
-
-
-
-
-
+
+ generateDebugSources
+
@@ -24,77 +22,119 @@
-
+
-
+
+
-
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file