Merge pull request #534 from Countly/staging

Staging 26.1.0

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,28 @@
+## 26.1.0
+* Extended server configuration capabilities with server-controlled listing filters:
+  * Event filters (blacklist/whitelist) to control which events are recorded.
+  * User property filters (blacklist/whitelist) to control which user properties are recorded.
+  * Segmentation filters (blacklist/whitelist) to control which segmentation keys are recorded.
+  * Event-specific segmentation filters (blacklist/whitelist) to control segmentation keys per event.
+* Added support for Journey Trigger Events that trigger a content zone refresh when recorded.
+* Added a configurable user property cache limit through server configuration.
+
+* Mitigated an issue where closing surveys that were presented via journeys was triggering an exception.
+* Mitigated an issue where when a content started loading opening a new activity could have hide it.
+
+## 25.4.9
+* Added a new config option `disableViewRestartForManualRecording()` to disable auto close/restart behavior of manual views on app background/foreground actions.
+
+## 25.4.8
+* Mitigated an issue where push notifications were not shown when consent was not required and app was killed.
+
+## 25.4.7
+* Mitigated an issue where the navigation bar showed an unwanted shadow during content display.
+
+## 25.4.6
+* Improved content error handling and display mechanics.
+* Updated user properties caching mechanism according to sessions.
+
 ## 25.4.5
 * Added a new config flag `setUseSerialExecutor(boolean useSerial)` for selecting immediate request executor type.
 * Added a new config option `setWebviewDisplayOption(WebViewDisplayOption)` to control how Content and Feedback Widgets are displayed. 

gradle.properties

@@ -22,7 +22,7 @@ org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableJetifier=true
 # RELEASE FIELD SECTION
-VERSION_NAME=25.4.5
+VERSION_NAME=26.1.0
 GROUP=ly.count.android
 POM_URL=https://github.com/Countly/countly-sdk-android
 POM_SCM_URL=https://github.com/Countly/countly-sdk-android

sdk/build.gradle

@@ -64,9 +64,8 @@ dependencies {
   androidTestImplementation 'androidx.test.ext:junit:1.1.5'
   androidTestImplementation 'junit:junit:4.13.2'
 
-  androidTestImplementation "org.mockito:mockito-core:${mockitoVersion}"
   androidTestImplementation "org.mockito:mockito-android:${mockitoVersion}"
-  //androidTestImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
+  androidTestImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
 }
 
 //Plugin for generating test coverage reports.

sdk/src/androidTest/AndroidManifest.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <application>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <application
+      android:usesCleartextTraffic="true"
+      android:networkSecurityConfig="@xml/network_security_config"
+      tools:replace="android:networkSecurityConfig,android:usesCleartextTraffic">
     <activity
         android:name=".TestUtils$Activity2"
         android:excludeFromRecents="true"

sdk/src/androidTest/java/ly/count/android/sdk/ConnectionProcessorTests.java

@@ -29,8 +29,12 @@ of this software and associated documentation files (the "Software"), to deal
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -130,6 +134,30 @@ public void setUp() {
             @Override public int getRequestTimeoutDurationMillis() {
                 return 30_000;
             }
+
+            @Override public int getUserPropertyCacheLimit() {
+                return 100;
+            }
+
+            @Override public FilterList<Set<String>> getEventFilterList() {
+                return new FilterList<>(new HashSet<>(), false);
+            }
+
+            @Override public FilterList<Set<String>> getUserPropertyFilterList() {
+                return new FilterList<>(new HashSet<>(), false);
+            }
+
+            @Override public FilterList<Set<String>> getSegmentationFilterList() {
+                return new FilterList<>(new HashSet<>(), false);
+            }
+
+            @Override public FilterList<Map<String, Set<String>>> getEventSegmentationFilterList() {
+                return new FilterList<>(new ConcurrentHashMap<>(), false);
+            }
+
+            @Override public Set<String> getJourneyTriggerEvents() {
+                return Collections.emptySet();
+            }
         };
 
         Countly.sharedInstance().setLoggingEnabled(true);
@@ -161,7 +189,7 @@ public void setUp() {
             }
         };
 
-        connectionProcessor = new ConnectionProcessor("http://server", mockStore, mockDeviceId, configurationProviderFake, rip, null, null, moduleLog, healthTrackerMock, Mockito.mock(Runnable.class));
+        connectionProcessor = new ConnectionProcessor("http://server", mockStore, mockDeviceId, configurationProviderFake, rip, null, null, moduleLog, healthTrackerMock, Mockito.mock(Runnable.class), new ConcurrentHashMap<>());
         testDeviceId = "123";
     }
 
@@ -170,7 +198,7 @@ public void testConstructorAndGetters() {
         final String serverURL = "https://secureserver";
         final CountlyStore mockStore = mock(CountlyStore.class);
         final DeviceIdProvider mockDeviceId = mock(DeviceIdProvider.class);
-        final ConnectionProcessor connectionProcessor1 = new ConnectionProcessor(serverURL, mockStore, mockDeviceId, configurationProviderFake, rip, null, null, moduleLog, healthTrackerMock, Mockito.mock(Runnable.class));
+        final ConnectionProcessor connectionProcessor1 = new ConnectionProcessor(serverURL, mockStore, mockDeviceId, configurationProviderFake, rip, null, null, moduleLog, healthTrackerMock, Mockito.mock(Runnable.class), new ConcurrentHashMap<>());
         assertEquals(serverURL, connectionProcessor1.getServerURL());
         assertSame(mockStore, connectionProcessor1.getCountlyStore());
     }
@@ -237,7 +265,7 @@ public void urlConnectionCustomHeaderValues() throws IOException {
         customValues.put("5", "");
         customValues.put("6", null);
 
-        ConnectionProcessor connectionProcessor = new ConnectionProcessor("http://server", mockStore, mockDeviceId, configurationProviderFake, rip, null, customValues, moduleLog, healthTrackerMock, Mockito.mock(Runnable.class));
+        ConnectionProcessor connectionProcessor = new ConnectionProcessor("http://server", mockStore, mockDeviceId, configurationProviderFake, rip, null, customValues, moduleLog, healthTrackerMock, Mockito.mock(Runnable.class), new ConcurrentHashMap<>());
         final URLConnection urlConnection = connectionProcessor.urlConnectionForServerRequest("eventData", null);
 
         assertEquals("bb", urlConnection.getRequestProperty("aa"));