Release version 0.4.0

.gitignore

@@ -1,9 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
-/.idea/misc.xml
+.idea
 .DS_Store
 /build
 /captures

CHANGELOG.md

@@ -1,4 +1,16 @@
 # Optimizely Android X SDK Changelog
+### 0.4.0
+December 15, 2016
+
+*New Features*
+
+- Add support for IP anonymization
+
+*Breaking Changes*
+
+- Rename `AndroidUserExperimentRecord` to `AndroidUserProfile`
+- Change position of `activateExperiment` parameter in live variable getters
+
 ### 0.3.0
 December 8, 2016
 

README.md

@@ -36,7 +36,7 @@ config common for all modules.
   - Uses a Service so events can be sent without the app being reopened
   - Persists events in a SQLite3 database
   - Required to be implemented by the Optimizely Java core
-3. User Experiment Record
+3. User Profile
   - Optional implementation for Optimizely Java core
   - Makes bucketing persistent
     - Once a user is bucketed in an variation they will remain in that variation
@@ -68,7 +68,7 @@ config common for all modules.
 7.  Discover more gradle tasks
   * `./gradlew tasks`
   * To see the task of an individual module
-    * `./gradlew user-experiment-record:tasks`
+    * `./gradlew user-profile:tasks`
 
 ### Android Studio
 

android-sdk/build.gradle

@@ -54,7 +54,7 @@ android {
 
 dependencies {
     compile project(':event-handler')
-    compile project(':user-experiment-record')
+    compile project(':user-profile')
     provided "com.android.support:support-annotations:$support_annotations_ver"
 
     testCompile "junit:junit:$junit_ver"
@@ -75,7 +75,7 @@ dependencies {
 
 uploadArchives {
     dependsOn = [':android-sdk:clean', ':android-sdk:releaseJavadocJar', ':android-sdk:releaseSourcesJar']
-    shouldRunAfter = [':event-handler:uploadArchives', ':user-experiment-record:uploadArchives']
+    shouldRunAfter = [':event-handler:uploadArchives', ':user-profile:uploadArchives']
     repositories {
         mavenDeployer {
             repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android") {

android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/DataFileClientTest.java

@@ -62,7 +62,7 @@ public void setup() {
 
     @Test
     public void request200() throws IOException {
-        URL url = new URL(String.format(DataFileLoader.FORMAT_CDN_URL, "1"));
+        URL url = new URL(DataFileService.getDatafileUrl("1"));
         when(client.openConnection(url)).thenReturn(urlConnection);
         when(urlConnection.getResponseCode()).thenReturn(200);
         when(client.readStream(urlConnection)).thenReturn("{}");
@@ -87,7 +87,7 @@ public void request200() throws IOException {
 
     @Test
     public void request201() throws IOException {
-        URL url = new URL(String.format(DataFileLoader.FORMAT_CDN_URL, "1"));
+        URL url = new URL(DataFileService.getDatafileUrl("1"));
         when(client.openConnection(url)).thenReturn(urlConnection);
         when(urlConnection.getResponseCode()).thenReturn(201);
         when(client.readStream(urlConnection)).thenReturn("{}");
@@ -112,7 +112,7 @@ public void request201() throws IOException {
 
     @Test
     public void request299() throws IOException {
-        URL url = new URL(String.format(DataFileLoader.FORMAT_CDN_URL, "1"));
+        URL url = new URL(DataFileService.getDatafileUrl("1"));
         when(client.openConnection(url)).thenReturn(urlConnection);
         when(urlConnection.getResponseCode()).thenReturn(299);
         when(client.readStream(urlConnection)).thenReturn("{}");
@@ -137,7 +137,7 @@ public void request299() throws IOException {
 
     @Test
     public void request300() throws IOException {
-        URL url = new URL(String.format(DataFileLoader.FORMAT_CDN_URL, "1"));
+        URL url = new URL(DataFileService.getDatafileUrl("1"));
         when(client.openConnection(url)).thenReturn(urlConnection);
         when(urlConnection.getResponseCode()).thenReturn(300);
 
@@ -157,7 +157,7 @@ public void request300() throws IOException {
 
     @Test
     public void handlesIOException() throws IOException {
-        URL url = new URL(String.format(DataFileLoader.FORMAT_CDN_URL, "1"));
+        URL url = new URL(DataFileService.getDatafileUrl("1"));
         when(client.openConnection(url)).thenReturn(urlConnection);
         when(urlConnection.getResponseCode()).thenReturn(200);
         doThrow(new IOException()).when(client).readStream(urlConnection);
@@ -179,14 +179,14 @@ public void handlesIOException() throws IOException {
 
     @Test
     public void handlesNullResponse() throws MalformedURLException {
-        URL url = new URL(String.format(DataFileLoader.FORMAT_CDN_URL, "1"));
+        URL url = new URL(DataFileService.getDatafileUrl("1"));
         when(client.execute(any(Client.Request.class), eq(2), eq(3))).thenReturn(null);
         assertNull(dataFileClient.request(url.toString()));
     }
 
     @Test
     public void handlesEmptyStringResponse() throws MalformedURLException {
-        URL url = new URL(String.format(DataFileLoader.FORMAT_CDN_URL, "1"));
+        URL url = new URL(DataFileService.getDatafileUrl("1"));
         when(client.execute(any(Client.Request.class), eq(2), eq(3))).thenReturn("");
         assertEquals("", dataFileClient.request(url.toString()));
     }

android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/DatafileServiceTest.java

@@ -34,6 +34,7 @@
 
 import java.util.concurrent.TimeoutException;
 
+import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -112,4 +113,14 @@ public void testNoProjectIdIntentStart() throws TimeoutException {
         dataFileService.onStartCommand(intent, 0, 0);
         verify(logger).warn("Data file service received an intent with no project id extra");
     }
+
+    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    @Test
+    public void testGetDatafileUrl(){
+        // HARD-CODING link here to make sure we don't unintentionally mess up the datafile version
+        // and url by accidentally changing those constants. Bumping datafile versions will force
+        // us to update this test.
+        String datafileUrl = DataFileService.getDatafileUrl("1");
+        assertEquals("https://cdn.optimizely.com/public/1/datafile_v3.json", datafileUrl);
+    }
 }