feat: staging-np pre-merge

Author: arifBurakDemiray

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 25.4.2
+## 25.4.2-np
 * Added a new function "addCustomNetworkRequestHeaders: customHeaderValues" for providing or overriding custom headers after init.
 * Default request method is now set to "POST"
 * Updated user properties caching mechanism according to sessions.
@@ -25,7 +25,7 @@
 * Updated underlying iOS SDK version to 25.4.8
 * Updated underlying Web SDK version to 25.4.2
 
-## 25.4.1
+## 25.4.1-np
 * Added fullscreen support for feedback widgets.
 * Added "disableSDKBehaviorSettingsUpdates()" init config method to disable server config updates.
 * Improved request queue handling with a built-in backoff mechanism which is enabled by default.
@@ -40,27 +40,25 @@
 * Updated underlying iOS SDK version to 25.4.2
 * Updated underlying Web SDK version to 25.4.1
 
-## 25.4.0
+## 25.4.0-np
 * ! Minor breaking change ! Removed Secure.ANDROID_ID on Android and UIDevice.currentDevice.identifierForVendor on iOS usages in device ID generation. The SDKs now exclusively uses random UUIDs for device ID generation.
 * ! Minor breaking change ! SDK now has Server Configuration feature and it is enabled by default. Changes made on SDK Manager > SDK Configuration on your server will affect SDK behavior directly.
 
 * Added `refreshContentZone` method to Content interface for refreshing Content Zone requests.
 * Added `setSDKBehaviorSettings(String)` init config method for providing server configuration during first initialization.
 
-* Mitigated an issue on Android that caused PN message data collision if two message with same ID was received.
-
 * Updated underlying Android SDK version to 25.4.0
 * Updated underlying iOS SDK version to 25.4.0
 * Updated underlying Web SDK version to 25.4.0
 
-## 25.1.1
+## 25.1.1-np
 * Removed Android v1 embedding support
 
 * Underlying Android SDK version is 25.1.1
 * Underlying iOS SDK version is 25.1.1
 * Underlying Web SDK version is 25.1.0
 
-## 25.1.0
+## 25.1.0-np
 * Added experimental support for the web platform in the Countly Flutter SDK. Some functionalities are not yet fully supported. Below is the list of limitations for the web platform:
   * Hybrid sessions are the default; full manual sessions are not supported.
   * Features Not Supported: Push Notifications, APM, and Attribution.
@@ -108,13 +106,13 @@
 * Enhanced CertificateTrustManager to support domain-specific configurations with hostname-aware checkServerTrusted calls (Android).
 
 * Fixed an issue where the build UUID and executable name were missing from crash reports (iOS).
-* Mitigated an issue while setting zone timer interval for content (iOS).
+* * Mitigated an issue while setting zone timer interval for content (iOS).
 
 * Updated underlying Android SDK version to 25.1.1
 * Updated underlying iOS SDK version to 25.1.1
 * Added underlying Web SDK version to 25.1.0
 
-## 24.11.2
+## 24.11.2-np
 * Improved view tracking capabilities in iOS.
 
 * Mitigated issues where:
@@ -125,7 +123,7 @@
 * Updated underlying Android SDK version to 24.7.7
 * Updated underlying iOS SDK version to 24.7.9
 
-## 24.11.1
+## 24.11.1-np
 * Added content configuration interface that has `setGlobalContentCallback` to get notified about content changes.
 * Added support for localization of content blocks.
 * Added the interface `feedback` and convenience methods that presents the first available widget to user:
@@ -141,7 +139,7 @@
 * Updated underlying Android SDK version to 24.7.6
 * Updated underlying iOS SDK version to 24.7.8
 
-## 24.11.0
+## 24.11.0-np
 * Added further intent redirection vulnerability checks in Android
 * Added support for Android 15 (API level 35)
 * Added a config flag `setCustomNetworkRequestHeaders` to add custom headers to SDK requests (thanks @sbatezat)
@@ -164,7 +162,7 @@
 * Updated underlying Android SDK version to 24.7.5
 * Updated underlying iOS SDK version to 24.7.7
 
-From this version on NP variant changelogs will be added to `-np` branches!
+From this version on NP variant changelogs will be added to this branch!
 
 ## 24.7.1
 * Added a new configuration option `enableTemporaryDeviceIDMode` to 'CountlyConfig' interface

README.md

@@ -1,6 +1,6 @@
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/7ab95afb3da8421ab499cc921e1381ac)](https://app.codacy.com/gh/Countly/countly-sdk-flutter-bridge/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/7ab95afb3da8421ab499cc921e1381ac)](https://www.codacy.com/gh/Countly/countly-sdk-flutter-bridge/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Countly/countly-sdk-flutter-bridge&utm_campaign=Badge_Grade)
 
-# Countly Flutter SDK
+# Countly Flutter SDK - No Push
 
 This repository contains the Countly Flutter SDK, which can be integrated into mobile Flutter applications. The Countly Flutter SDK is intended to be used with [Countly Lite](https://countly.com/lite), [Countly Flex](https://countly.com/flex), [Countly Enterprise](https://countly.com/enterprise).
 
@@ -26,7 +26,6 @@ For an example integration of this SDK, you can have a look [here](https://githu
 
 This SDK supports the following features:
 * [Analytics](https://support.count.ly/hc/en-us/articles/4431589003545-Analytics)
-* [Push Notifications](https://support.count.ly/hc/en-us/articles/4405405459225-Push-Notifications)
 * [User Profiles](https://support.count.ly/hc/en-us/articles/4403281285913-User-Profiles)
 * [Crash Reports](https://support.count.ly/hc/en-us/articles/4404213566105-Crashes-Errors)
 * [A/B Testing](https://support.count.ly/hc/en-us/articles/4416496362393-A-B-Testing-)
@@ -45,7 +44,7 @@ dependencies:
 ## Usage
 
 ```dart
-import 'package:countly_flutter/countly_flutter.dart';
+import 'package:countly_flutter_np/countly_flutter.dart';
 
 void main() {
   runApp(MaterialApp(home: const MyApp()));
@@ -222,7 +221,7 @@ Countly.instance.userProfile.clear();
 // Flutter SDK allows developers to enable/disable any feature at any time depending
 // on user consent.
 
-// Consent values: sessions, events, views, location, crashes, attribution, users, push, starRating, apm, feedback, remoteConfig
+// Consent values: sessions, events, views, location, crashes, attribution, users, starRating, apm, feedback, remoteConfig
 
 // Consent can be enabled during initialization
 final CountlyConfig config = CountlyConfig(SERVER_URL, APP_KEY)
@@ -248,7 +247,7 @@ Countly.removeAllConsent();
 From 2014 to 2020 it was maintained by Trinisoft Technologies developers ([email protected]).
 
 ## Security
-Security is very important to us. If you discover any issue regarding security, please disclose the information responsibly by sending an email to security@count.ly and **not by creating a GitHub issue**.
+Security is very important to us. If you discover any issue regarding security, please disclose the information responsibly by sending an email to security@countly.com and **not by creating a GitHub issue**.
 
 ## Badges
 If you like Countly, [why not use one of our badges](https://countly.com/brand-assets) and give a link back to us so others know about this wonderful platform?

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.4'
     }
 }
 
@@ -39,5 +39,4 @@ android {
 
 dependencies {
     implementation 'ly.count.android:sdk:25.4.7'
-    implementation 'com.google.firebase:firebase-messaging:24.0.3'
 }

android/settings.gradle

@@ -1 +1 @@
-rootProject.name = 'countly_flutter'
+rootProject.name = 'countly_flutter_np'

android/src/main/AndroidManifest.xml

@@ -1,18 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="${applicationId}.CountlyPush.BROADCAST_PERMISSION" />
-    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" android:maxSdkVersion="30" />
-    <permission
-        android:name="${applicationId}.CountlyPush.BROADCAST_PERMISSION"
-        android:protectionLevel="signature" />
-    <application>
-        <service
-            android:name="ly.count.dart.countly_flutter.CountlyMessagingService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-    </application>
 </manifest>

android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java

@@ -57,11 +57,6 @@
 import ly.count.android.sdk.StarRatingCallback;
 import ly.count.android.sdk.messaging.CountlyPush;
 
-import com.google.firebase.messaging.FirebaseMessaging;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.firebase.FirebaseApp;
-
 /**
  * CountlyFlutterPlugin
  */
@@ -71,7 +66,7 @@ public class CountlyFlutterPlugin implements MethodCallHandler, FlutterPlugin, A
     private final String COUNTLY_FLUTTER_SDK_NAME = "dart-flutterb-android";
     private final String COUNTLY_FLUTTER_SDK_NAME_NO_PUSH = "dart-flutterbnp-android";
 
-    private final boolean BUILDING_WITH_PUSH_DISABLED = false;
+    private final boolean BUILDING_WITH_PUSH_DISABLED = true;
 
     public void notifyPublicChannelRCDL(RequestResult downloadResult, String error, boolean fullValueUpdate, Map<String, RCData> downloadedValues, Integer requestID) {
         Map<String, Object> data = new HashMap<>();
@@ -450,21 +445,7 @@ else if ("attemptToSendStoredRequests".equals(call.method)) {
                     }
                 }
                 CountlyPush.init(activity.getApplication(), pushTokenType);
-                FirebaseApp.initializeApp(context);
-                FirebaseMessaging.getInstance().getToken().addOnCompleteListener(new OnCompleteListener<String>() {
-                    @Override
-                    public void onComplete(@NonNull Task<String> task) {
-                        if (!task.isSuccessful()) {
-                            log("[askForNotificationPermission], Fetching FCM registration token failed", task.getException(), LogLevel.WARNING);
-                            return;
-                        }
-
-                        String token = task.getResult();
-                        log("FCM Token: " + token, LogLevel.INFO);
-                        CountlyPush.onTokenRefresh(token);
-                    }
-                });
-                result.success("askForNotificationPermission!");
+                result.success(" askForNotificationPermission!");
             } else if ("pushTokenType".equals(call.method)) {
                 String tokenType = args.getString(0);
                 if ("2".equals(tokenType)) {

android/src/main/java/ly/count/dart/countly_flutter/CountlyMessagingService.java

@@ -33,6 +33,7 @@
 # Android related
 **/android/**/gradle-wrapper.jar
 **/android/.gradle
+**/android/app/.cxx/
 **/android/captures/
 **/android/gradlew
 **/android/gradlew.bat

example/.gitignore

@@ -25,6 +25,7 @@ if (flutterVersionName == null) {
 
 android {
     namespace "com.countly.demo"
+    compileSdkVersion 35
     compileSdk flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 

example/android/app/build.gradle

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip