Set client engine to Android TV if SDK is used on AndroidTV (#93)

Author: onufryk

CHANGELOG.md

@@ -1,4 +1,11 @@
 # Optimizely Android X SDK Changelog
+### 1.1.0
+February 17, 2017
+
+- Support Android TV SDK client engine
+- Update to java-core 1.5.0 (https://github.com/optimizely/java-sdk/blob/master/CHANGELOG.md#150)
+
+
 ### 1.0.0
 January 23, 2017
 

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

@@ -0,0 +1,56 @@
+/****************************************************************************
+ * Copyright 2017, Optimizely, Inc. and contributors                        *
+ *                                                                          *
+ * Licensed under the Apache License, Version 2.0 (the "License");          *
+ * you may not use this file except in compliance with the License.         *
+ * You may obtain a copy of the License at                                  *
+ *                                                                          *
+ *    http://www.apache.org/licenses/LICENSE-2.0                            *
+ *                                                                          *
+ * Unless required by applicable law or agreed to in writing, software      *
+ * distributed under the License is distributed on an "AS IS" BASIS,        *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
+ * See the License for the specific language governing permissions and      *
+ * limitations under the License.                                           *
+ ***************************************************************************/
+
+package com.optimizely.ab.android.sdk;
+
+import android.app.UiModeManager;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.optimizely.ab.event.internal.payload.Event;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static junit.framework.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(AndroidJUnit4.class)
+public class OptimizelyClientEngineTest {
+    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR2)
+    @Test
+    public void testGetClientEngineFromContextAndroidTV() {
+        Context context = mock(Context.class);
+        UiModeManager uiModeManager = mock(UiModeManager.class);
+        when(context.getSystemService(Context.UI_MODE_SERVICE)).thenReturn(uiModeManager);
+        when(uiModeManager.getCurrentModeType()).thenReturn(Configuration.UI_MODE_TYPE_TELEVISION);
+        assertEquals(Event.ClientEngine.ANDROID_TV_SDK, OptimizelyClientEngine.getClientEngineFromContext(context));
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR2)
+    @Test
+    public void testGetClientEngineFromContextAndroid() {
+        Context context = mock(Context.class);
+        UiModeManager uiModeManager = mock(UiModeManager.class);
+        when(context.getSystemService(Context.UI_MODE_SERVICE)).thenReturn(uiModeManager);
+        when(uiModeManager.getCurrentModeType()).thenReturn(Configuration.UI_MODE_TYPE_NORMAL);
+        assertEquals(Event.ClientEngine.ANDROID_SDK, OptimizelyClientEngine.getClientEngineFromContext(context));
+    }
+}

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClientEngine.java

@@ -0,0 +1,40 @@
+/****************************************************************************
+ * Copyright 2017, Optimizely, Inc. and contributors                   *
+ *                                                                          *
+ * Licensed under the Apache License, Version 2.0 (the "License");          *
+ * you may not use this file except in compliance with the License.         *
+ * You may obtain a copy of the License at                                  *
+ *                                                                          *
+ *    http://www.apache.org/licenses/LICENSE-2.0                            *
+ *                                                                          *
+ * Unless required by applicable law or agreed to in writing, software      *
+ * distributed under the License is distributed on an "AS IS" BASIS,        *
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
+ * See the License for the specific language governing permissions and      *
+ * limitations under the License.                                           *
+ ***************************************************************************/
+
+package com.optimizely.ab.android.sdk;
+
+import android.app.UiModeManager;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+
+import com.optimizely.ab.event.internal.payload.Event;
+
+public class OptimizelyClientEngine {
+
+    @VisibleForTesting
+    public static Event.ClientEngine getClientEngineFromContext(@NonNull Context context) {
+        UiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);
+
+        if (uiModeManager != null && uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {
+            return Event.ClientEngine.ANDROID_TV_SDK;
+        }
+
+        return Event.ClientEngine.ANDROID_SDK;
+    }
+
+}

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java

@@ -380,9 +380,12 @@ protected void onPostExecute(UserProfile userProfile) {
     private OptimizelyClient buildOptimizely(@NonNull Context context, @NonNull String dataFile, @NonNull UserProfile userProfile) throws ConfigParseException {
         OptlyEventHandler eventHandler = OptlyEventHandler.getInstance(context);
         eventHandler.setDispatchInterval(eventHandlerDispatchInterval, eventHandlerDispatchIntervalTimeUnit);
+
+        Event.ClientEngine clientEngine = OptimizelyClientEngine.getClientEngineFromContext(context);
+
         Optimizely optimizely = Optimizely.builder(dataFile, eventHandler)
                 .withUserProfile(userProfile)
-                .withClientEngine(Event.ClientEngine.ANDROID_SDK)
+                .withClientEngine(clientEngine)
                 .withClientVersion(BuildConfig.CLIENT_VERSION)
                 .build();
         return new OptimizelyClient(optimizely, LoggerFactory.getLogger(OptimizelyClient.class));

build.gradle

@@ -52,7 +52,7 @@ ext {
     min_sdk_version = 10
     target_sdk_version = 24
 
-    java_core_ver = "1.3.0"
+    java_core_ver = "1.5.0"
     android_logger_ver = "1.3.1"
     support_annotations_ver = "24.2.1"
     junit_ver = "4.12"