Release v0.0.6

Author: himshikhar-am

.gitignore

@@ -140,4 +140,8 @@ fabric.properties
 
 ### AndroidStudio Patch ###
 
-!/gradle/wrapper/gradle-wrapper.jar
+!/gradle/wrapper/gradle-wrapper.jar
+
+### Cursor Rules ###
+.cursor/
+*.mdc

PushEngageSDK/build.gradle

@@ -1,16 +1,17 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
 }
 
 android {
-    compileSdk 31
-    buildToolsVersion = "30.0.3"
+    compileSdk 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 31
-        versionCode 5
-        versionName "0.0.5"
+        targetSdkVersion 34
+        versionCode 6
+        versionName "0.0.6"
         multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -27,10 +28,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+    namespace 'com.pushengage.pushengage'
 }
 
-apply plugin: 'kotlin-android'
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -52,4 +55,6 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
     implementation 'com.android.support:multidex:1.0.3'
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
+    implementation 'androidx.activity:activity:1.6.1'
+    implementation 'androidx.fragment:fragment:1.5.5'
 }

PushEngageSDK/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.pushengage.pushengage">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -18,6 +17,16 @@
             android:excludeFromRecents="true"
             android:exported="false" />
 
+        <activity
+            android:name=".permissionhandling.PEPermissionHelperActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:noHistory="true"
+            android:excludeFromRecents="true"
+            android:exported="false" />
+
+
+
+
         <service
             android:name=".core.PEFirebaseMessagingService"
             android:exported="true">

PushEngageSDK/src/main/java/com/pushengage/pushengage/Callbacks/PushEngagePermissionCallback.java

@@ -0,0 +1,14 @@
+package com.pushengage.pushengage.Callbacks;
+
+/**
+ * Callback interface for notification permission requests
+ */
+public interface PushEngagePermissionCallback {
+    /**
+     * Called when the permission request is completed
+     * 
+     * @param granted true if permission was granted, false otherwise
+     * @param error   any error that occurred during the permission request process
+     */
+    void onPermissionResult(boolean granted, Error error);
+}

PushEngageSDK/src/main/java/com/pushengage/pushengage/DataWorker/DailySyncDataWorker.java

@@ -30,15 +30,17 @@ public DailySyncDataWorker(@NonNull Context appContext, @NonNull WorkerParameter
     public Result doWork() {
         prefs = new PEPrefs(getApplicationContext());
         try {
-            NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat.from(getApplicationContext());
+            NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat
+                    .from(getApplicationContext());
             boolean areNotificationsEnabled = notificationManagerCompat.areNotificationsEnabled();
 
             long longVal = areNotificationsEnabled ? 0 : 1;
             if (!(longVal == prefs.isNotificationDisabled())) {
-                if (areNotificationsEnabled && prefs.isSubscriberDeleted()) {
+                if (areNotificationsEnabled && prefs.isSubscriberDeleted() && !prefs.isManuallyUnsubscribed()) {
                     PushEngage.callAddSubscriberAPI();
-                } else {
-                    UpdateSubscriberStatusRequest updateSubscriberStatusRequest = new UpdateSubscriberStatusRequest(prefs.getSiteId(), prefs.getHash(), longVal, prefs.getDeleteOnNotificationDisable());
+                } else if (!prefs.isManuallyUnsubscribed()) {
+                    UpdateSubscriberStatusRequest updateSubscriberStatusRequest = new UpdateSubscriberStatusRequest(
+                            prefs.getSiteId(), prefs.getHash(), longVal, prefs.getDeleteOnNotificationDisable());
                     updateSubscriberStatus(updateSubscriberStatusRequest);
                 }
             }

PushEngageSDK/src/main/java/com/pushengage/pushengage/DataWorker/WeeklySyncDataWorker.java

@@ -57,10 +57,12 @@ public void onStopped() {
     public void callAndroidSync() {
         if (PEUtilities.checkNetworkConnection(getApplicationContext())) {
             prefs = new PEPrefs(getApplicationContext());
-            Call<AndroidSyncResponse> addRecordsResponseCall = RestClient.getBackendCdnClient(getApplicationContext()).androidSync(prefs.getSiteKey());
+            Call<AndroidSyncResponse> addRecordsResponseCall = RestClient.getBackendCdnClient(getApplicationContext())
+                    .androidSync(prefs.getSiteKey());
             addRecordsResponseCall.enqueue(new Callback<AndroidSyncResponse>() {
                 @Override
-                public void onResponse(@NonNull Call<AndroidSyncResponse> call, @NonNull Response<AndroidSyncResponse> response) {
+                public void onResponse(@NonNull Call<AndroidSyncResponse> call,
+                        @NonNull Response<AndroidSyncResponse> response) {
                     if (response.isSuccessful()) {
                         AndroidSyncResponse androidSyncResponse = response.body();
                         if (androidSyncResponse.getData().getSiteStatus().equalsIgnoreCase(PEConstants.ACTIVE)) {
@@ -72,26 +74,30 @@ public void onResponse(@NonNull Call<AndroidSyncResponse> call, @NonNull Respons
                             prefs.setLoggerUrl(androidSyncResponse.getData().getApi().getLog());
                             prefs.setSiteId(androidSyncResponse.getData().getSiteId());
                             prefs.setProjectId(androidSyncResponse.getData().getFirebaseSenderId());
-                            prefs.setDeleteOnNotificationDisable(androidSyncResponse.getData().getDeleteOnNotificationDisable());
+                            prefs.setDeleteOnNotificationDisable(
+                                    androidSyncResponse.getData().getDeleteOnNotificationDisable());
                             prefs.setSiteStatus(androidSyncResponse.getData().getSiteStatus());
                             prefs.setGeoFetch(androidSyncResponse.getData().getGeoLocationEnabled());
                             prefs.setEu(androidSyncResponse.getData().getIsEu());
-                            NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat.from(getApplicationContext());
+                            NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat
+                                    .from(getApplicationContext());
                             boolean areNotificationsEnabled = notificationManagerCompat.areNotificationsEnabled();
                             long longVal = areNotificationsEnabled ? 0 : 1;
                             prefs.setIsNotificationDisabled(longVal);
-                            callUpdateSubscriberHash();
+                            if (!prefs.isManuallyUnsubscribed()) {
+                                callUpdateSubscriberHash();
+                            }
                         } else {
                             prefs.setIsSubscriberDeleted(true);
                         }
                     } else {
-//                        Log.d(TAG, "API Failure");
+                        // Log.d(TAG, "API Failure");
                     }
                 }
 
                 @Override
                 public void onFailure(@NonNull Call<AndroidSyncResponse> call, @NonNull Throwable t) {
-//                    Log.d(TAG, "API Failure");
+                    // Log.d(TAG, "API Failure");
                 }
             });
         }