From e93035047d4f5a3df0400be265c5a1e53ed0b00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20S=C3=B6derberg?= <karl.soderberg@gmail.com>
Date: Mon, 23 Aug 2021 17:12:49 +0200
Subject: [PATCH 01/10] Removed common-lang 2.3 dependency

The dependency was not used specifically and has been reported to crash.
---
 libmobiletagging/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libmobiletagging/build.gradle b/libmobiletagging/build.gradle
index bdb4721..0c44976 100644
--- a/libmobiletagging/build.gradle
+++ b/libmobiletagging/build.gradle
@@ -36,7 +36,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'commons-lang:commons-lang:2.3'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:3.1.0'

From d54a4e2ec811ab41e16882edb09875560de48a21 Mon Sep 17 00:00:00 2001
From: Morteza Rastgoo <5219339+Morteza-Rastgoo@users.noreply.github.com>
Date: Thu, 2 Sep 2021 14:45:09 +0200
Subject: [PATCH 02/10] Upgradel gradle to 4.2.2

---
 .idea/runConfigurations.xml              | 1 +
 build.gradle                             | 2 +-
 gradle.properties                        | 1 +
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/build.gradle b/build.gradle
index c480782..7ebf95d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..c79c847 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7207b17..499d696 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

From d8a3f5db32914d7e8f4881ec67b8a31b130afc5f Mon Sep 17 00:00:00 2001
From: Morteza Rastgoo <5219339+Morteza-Rastgoo@users.noreply.github.com>
Date: Thu, 2 Sep 2021 14:46:44 +0200
Subject: [PATCH 03/10] Upgrade compileSdkVersion and targetSdkVersion to
 android 11 API 30

---
 app/build.gradle              | 9 +++++++--
 libmobiletagging/build.gradle | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index deb1ce4..58bbda3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android-extensions'
 version = "4.0.1"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "se.kantarsifo.mobileanalytics.sampleapp"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName version
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -25,6 +25,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
 //    applicationVariants.all { variant ->
 //        variant.outputs.each { output ->
 //            def outputFile = output.outputFile
@@ -48,6 +52,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:core-ktx:1.4.0'
 }
 
 //task copyAARToReleaseFolder() << {
diff --git a/libmobiletagging/build.gradle b/libmobiletagging/build.gradle
index 0c44976..21bccf2 100644
--- a/libmobiletagging/build.gradle
+++ b/libmobiletagging/build.gradle
@@ -9,13 +9,15 @@ version = "4.0.1"
 
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName version
         publishNonDefault true
+        buildConfigField("long", "VERSION_CODE", "${defaultConfig.versionCode}")
+        buildConfigField("String","VERSION_NAME","\"${defaultConfig.versionName}\"")
     }
     buildTypes {
         release {

From 1c7233043b72860bdf444816c8d9325cb8ad74a9 Mon Sep 17 00:00:00 2001
From: Morteza Rastgoo <5219339+Morteza-Rastgoo@users.noreply.github.com>
Date: Thu, 2 Sep 2021 14:47:08 +0200
Subject: [PATCH 04/10] Add Package visibility support in Android 11

---
 libmobiletagging/src/main/AndroidManifest.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libmobiletagging/src/main/AndroidManifest.xml b/libmobiletagging/src/main/AndroidManifest.xml
index a9ffec4..822195e 100644
--- a/libmobiletagging/src/main/AndroidManifest.xml
+++ b/libmobiletagging/src/main/AndroidManifest.xml
@@ -1,2 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="se.kantarsifo.mobileanalytics.framework"/>
\ No newline at end of file
+<manifest package="se.kantarsifo.mobileanalytics.framework"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <queries>
+        <package android:name="com.google.android.webview" />
+        <package android:name="se.poll.android" />
+        <package android:name="se.tns_sifo.ipm" />
+    </queries>
+</manifest>
\ No newline at end of file

From a8f38961f4cc7ee7c831310442afb2ae5bfdca9e Mon Sep 17 00:00:00 2001
From: Morteza Rastgoo <5219339+Morteza-Rastgoo@users.noreply.github.com>
Date: Thu, 2 Sep 2021 14:48:51 +0200
Subject: [PATCH 05/10] Fix calling the callback multiple times in the
 ActivityResultHandler.kt when the intent was not found

---
 .../mobileanalytics/framework/ActivityResultHandler.kt         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/ActivityResultHandler.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/ActivityResultHandler.kt
index a091734..f194b4e 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/ActivityResultHandler.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/ActivityResultHandler.kt
@@ -31,8 +31,7 @@ class ActivityResultImpl(private val registry: ActivityResultRegistry,
         try {
             startForResult.launch(intent)
         } catch (e: Exception) {
-            e.printStackTrace()
-            onResult(null)
+//            e.printStackTrace()
         }
 
     }

From df07eaa302f0c9bf5557fba4b3d71eeef08d0547 Mon Sep 17 00:00:00 2001
From: Morteza Rastgoo <5219339+Morteza-Rastgoo@users.noreply.github.com>
Date: Thu, 2 Sep 2021 14:50:04 +0200
Subject: [PATCH 06/10] Move isPackageInstalled method to Utils.kt

---
 .../mobileanalytics/framework/PanelistHandler.kt  | 11 ++---------
 .../kantarsifo/mobileanalytics/framework/Utils.kt | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/Utils.kt

diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/PanelistHandler.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/PanelistHandler.kt
index 11df2ad..3a15265 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/PanelistHandler.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/PanelistHandler.kt
@@ -9,6 +9,7 @@ import android.net.Uri
 import androidx.activity.ComponentActivity
 import org.json.JSONArray
 import org.json.JSONException
+import se.kantarsifo.mobileanalytics.framework.Utils.isPackageInstalled
 import java.io.BufferedReader
 import java.io.FileInputStream
 import java.io.IOException
@@ -36,8 +37,7 @@ internal object PanelistHandler {
     }
 
     fun syncCookies(context: Context, activity: ComponentActivity, onComplete: () -> Unit) {
-        val pm = context.packageManager
-        val isInstalled: Boolean = isPackageInstalled(TagStringsAndValues.SIFO_PANELIST_PACKAGE_NAME_V2, pm)
+        val isInstalled: Boolean = context.isPackageInstalled(TagStringsAndValues.SIFO_PANELIST_PACKAGE_NAME_V2)
         val sharedPref = activity.getSharedPreferences(TagStringsAndValues.SIFO_PREFERENCE_KEY, Context.MODE_PRIVATE)
         if (isInstalled) {
             if (shouldUpdateCookieValues(activity)) {
@@ -79,13 +79,6 @@ internal object PanelistHandler {
         sharedPreferences.edit().remove(TagStringsAndValues.SIFO_PREFERENCE_COOKIES_SYNC_TIME).commit()
     }
 
-    private fun isPackageInstalled(packageName: String?, packageManager: PackageManager): Boolean {
-        return try {
-            packageManager.getApplicationInfo(packageName, 0).enabled
-        } catch (e: PackageManager.NameNotFoundException) {
-            false
-        }
-    }
 
     /**
      * Opens a FileInputStream from TNS Sifo-Panelen
diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/Utils.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/Utils.kt
new file mode 100644
index 0000000..e99e148
--- /dev/null
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/Utils.kt
@@ -0,0 +1,15 @@
+package se.kantarsifo.mobileanalytics.framework
+
+import android.content.Context
+import android.content.pm.PackageManager
+
+object Utils {
+
+    fun Context.isPackageInstalled(packageName: String): Boolean {
+        return try {
+            packageManager.getApplicationInfo(packageName, 0).enabled
+        } catch (e: PackageManager.NameNotFoundException) {
+            false
+        }
+    }
+}
\ No newline at end of file

From 2be50ebf56cb340e1911e4d8a2942320c7135629 Mon Sep 17 00:00:00 2001
From: Morteza Rastgoo <5219339+Morteza-Rastgoo@users.noreply.github.com>
Date: Fri, 3 Sep 2021 10:21:55 +0200
Subject: [PATCH 07/10] Create a Logger to log all the debugging info
 centralized

---
 .../mobileanalytics/framework/Logger.kt       | 29 +++++++++++++++++++
 .../framework/PanelistHandler.kt              | 12 ++++----
 .../framework/TSMobileAnalyticsBackend.kt     | 19 +++++++-----
 .../framework/TagDataRequest.kt               | 10 ++++---
 .../framework/TagDataRequestHandler.kt        | 20 ++++++-------
 .../mobileanalytics/framework/TagHandler.kt   | 13 +++++----
 6 files changed, 69 insertions(+), 34 deletions(-)
 create mode 100644 libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/Logger.kt

diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/Logger.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/Logger.kt
new file mode 100644
index 0000000..dcf35ad
--- /dev/null
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/Logger.kt
@@ -0,0 +1,29 @@
+package se.kantarsifo.mobileanalytics.framework
+
+import android.util.Log
+
+object Logger {
+    const val TAG = "MobileAppTagging"
+    fun log(message: String) {
+        if (TSMobileAnalytics.logPrintsActivated) {
+            Log.d(TAG, "***********************************")
+            Log.d(TAG, message)
+            Log.d(TAG, "***********************************")
+        }
+    }
+
+    fun error(message: String) {
+        if (TSMobileAnalytics.logPrintsActivated) {
+            Log.e(TAG, "***********************************")
+            Log.e(TAG, message)
+            Log.e(TAG, "***********************************")
+        }
+    }
+
+    fun fatalError(message: String) {
+        Log.e(TAG, "***********************************")
+        Log.e(TAG, message)
+        Log.e(TAG, "***********************************")
+    }
+
+}
\ No newline at end of file
diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/PanelistHandler.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/PanelistHandler.kt
index 3a15265..f0c5a74 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/PanelistHandler.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/PanelistHandler.kt
@@ -4,11 +4,11 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
-import android.content.pm.PackageManager
 import android.net.Uri
 import androidx.activity.ComponentActivity
 import org.json.JSONArray
 import org.json.JSONException
+import se.kantarsifo.mobileanalytics.framework.Logger.error
 import se.kantarsifo.mobileanalytics.framework.Utils.isPackageInstalled
 import java.io.BufferedReader
 import java.io.FileInputStream
@@ -92,7 +92,7 @@ internal object PanelistHandler {
             context.createPackageContext(packageName, 0).openFileInput(filename)
         } catch (e: Exception) {
 
-            TSMobileAnalyticsBackend.logError("Error Getting InputStream")
+            error("Error Getting InputStream")
             null
         }
     }
@@ -106,7 +106,7 @@ internal object PanelistHandler {
                 cookieList.add(CookieHandler.getCookieFromJson(entry))
             }
         } catch (e: JSONException) {
-            TSMobileAnalyticsBackend.logError("Error parsing TNS Panelist JSON data")
+            error("Error parsing TNS Panelist JSON data")
         }
         return cookieList
     }
@@ -121,7 +121,7 @@ internal object PanelistHandler {
                 cookieList.add(CookieHandler.getCookieFromJson(entry))
             }
         } catch (e: JSONException) {
-            TSMobileAnalyticsBackend.logError("Error parsing TNS Panelist JSON data")
+            error("Error parsing TNS Panelist JSON data")
         }
         return cookieList
     }
@@ -148,12 +148,12 @@ internal object PanelistHandler {
             }
             return buffer.toString()
         } catch (e: Exception) {
-            TSMobileAnalyticsBackend.logError(errorString)
+            error(errorString)
         } finally {
             try {
                 input?.close()
             } catch (e: IOException) { // Should never happen
-                TSMobileAnalyticsBackend.logError("Error Closing InputStream")
+                error("Error Closing InputStream")
             }
         }
         return ""
diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TSMobileAnalyticsBackend.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TSMobileAnalyticsBackend.kt
index 07bb846..72a91a0 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TSMobileAnalyticsBackend.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TSMobileAnalyticsBackend.kt
@@ -11,6 +11,9 @@ import androidx.activity.ComponentActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import se.kantarsifo.mobileanalytics.framework.Logger.fatalError
+import se.kantarsifo.mobileanalytics.framework.Logger.log
+import se.kantarsifo.mobileanalytics.framework.Utils.isPackageInstalled
 import java.net.HttpCookie
 
 /**
@@ -39,7 +42,7 @@ internal class TSMobileAnalyticsBackend : TSMobileAnalytics {
 
         fun createInstance(activity: ComponentActivity, cpID: String?, applicationName: String?, onlyPanelist: Boolean, isWebBased: Boolean): TSMobileAnalyticsBackend? {
             if (activity == null) {
-                logFatalError("Mobile Application Tagging Framework Failed to initiate - context must not be null")
+                fatalError("Mobile Application Tagging Framework Failed to initiate - context must not be null")
                 return frameworkInstance
             }
             val version = BuildConfig.VERSION_NAME
@@ -112,20 +115,20 @@ internal class TSMobileAnalyticsBackend : TSMobileAnalytics {
         private fun paramsAreValid(cpID: String?, applicationName: String?): Boolean {
             return when {
                 (cpID.isNullOrEmpty()) -> {
-                    logFatalError("Mobile Application Tagging Framework Failed to initiate - CPID must not be null or empty")
+                    fatalError("Mobile Application Tagging Framework Failed to initiate - CPID must not be null or empty")
                     false
                 }
                 (cpID.length != TagStringsAndValues.CPID_LENGTH_CODIGO) -> {
-                    logFatalError("Mobile Application Tagging Framework Failed to initiate - CPID must be " +
+                    fatalError("Mobile Application Tagging Framework Failed to initiate - CPID must be " +
                             "${TagStringsAndValues.CPID_LENGTH_CODIGO} characters")
                     false
                 }
                 (applicationName.isNullOrEmpty()) -> {
-                    logFatalError("Mobile Application Tagging Framework Failed to initiate - Application Name must not be null or empty")
+                    fatalError("Mobile Application Tagging Framework Failed to initiate - Application Name must not be null or empty")
                     false
                 }
                 (applicationName.length > TagStringsAndValues.MAX_LENGTH_APP_NAME) -> {
-                    logFatalError("Mobile Application Tagging Framework Failed to initiate - Application Name must not have more than "
+                    fatalError("Mobile Application Tagging Framework Failed to initiate - Application Name must not have more than "
                             + TagStringsAndValues.MAX_LENGTH_APP_NAME + " characters")
                     false
                 }
@@ -149,15 +152,15 @@ internal class TSMobileAnalyticsBackend : TSMobileAnalytics {
         private fun initLegacyTags(activity: ComponentActivity, cpID: String, applicationName: String, onlyPanelist: Boolean) {
             val panelistKey = PanelistHandler.getPanelistKey(activity)
             if (cpID.length != TagStringsAndValues.CPID_LENGTH_CODIGO) {
-                logFatalError("Mobile Application Tagging Framework Failed to initiate - " +
+                fatalError("Mobile Application Tagging Framework Failed to initiate - " +
                         "CPID must either be exactly " + TagStringsAndValues.CPID_LENGTH_CODIGO)
             } else if (onlyPanelist && panelistKey == TagStringsAndValues.NO_PANELIST_ID) {
-                logFatalError("Mobile Application Tagging Framework Failed to initiate - " +
+                fatalError("Mobile Application Tagging Framework Failed to initiate - " +
                         "Panelist Id was not found, it must exist if only panelist tracking is active")
             } else {
                 // TODO print panelist setting
                 frameworkInstance = TSMobileAnalyticsBackend(activity, activity, cpID, applicationName, panelistKey, onlyPanelist)
-                logMessage("Mobile Application Tagging Framework initiated with the following values " +
+                log("Mobile Application Tagging Framework initiated with the following values " +
                         "\nCPID: $cpID\nApplication name: $applicationName\nOnly panelist tracking : $onlyPanelist")
             }
         }
diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequest.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequest.kt
index 8d54c94..ad5deb8 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequest.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequest.kt
@@ -5,6 +5,8 @@
  */
 package se.kantarsifo.mobileanalytics.framework
 
+import se.kantarsifo.mobileanalytics.framework.Logger.error
+import se.kantarsifo.mobileanalytics.framework.Logger.log
 import java.io.IOException
 import java.net.URL
 import java.util.UUID
@@ -110,7 +112,7 @@ internal constructor(
      * Print request information to LogCat.
      */
     private fun logRequestInfo() {
-        TSMobileAnalyticsBackend.logMessage(
+        log(
                 "Tag request sent: " +
                         "\nRequestID: " + requestID +
                         "\nCat encoded value:" + TagHandler.urlEncode(cat) +
@@ -123,7 +125,7 @@ internal constructor(
      * Handle a successful request.
      */
     private fun dataRequestComplete() {
-        TSMobileAnalyticsBackend.logMessage("Tag request completed with success: \nRequestID: $requestID")
+        log("Tag request completed with success: \nRequestID: $requestID")
         notifySuccess()
     }
 
@@ -132,7 +134,7 @@ internal constructor(
      * @param e The exception if one was thrown.
      */
     private fun dataRequestFail(e: Exception) {
-        TSMobileAnalyticsBackend.logError("Tag request failed with exception:\n$e\nRequestID: $requestID")
+        error("Tag request failed with exception:\n$e\nRequestID: $requestID")
         notifyFailure()
     }
 
@@ -142,7 +144,7 @@ internal constructor(
      * @param message HTTP response message.
      */
     private fun dataRequestFailWithResponseCode(statusCode: Int, message: String) {
-        TSMobileAnalyticsBackend.logError("Tag request failed with http status code:$statusCode\nmessage:$message\nRequestID: $requestID")
+        error("Tag request failed with http status code:$statusCode\nmessage:$message\nRequestID: $requestID")
         notifyFailure()
     }
 
diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequestHandler.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequestHandler.kt
index acb6bb3..1c1150a 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequestHandler.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequestHandler.kt
@@ -7,6 +7,10 @@ package se.kantarsifo.mobileanalytics.framework
 
 import android.content.Context
 import androidx.activity.ComponentActivity
+import se.kantarsifo.mobileanalytics.framework.Logger.error
+import se.kantarsifo.mobileanalytics.framework.Logger.fatalError
+import se.kantarsifo.mobileanalytics.framework.Logger.log
+import se.kantarsifo.mobileanalytics.framework.TagDataRequestHandler.State.*
 import java.net.HttpCookie
 import java.util.ArrayList
 import java.util.concurrent.ExecutorService
@@ -146,7 +150,7 @@ internal class TagDataRequestHandler : TagDataRequestCallbackListener {
      * This method is called when a data request has been completed successfully.
      */
     override fun onDataRequestComplete(request: TagDataRequest) {
-        synchronized(this) { dataRequestQueue.remove(request) }
+        log( "RequestCompleted: " + request.cat)
         nbrOfSuccessfulRequests++
     }
 
@@ -155,7 +159,7 @@ internal class TagDataRequestHandler : TagDataRequestCallbackListener {
      * This method is called when a data request has been failed.
      */
     override fun onDataRequestFailed(request: TagDataRequest) {
-        synchronized(this) { dataRequestQueue.remove(request) }
+        error( "RequestFailed: " + request.cat)
         nbrOfFailedRequests++
     }
 
@@ -167,29 +171,25 @@ internal class TagDataRequestHandler : TagDataRequestCallbackListener {
     private fun checkRequestParams(category: String?, contentID: String?): Int {
         return when {
             (category == null) -> {
-                logFatalError("category may not be null")
+                fatalError("category may not be null")
                 TagStringsAndValues.ERROR_CATEGORY_NULL
             }
             (category.length > TagStringsAndValues.MAX_LENGTH_CATEGORY) -> {
-                logFatalError("category may not have more than ${TagStringsAndValues.MAX_LENGTH_CATEGORY} characters")
+                fatalError("category may not have more than ${TagStringsAndValues.MAX_LENGTH_CATEGORY} characters")
                 TagStringsAndValues.ERROR_CATEGORY_TOO_LONG
             }
             (contentID == null) -> {
-                logFatalError("contentID may not be null")
+                fatalError("contentID may not be null")
                 TagStringsAndValues.ERROR_CONTENT_ID_NULL
             }
             (contentID.length > TagStringsAndValues.MAX_LENGTH_CONTENT_ID) -> {
-                logFatalError("contentID may not have more than ${TagStringsAndValues.MAX_LENGTH_CONTENT_ID} characters")
+                fatalError("contentID may not have more than ${TagStringsAndValues.MAX_LENGTH_CONTENT_ID} characters")
                 TagStringsAndValues.ERROR_CONTENT_ID_TOO_LONG
             }
             else -> TagStringsAndValues.RESULT_SUCCESS
         }
     }
 
-    private fun logFatalError(message: String) {
-        TSMobileAnalyticsBackend.logFatalError("Failed to send tag - $message")
-    }
-
     /**
      * Append a list of category names to a string to use in the request.
      * Example {News, Sports, Football} will generate News/Sports/Football.
diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagHandler.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagHandler.kt
index 269a9b2..6e4616d 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagHandler.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagHandler.kt
@@ -13,6 +13,9 @@ import android.os.Build.VERSION_CODES
 import android.provider.Settings.Secure
 import androidx.activity.ComponentActivity
 import org.json.JSONObject
+import se.kantarsifo.mobileanalytics.framework.Logger.error
+import se.kantarsifo.mobileanalytics.framework.Logger.fatalError
+import se.kantarsifo.mobileanalytics.framework.Logger.log
 import java.io.UnsupportedEncodingException
 import java.net.CookieStore
 import java.net.HttpCookie
@@ -126,7 +129,7 @@ internal class TagHandler(
         try {
             applicationVersion = context.packageManager.getPackageInfo(context.packageName, 0).versionName
         } catch (e: Exception) {
-            TSMobileAnalyticsBackend.logFatalError("Failed to retrieve application version, will not set be set in request header")
+            error("Failed to retrieve application version, will not set be set in request header")
         }
     }
 
@@ -158,7 +161,7 @@ internal class TagHandler(
     }
 
     private fun logFatalError(message: String) {
-        TSMobileAnalyticsBackend.logFatalError("Failed to create URL - $message")
+        fatalError("Failed to create URL - $message")
     }
 
     companion object {
@@ -173,7 +176,7 @@ internal class TagHandler(
                 URLEncoder.encode(input, TagStringsAndValues.URL_ENCODING)
             } catch (e: UnsupportedEncodingException) {
                 // Since encoding UTF-8 is supported by android, this should not happen
-                TSMobileAnalyticsBackend.logMessage("URL-Encoding not supported")
+                log("URL-Encoding not supported")
                 input
             }
         }
@@ -201,9 +204,7 @@ internal class TagHandler(
                 }
                 cookies = CookieHandler.setupPanelistCookies(cookieList)
             } catch (e: PackageManager.NameNotFoundException) {
-                TSMobileAnalyticsBackend.logError(
-                        "Failed to setup panel list cookies - Retry counter = $retryCounter"
-                )
+                error("Failed to setup panel list cookies - Retry counter = $retryCounter")
             }
         }
     }

From a611025c80ef23761ccea41b20454d025e7017a8 Mon Sep 17 00:00:00 2001
From: Morteza Rastgoo <5219339+Morteza-Rastgoo@users.noreply.github.com>
Date: Fri, 3 Sep 2021 11:23:52 +0200
Subject: [PATCH 08/10] Initialize the framework first and Create a queue for
 the tag events

With this change, the library will be initialized but it will wait for the panelist internet app to respond and give us the panelist cookies. Then updates the cookies and the send tag events will be sent with the new cookie.
---
 .../framework/TSMobileAnalyticsBackend.kt     | 109 ++++++------------
 .../framework/TagDataRequestHandler.kt        | 100 ++++++++++++----
 .../mobileanalytics/framework/TagHandler.kt   |  39 ++++---
 3 files changed, 134 insertions(+), 114 deletions(-)

diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TSMobileAnalyticsBackend.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TSMobileAnalyticsBackend.kt
index 72a91a0..86fd035 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TSMobileAnalyticsBackend.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TSMobileAnalyticsBackend.kt
@@ -34,7 +34,7 @@ internal class TSMobileAnalyticsBackend : TSMobileAnalytics {
      * Constructor used internally only.
      * Use createInstance() and getInstance() instead.
      */
-    private constructor(context: Context, activity: ComponentActivity, cpId: String, applicationName: String, cookies: List<HttpCookie>, trackPanelistOnly: Boolean) : super() {
+    private constructor(context: Context, activity: ComponentActivity, cpId: String, applicationName: String, cookies: List<HttpCookie>?, trackPanelistOnly: Boolean) : super() {
         dataRequestHandler = TagDataRequestHandler(context, activity, cpId, applicationName, cookies, trackPanelistOnly)
     }
 
@@ -49,67 +49,49 @@ internal class TSMobileAnalyticsBackend : TSMobileAnalytics {
             val cookieValue = "trackPanelistOnly=$onlyPanelist&isWebViewBased=$isWebBased&sdkVersion=$version"
             val metaCookie = CookieHandler.createHttpCookie(TagStringsAndValues.SIFO_META_COOKIE_NAME, cookieValue)
             CookieHandler.setupPanelistCookies(listOf(metaCookie))
-
-            if (frameworkInstance == null) {
-                if (paramsAreValid(cpID, applicationName)) {
+            if (paramsAreValid(cpID, applicationName)) {
+                if (frameworkInstance == null) {
                     CoroutineScope(Dispatchers.IO).launch {
-                        TSMConfigUtil.syncConfig(activity,applicationName  ?: "")
+                        TSMConfigUtil.syncConfig(activity, applicationName ?: "")
                     }
+
+                    initTags(activity, cpID!!, applicationName!!, onlyPanelist)
+
                     PanelistHandler.syncCookies(activity, activity) {
-                        val requestHandled = initTags(activity, cpID!!, applicationName!!, onlyPanelist)
-                        if (!requestHandled) {
-                            initLegacyTags(activity, cpID, applicationName, onlyPanelist)
-                        }
+                        refreshCookiesAndKeys(activity,onlyPanelist)
+                        frameworkInstance!!.dataRequestHandler.setStateReady()
                     }
-                }
-            } else {
-                logMessage("Mobile Application Tagging Framework already initialized")
-                logMessage("Refreshing panelist keys")
-                val cookies = PanelistHandler.getCookies(activity, activity)
-                if (cookies != null) {
-                    frameworkInstance!!.dataRequestHandler.refreshCookies(activity, cookies)
                 } else {
-                    frameworkInstance!!.dataRequestHandler.refreshCookies(activity, PanelistHandler.getPanelistKey(activity))
+                    log("Mobile Application Tagging Framework already initialized")
+                    refreshCookiesAndKeys(activity, onlyPanelist)
                 }
             }
             return frameworkInstance
         }
 
-        /**
-         * Print text to LogCat following a specific pattern and the tag "MobileAppTagging".
-         *
-         * @param message The message to print.
-         */
-        fun logMessage(message: String) {
-            if (logPrintsActivated) {
-                Log.i("MobileAppTagging", message)
-                Log.i("MobileAppTagging", "***********************************")
-            }
-        }
 
-        /**
-         * Print an error message to LogCat following a specific pattern and the tag "MobileAppTagging"
-         * only if logs are activated.
-         *
-         * @param message The error message.
-         */
-        fun logError(message: String) {
-            if (logPrintsActivated) {
-                Log.e("MobileAppTagging", "***********************************")
-                Log.e("MobileAppTagging", message)
-                Log.e("MobileAppTagging", "***********************************")
+        private fun refreshCookiesAndKeys(activity: ComponentActivity, onlyPanelist: Boolean) {
+            val isInstalled = activity.isPackageInstalled(TagStringsAndValues.SIFO_PANELIST_PACKAGE_NAME_V2)
+            if (!isInstalled) {
+                //TODO: 2021-09-02 Do we need logFatalError when onlyPanelist ==true?
+                //No need to refresh the cookies since there is no panelist app to get the cookies from
+                return
+            }
+            log("Refreshing panelist keys(Cookies)")
+            val cookies = PanelistHandler.getCookies(activity, activity)
+            frameworkInstance!!.dataRequestHandler.apply {
+                if (cookies != null) {
+                    refreshCookies(cookies)
+                } else {
+                    val panelistKey = PanelistHandler.getPanelistKey(activity)
+                    if (onlyPanelist && panelistKey == TagStringsAndValues.NO_PANELIST_ID) {
+                        fatalError("Mobile Application Tagging Framework Failed to initiate - " +
+                                "Panelist Id was not found, it must exist if only panelist tracking is active")
+                        return
+                    }
+                    refreshCookies(panelistKey)
+                }
             }
-        }
-
-        /**
-         * Print an error message to LogCat following a specific pattern and the tag "MobileAppTagging".
-         *
-         * @param message The error message.
-         */
-        fun logFatalError(message: String) {
-            Log.e("MobileAppTagging", "***********************************")
-            Log.e("MobileAppTagging", message)
-            Log.e("MobileAppTagging", "***********************************")
         }
 
         private fun paramsAreValid(cpID: String?, applicationName: String?): Boolean {
@@ -136,35 +118,14 @@ internal class TSMobileAnalyticsBackend : TSMobileAnalytics {
             }
         }
 
+
         private fun initTags(activity: ComponentActivity, cpID: String, applicationName: String, onlyPanelist: Boolean): Boolean {
-            val cookies = PanelistHandler.getCookies(activity, activity) ?: return false
-            if (onlyPanelist && cookies.isEmpty()) {
-                logFatalError("Mobile Application Tagging Framework Failed to initiate - " +
-                        "Cookies file was empty, panelist id not found")
-            } else {
-                frameworkInstance = TSMobileAnalyticsBackend(activity, activity, cpID, applicationName, cookies, onlyPanelist)
-                logMessage("Mobile Application Tagging Framework initiated with the following values " +
+            frameworkInstance = TSMobileAnalyticsBackend(activity, activity, cpID, applicationName, null, onlyPanelist)
+            log("Mobile Application Tagging Framework initiated with the following values " +
                         "\nCPID: $cpID\nApplication name: $applicationName\nOnly panelist tracking : $onlyPanelist")
-            }
             return true
         }
 
-        private fun initLegacyTags(activity: ComponentActivity, cpID: String, applicationName: String, onlyPanelist: Boolean) {
-            val panelistKey = PanelistHandler.getPanelistKey(activity)
-            if (cpID.length != TagStringsAndValues.CPID_LENGTH_CODIGO) {
-                fatalError("Mobile Application Tagging Framework Failed to initiate - " +
-                        "CPID must either be exactly " + TagStringsAndValues.CPID_LENGTH_CODIGO)
-            } else if (onlyPanelist && panelistKey == TagStringsAndValues.NO_PANELIST_ID) {
-                fatalError("Mobile Application Tagging Framework Failed to initiate - " +
-                        "Panelist Id was not found, it must exist if only panelist tracking is active")
-            } else {
-                // TODO print panelist setting
-                frameworkInstance = TSMobileAnalyticsBackend(activity, activity, cpID, applicationName, panelistKey, onlyPanelist)
-                log("Mobile Application Tagging Framework initiated with the following values " +
-                        "\nCPID: $cpID\nApplication name: $applicationName\nOnly panelist tracking : $onlyPanelist")
-            }
-        }
-
     }
 
 }
diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequestHandler.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequestHandler.kt
index 1c1150a..0506a62 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequestHandler.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagDataRequestHandler.kt
@@ -22,6 +22,8 @@ import java.util.concurrent.Executors
  */
 internal class TagDataRequestHandler : TagDataRequestCallbackListener {
 
+    var state = PREPARING
+
     /**
      * Counter keeping track of the number of successful requests.
      */
@@ -71,7 +73,14 @@ internal class TagDataRequestHandler : TagDataRequestCallbackListener {
      * @param applicationName   The name of the application.
      * @param cookies           The list of cookies to send with measurement requests.
      */
-    constructor(context: Context, activity: ComponentActivity, cpId: String, applicationName: String, cookies: List<HttpCookie>, trackPanelistOnly: Boolean) {
+    constructor(
+        context: Context,
+        activity: ComponentActivity,
+        cpId: String,
+        applicationName: String,
+        cookies: List<HttpCookie>?,
+        trackPanelistOnly: Boolean
+    ) {
         tagHandler = TagHandler(context, cpId, applicationName, cookies)
         dataRequestQueue = ArrayList()
         activityForPref = activity
@@ -87,7 +96,14 @@ internal class TagDataRequestHandler : TagDataRequestCallbackListener {
      * @param applicationName   The name of the application.
      * @param panelistKey       The panelist key.
      */
-    constructor(context: Context, activity: ComponentActivity,cpId: String, applicationName: String, panelistKey: String, trackPanelistOnly: Boolean) {
+    constructor(
+        context: Context,
+        activity: ComponentActivity,
+        cpId: String,
+        applicationName: String,
+        panelistKey: String,
+        trackPanelistOnly: Boolean
+    ) {
         tagHandler = TagHandler(context, cpId, applicationName, panelistKey)
         dataRequestQueue = ArrayList()
         activityForPref = activity
@@ -95,12 +111,12 @@ internal class TagDataRequestHandler : TagDataRequestCallbackListener {
         this.trackPanelistOnly = trackPanelistOnly
     }
 
-    fun refreshCookies(context: Context, cookies: List<HttpCookie>) {
-        tagHandler.refresh(context, cookies)
+    fun refreshCookies(cookies: List<HttpCookie>) {
+        tagHandler.refresh(cookies)
     }
 
-    fun refreshCookies(context: Context, panelistKey: String) {
-        tagHandler.refresh(context, panelistKey)
+    fun refreshCookies(panelistKey: String) {
+        tagHandler.refresh(panelistKey)
     }
 
     /**
@@ -115,23 +131,44 @@ internal class TagDataRequestHandler : TagDataRequestCallbackListener {
         val result = checkRequestParams(category, contentID)
         if (result == TagStringsAndValues.RESULT_SUCCESS) {
             val request = TagDataRequest(
-                    category!!,
-                    contentID!!,
-                    getURL(category, contentID),
-                    trackPanelistOnly,
-                    tagHandler.applicationName,
-                    tagHandler.applicationVersion,
-                    this,
-                    userCallbackListener
+                category!!,
+                contentID!!,
+                getURL(category, contentID),
+                trackPanelistOnly,
+                tagHandler.applicationName,
+                tagHandler.applicationVersion,
+                this,
+                userCallbackListener
             )
-            synchronized(this) {
-                dataRequestQueue.add(request)
-                runRequest(request)
-            }
+            log( "Request added to the queue")
+            dataRequestQueue.add(request)
+            runRequestQueue()
         }
         return result
     }
 
+    fun setStateReady() {
+        log( "Lib is ready for logging...")
+        state = READY
+        runRequestQueue()
+    }
+
+    /**
+     * Runs the request queue to send all queued tags
+     */
+    private fun runRequestQueue() {
+        if (state == READY) {
+            if (dataRequestQueue.isNotEmpty()) {
+                runRequestQueueThread()
+            } else {
+                log( "Request queue is empty. Skip it...")
+            }
+        } else {
+            // Wait for the READY state...
+            log( "Waiting for the library to get ready...")
+        }
+    }
+
     /**
      * Send a tag-request to the server.
      *
@@ -227,23 +264,38 @@ internal class TagDataRequestHandler : TagDataRequestCallbackListener {
     /**
      * Init the server request to the specified URL in a new thread.
      */
-    private fun runRequest(request: TagDataRequest) {
-        val thread = RequestThread()
-        thread.request = request
-        threadPool.execute(thread)
+    private fun runRequestQueueThread() {
+        synchronized(dataRequestQueue) {
+            val thread = RequestThread()
+            thread.requests.addAll(dataRequestQueue)
+            dataRequestQueue.clear()
+            threadPool.execute(thread)
+        }
     }
 
     /**
      * A thread to run the request to the server.
      */
     private inner class RequestThread : Runnable {
-        var request: TagDataRequest? = null
+        var requests: MutableList<TagDataRequest> = mutableListOf()
 
         override fun run() {
-            request?.initRequest()
+            log( "Request queue(${requests.size}): STARTED")
+            requests.forEach {
+                log( "Run request: " + it.cat)
+                it.initRequest()
+            }
+            log( "Queue cleared!")
         }
     }
 
+    /**
+     * Holds states of the handler
+     */
+    enum class State {
+        PREPARING, READY,
+    }
+
     companion object {
         /**
          * The maximum number of simultaneous request threads.
diff --git a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagHandler.kt b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagHandler.kt
index 6e4616d..80e0b4e 100644
--- a/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagHandler.kt
+++ b/libmobiletagging/src/main/java/se/kantarsifo/mobileanalytics/framework/TagHandler.kt
@@ -30,10 +30,10 @@ import java.net.URLEncoder
  *
  */
 internal class TagHandler(
-        context: Context,
-        private val cpId: String,
-        ref: String,
-        cookies: List<HttpCookie>
+    val context: Context,
+    private val cpId: String,
+    ref: String,
+    cookies: List<HttpCookie>?
 ) {
 
     var applicationName: String = ref
@@ -53,17 +53,17 @@ internal class TagHandler(
 
     init {
         generateEuId(context)
-        initCookies(context, cookies)
+        cookies?.let { initCookies(it) }
         getApplicationVersion(context)
     }
 
-    fun refresh(context: Context, panelistKey: String?) {
+    fun refresh(panelistKey: String?) {
         val cookies = CookieHandler.createLegacyCookies(panelistKey)
-        initCookies(context, cookies)
+        initCookies(cookies)
     }
 
-    fun refresh(context: Context, cookies: List<HttpCookie>) {
-        initCookies(context, cookies)
+    fun refresh(cookies: List<HttpCookie>) {
+        initCookies(cookies)
     }
 
     /**
@@ -107,13 +107,16 @@ internal class TagHandler(
     }
 
     private fun fetchUrl(activity: ComponentActivity?): String {
-        val json = activity?.getSharedPreferences(TagStringsAndValues.SIFO_PREFERENCE_KEY, Context.MODE_PRIVATE)?.getString(TagStringsAndValues.SIFO_PREFERENCE_CONFIG, "")
+        val json = activity?.getSharedPreferences(
+            TagStringsAndValues.SIFO_PREFERENCE_KEY,
+            Context.MODE_PRIVATE
+        )?.getString(TagStringsAndValues.SIFO_PREFERENCE_CONFIG, "")
         if (json.isNullOrEmpty()) {
             return TagStringsAndValues.SIFO_DEFAULT_CONFIG
         }
         var savedUrl = ""
         try {
-            savedUrl =  JSONObject(json).getString("BaseMeasurementAddress")
+            savedUrl = JSONObject(json).getString("BaseMeasurementAddress")
         } catch (e: Exception) {
 
         }
@@ -127,13 +130,14 @@ internal class TagHandler(
 
     private fun getApplicationVersion(context: Context) {
         try {
-            applicationVersion = context.packageManager.getPackageInfo(context.packageName, 0).versionName
+            applicationVersion =
+                context.packageManager.getPackageInfo(context.packageName, 0).versionName
         } catch (e: Exception) {
             error("Failed to retrieve application version, will not set be set in request header")
         }
     }
 
-    private fun initCookies(context: Context, cookieList: List<HttpCookie>) {
+    private fun initCookies(cookieList: List<HttpCookie>) {
         val setupPanelListCookies = SetupPanelListCookies(context, cookieList)
         setupPanelListCookies.run()
     }
@@ -189,8 +193,8 @@ internal class TagHandler(
      * @See <a https:></a>//code.google.com/p/chromium/issues/detail?id=506369">chromium Issue tracking
      */
     private inner class SetupPanelListCookies(
-            private val context: Context,
-            private val cookieList: List<HttpCookie>
+        private val context: Context,
+        private val cookieList: List<HttpCookie>
     ) : Runnable {
 
         private val systemWebViewPackageName = "com.google.android.webview"
@@ -200,7 +204,10 @@ internal class TagHandler(
         override fun run() {
             try {
                 if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && retryCounter++ < maxWebViewPackageRetry) {
-                    context.packageManager.getPackageInfo(systemWebViewPackageName, PackageManager.GET_ACTIVITIES)
+                    context.packageManager.getPackageInfo(
+                        systemWebViewPackageName,
+                        PackageManager.GET_ACTIVITIES
+                    )
                 }
                 cookies = CookieHandler.setupPanelistCookies(cookieList)
             } catch (e: PackageManager.NameNotFoundException) {

From faeb704173d00b58c8e88722d484f05948bc9644 Mon Sep 17 00:00:00 2001
From: Morteza Rastgoo <5219339+Morteza-Rastgoo@users.noreply.github.com>
Date: Tue, 7 Sep 2021 15:27:27 +0200
Subject: [PATCH 09/10] Update the README.md to inform about the react-native
 bug

---
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.md b/README.md
index ca2d655..9e22d82 100644
--- a/README.md
+++ b/README.md
@@ -224,6 +224,19 @@ if (TSMobileAnalytics.getInstance() != null) {
 
 This method will allow third-party cookies.
 
+If you have a `react-native` project, there is a [known bug](https://github.com/facebook/react-native/commit/29249e19bd9cb4de8cb5b00edcd17f2c49d0d02c#diff-5eeea7cc5d0049418255078dfb3555cdbc3fc02e370392f4b6a31dd831720270) that doesn't let the SDK work properly. This is how you can fix it until it is resolved in the main react-native repo:
+
+```
+   //>>>>> ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java
+
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
+    mDelegate.onActivityResult(requestCode, resultCode, data);
+  }
+
+```
+
 
 ## Debugging 
 There are several more advanced functions in the framework. The purpose of them is to help out if there are any problems or issues with the tagging that needs to be traced. It is possible to get information about pending requests and to subscribe on notifications when a tag request has completed or failed, and more. To see some examples on how to use these functions, have a look at the source code for the test application.

From 59e5ff0ca839f0931784d446d89539865b6b4a0d Mon Sep 17 00:00:00 2001
From: Morteza Rastgoo <5219339+Morteza-Rastgoo@users.noreply.github.com>
Date: Tue, 7 Sep 2021 15:55:16 +0200
Subject: [PATCH 10/10] Version 4.1.0

---
 libmobiletagging/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmobiletagging/build.gradle b/libmobiletagging/build.gradle
index 21bccf2..852ef2e 100644
--- a/libmobiletagging/build.gradle
+++ b/libmobiletagging/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 
 group='myGroups'
 
-version = "4.0.1"
+version = "4.1.0"
 
 
 android {