From ba0790e3bf6910628f81febb6de7d457a62adefa Mon Sep 17 00:00:00 2001
From: "yingying.chen" <yingying.chen@smartbear.com>
Date: Tue, 11 Jul 2023 11:18:00 +0100
Subject: [PATCH] fix(config): reset persistUser default value to true

---
 CHANGELOG.md                                                   | 3 +++
 .../java/com/bugsnag/android/ManifestConfigLoaderTest.kt       | 2 +-
 .../src/main/java/com/bugsnag/android/ConfigInternal.kt        | 2 +-
 .../test/java/com/bugsnag/android/ConfigurationFacadeTest.java | 3 ++-
 features/full_tests/in_foreground.feature                      | 1 +
 features/full_tests/native_event_tracking.feature              | 1 +
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe4891c80d..1d8e8a661e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@
 * Added `Session.apiKey` so that it can be changed in an `OnSessionCallback`
   [#1855](https://github.com/bugsnag/bugsnag-android/pull/1855)
 
+* Configuration.persistUser is now true by default, matching the configuration of other platforms.
+  [#1863](https://github.com/bugsnag/bugsnag-android/pull/1863)
+
 ### Bug fixes
 
 * Prevent rare app crash while migrating old `SharedPreferences` data from older versions of `bugsnag-android`
diff --git a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ManifestConfigLoaderTest.kt b/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ManifestConfigLoaderTest.kt
index d45de42725..f46785d60c 100644
--- a/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ManifestConfigLoaderTest.kt
+++ b/bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ManifestConfigLoaderTest.kt
@@ -29,7 +29,7 @@ class ManifestConfigLoaderTest {
             assertTrue(autoDetectErrors)
             assertTrue(autoTrackSessions)
             assertEquals(ThreadSendPolicy.ALWAYS, sendThreads)
-            assertFalse(persistUser)
+            assertTrue(persistUser)
 
             // endpoints
             assertEquals(endpoints.notify, "https://notify.bugsnag.com")
diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ConfigInternal.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/ConfigInternal.kt
index bd1e449895..62f96959c5 100644
--- a/bugsnag-android-core/src/main/java/com/bugsnag/android/ConfigInternal.kt
+++ b/bugsnag-android-core/src/main/java/com/bugsnag/android/ConfigInternal.kt
@@ -23,7 +23,7 @@ internal class ConfigInternal(
     var versionCode: Int? = 0
     var releaseStage: String? = null
     var sendThreads: ThreadSendPolicy = ThreadSendPolicy.ALWAYS
-    var persistUser: Boolean = false
+    var persistUser: Boolean = true
 
     var launchDurationMillis: Long = DEFAULT_LAUNCH_CRASH_THRESHOLD_MS
 
diff --git a/bugsnag-android-core/src/test/java/com/bugsnag/android/ConfigurationFacadeTest.java b/bugsnag-android-core/src/test/java/com/bugsnag/android/ConfigurationFacadeTest.java
index 134d2a75ba..5841d60876 100644
--- a/bugsnag-android-core/src/test/java/com/bugsnag/android/ConfigurationFacadeTest.java
+++ b/bugsnag-android-core/src/test/java/com/bugsnag/android/ConfigurationFacadeTest.java
@@ -87,8 +87,9 @@ public void sendThreadsInvalid() {
 
     @Test
     public void persistUserValid() {
-        config.setPersistUser(true);
         assertTrue(config.impl.getPersistUser());
+        config.setPersistUser(false);
+        assertFalse(config.impl.getPersistUser());
     }
 
     @SuppressWarnings("deprecation")
diff --git a/features/full_tests/in_foreground.feature b/features/full_tests/in_foreground.feature
index a980ab02ca..86ffc7b32b 100644
--- a/features/full_tests/in_foreground.feature
+++ b/features/full_tests/in_foreground.feature
@@ -3,6 +3,7 @@ Feature: In foreground field populates correctly
   Background:
     Given I clear all persistent data
 
+  @skip_android_13
   Scenario: Test handled exception in background
     When I run "InForegroundScenario"
     And I send the app to the background for 5 seconds
diff --git a/features/full_tests/native_event_tracking.feature b/features/full_tests/native_event_tracking.feature
index 6ad6e58a02..5b66de92d2 100644
--- a/features/full_tests/native_event_tracking.feature
+++ b/features/full_tests/native_event_tracking.feature
@@ -12,6 +12,7 @@ Feature: Synchronizing app/device metadata in the native layer
     And the event "unhandled" is false
     And the "codeIdentifier" of stack frame 0 is not null
 
+  @skip
   Scenario: Capture foreground state while in the background
     When I run "CXXBackgroundNotifyScenario"
     And I send the app to the background for 5 seconds