Merge pull request #551 from Countly/staging

Staging 26.1.2

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 26.1.2
+* Added `CountlyInitProvider` ContentProvider to register activity lifecycle callbacks before `Application.onCreate()`. This ensures the SDK captures the current activity in single-activity frameworks (Flutter, React Native) and apps with deferred initialization.
+* Added `CountlyConfig.setInitialActivity(Activity)` as an explicit way for wrapper SDKs to provide the host activity during initialization.
+* Added a new config option `setMetricProvider(MetricProvider)` to allow overriding default device metrics with custom values.
+
+## 26.1.1
+* Added Content feature method `previewContent(String contentId)` (Experimental!).
+* Improved content display and refresh mechanics.
+
+* Mitigated an issue about health checks storage in explicit storage mode.
+
 ## 26.1.0
 * Extended server configuration capabilities with server-controlled listing filters:
   * Event filters (blacklist/whitelist) to control which events are recorded.

README.md

@@ -1,5 +1,5 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/b26d1acc435c47af88b4e4b9eb94f59f)](https://app.codacy.com/gh/Countly/countly-sdk-android/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
-[![API](https://img.shields.io/badge/API-9%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=9)
+![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat)
 
 # Countly Android SDK
 

app-kotlin/build.gradle

@@ -25,14 +25,7 @@ android {
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
     }
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-  kotlinOptions {
-    jvmTarget = '1.8'
-  }
+  
   dataBinding {
     enabled = true
   }

app/build.gradle

@@ -28,10 +28,19 @@ repositories {
   }
 }
 
+kotlin {
+  jvmToolchain(17)
+}
+
 android {
   compileSdk 35
   namespace 'ly.count.android.demo'
 
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
+  }
+
   signingConfigs {
     release {
       storeFile file('keys')

app/src/main/AndroidManifest.xml

@@ -20,6 +20,7 @@
     <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
+        android:theme="@style/AppTheme.NoActionBar"
         android:configChanges="orientation|screenSize"
         android:exported="true">
       <intent-filter>
@@ -105,6 +106,11 @@
         android:label="@string/activity_name_content_zone"
         android:configChanges="orientation|screenSize"/>
 
+    <activity
+        android:name=".ActivityExampleFragments"
+        android:label="Fragment Navigation Test"
+        android:configChanges="orientation|screenSize"/>
+
     <activity
         android:name=".ActivityExampleTests"
         android:exported="false"/>
@@ -149,6 +155,21 @@
       </intent-filter>
     </activity>
     <activity android:name=".ActivityExampleKotlin"/>
+
+    <activity
+        android:name=".ActivityExampleConsent"
+        android:label="@string/activity_name_consent"
+        android:configChanges="orientation|screenSize"/>
+
+    <activity
+        android:name=".ActivityExampleLocation"
+        android:label="@string/activity_name_location"
+        android:configChanges="orientation|screenSize"/>
+
+    <activity
+        android:name=".ActivityExampleSessions"
+        android:label="@string/activity_name_sessions"
+        android:configChanges="orientation|screenSize"/>
   </application>
 
 </manifest>

app/src/main/java/ly/count/android/demo/ActivityExampleConsent.java

@@ -0,0 +1,74 @@
+package ly.count.android.demo;
+
+import android.os.Bundle;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.android.material.switchmaterial.SwitchMaterial;
+
+import ly.count.android.sdk.Countly;
+
+public class ActivityExampleConsent extends AppCompatActivity {
+
+    private static final String[][] FEATURES = {
+        {"sessions", "switchSessions"},
+        {"events", "switchEvents"},
+        {"views", "switchViews"},
+        {"crashes", "switchCrashes"},
+        {"attribution", "switchAttribution"},
+        {"users", "switchUsers"},
+        {"push", "switchPush"},
+        {"starRating", "switchStarRating"},
+        {"remoteConfig", "switchRemoteConfig"},
+        {"location", "switchLocation"},
+        {"feedback", "switchFeedback"},
+        {"apm", "switchApm"},
+        {"content", "switchContent"},
+    };
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_example_consent);
+
+        // Set initial switch states and listeners
+        for (String[] feature : FEATURES) {
+            String featureName = feature[0];
+            int resId = getResources().getIdentifier(feature[1], "id", getPackageName());
+            SwitchMaterial sw = findViewById(resId);
+            if (sw != null) {
+                sw.setChecked(Countly.sharedInstance().consent().getConsent(featureName));
+                sw.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                    if (isChecked) {
+                        Countly.sharedInstance().consent().giveConsent(new String[]{featureName});
+                    } else {
+                        Countly.sharedInstance().consent().removeConsent(new String[]{featureName});
+                    }
+                });
+            }
+        }
+
+        findViewById(R.id.btnGiveAllConsent).setOnClickListener(v -> {
+            Countly.sharedInstance().consent().giveConsentAll();
+            refreshSwitches();
+            Toast.makeText(this, "All consent given", Toast.LENGTH_SHORT).show();
+        });
+
+        findViewById(R.id.btnRemoveAllConsent).setOnClickListener(v -> {
+            Countly.sharedInstance().consent().removeConsentAll();
+            refreshSwitches();
+            Toast.makeText(this, "All consent removed", Toast.LENGTH_SHORT).show();
+        });
+    }
+
+    private void refreshSwitches() {
+        for (String[] feature : FEATURES) {
+            int resId = getResources().getIdentifier(feature[1], "id", getPackageName());
+            SwitchMaterial sw = findViewById(resId);
+            if (sw != null) {
+                sw.setChecked(Countly.sharedInstance().consent().getConsent(feature[0]));
+            }
+        }
+    }
+}

app/src/main/java/ly/count/android/demo/ActivityExampleContentZone.java

@@ -38,5 +38,6 @@ public void onClickChangeDeviceIdContentZone(View v) {
         String newDeviceId = deviceId.isEmpty() ? UUID.randomUUID().toString() : deviceId;
 
         Countly.sharedInstance().deviceId().setID(newDeviceId);
+        Countly.sharedInstance().consent().giveConsentAll();
     }
 }