Merge pull request #101 from GlobalMessageServices/PEGMS-2526-update-dependencies

PEGMS-2526 update dependencies. fix AEADBadTagException

Author: Oleksii Korniienko

build.gradle

@@ -3,9 +3,9 @@
 
 
 buildscript {
-    ext.kotlin_version = '1.9.22'
-    ext.gradleVersion = '8.4.0'
-    ext.dokka_version = "1.9.10"
+    ext.kotlin_version = '2.0.20'
+    ext.gradleVersion = '8.6.0'
+    ext.dokka_version = "1.9.20"
     ext.jacocoVersion = '0.8.12'
     repositories {
         google()
@@ -59,5 +59,5 @@ allprojects {
 }
 
 task clean(type: Delete) {
-    delete rootProject.buildDir
+    delete layout.buildDirectory.get()
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 07 14:00:08 CEST 2024
+#Tue Sep 10 08:58:46 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pushsdkandroid/build.gradle

@@ -8,7 +8,7 @@ apply plugin: 'org.jetbrains.dokka'
 apply plugin: 'maven-publish'
 apply plugin: 'jacoco'
 
-ext.build_version_name = '1.1.9'
+ext.build_version_name = '1.1.11'
 
 android {
     namespace = "com.push.android.pushsdkandroid"
@@ -69,13 +69,13 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'crea
     }
 
     def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']
-    def debugTree = fileTree(dir: "${buildDir}/intermediates/classes/debug", excludes: fileFilter)
+    def debugTree = fileTree(dir: "${layout.buildDirectory.get()}/intermediates/classes/debug", excludes: fileFilter)
     def mainSrc = "${project.projectDir}/src/main/java"
 
 
     sourceDirectories.setFrom(files([mainSrc]))
     classDirectories.setFrom(files([debugTree]))
-    executionData.setFrom(fileTree(dir: "$buildDir", includes: [
+    executionData.setFrom(fileTree(dir: "${layout.buildDirectory.get()}", includes: [
             "jacoco/testDebugUnitTest.exec",
             "outputs/code-coverage/connected/*coverage.ec"
     ]))
@@ -88,8 +88,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     //implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.lifecycle:lifecycle-process:2.8.3'
-    implementation 'androidx.test:monitor:1.7.1'
+    implementation 'androidx.lifecycle:lifecycle-process:2.8.5'
+    implementation 'androidx.test:monitor:1.7.2'
     implementation 'androidx.security:security-crypto:1.1.0-alpha06'
 
 
@@ -120,7 +120,7 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.10.1'
 
     //WorkManager Version 2.7.0 is required for apps targeting Android 12 (S) or higher
-    implementation 'androidx.work:work-runtime-ktx:2.9.0'
+    implementation 'androidx.work:work-runtime-ktx:2.9.1'
 }
 
 //get HEAD commit hash
@@ -182,7 +182,7 @@ afterEvaluate {
         repositories {
             maven {
                 //publish locally for now
-                url "$buildDir/maven-repos/"
+                url "${layout.buildDirectory.get()}/maven-repos/"
 //                def releasesRepoUrl = "$buildDir/maven-repos/releases"
 //                def snapshotsRepoUrl = "$buildDir/maven-repos/snapshots"
 //                url = version.endsWith('RELEASE') ? releasesRepoUrl : snapshotsRepoUrl

pushsdkandroid/src/main/java/com/push/android/pushsdkandroid/core/SharedPreferencesHandler.kt

@@ -2,15 +2,52 @@ package com.push.android.pushsdkandroid.core
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.os.Build
+import android.util.Log
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
+import com.push.android.pushsdkandroid.utils.PushSDKLogger
+import java.io.File
+import javax.crypto.AEADBadTagException
 
 @Suppress("unused")
 internal class SharedPreferencesHandler(context: Context) {
     private val preferenceDatabase = "push_k_database"
-    private var sharedPref: SharedPreferences = getEncryptedSharedPref(context)
+    private var sharedPref: SharedPreferences = initializeSharedPref(context)
 
 
+    private fun initializeSharedPref(context: Context): SharedPreferences {
+        return try {
+            getEncryptedSharedPref(context)
+        } catch (e: AEADBadTagException) {
+            PushSDKLogger.error(
+                "Shared preference initializing failed with exception: " +
+                        Log.getStackTraceString(e)
+            )
+            // Handle exception, likely data corruption or key change (e.g. app was uninstalled and installed again)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                context.deleteSharedPreferences(preferenceDatabase)
+            } else {
+                deleteSharedPreferences(preferenceDatabase, context)
+            }
+            getEncryptedSharedPref(context)
+        }
+    }
+
+    private fun deleteSharedPreferences(preferenceDatabase: String, context: Context) {
+        try {
+            val sharedPrefsFile =
+                File(context.filesDir.parent + "/shared_prefs/" + preferenceDatabase + ".xml")
+            if (sharedPrefsFile.exists()) {
+                sharedPrefsFile.delete()
+            }
+        } catch (e: Exception) {
+            PushSDKLogger.error(
+                "Shared preference deleting failed with exception: " +
+                        Log.getStackTraceString(e)
+            )
+        }
+    }
 
     private fun getEncryptedSharedPref(context: Context): SharedPreferences {
         return EncryptedSharedPreferences.create(