From 12e53bf5b066409df4f50ac6017a58d346c4455f Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Mon, 29 Nov 2021 14:55:55 +0000
Subject: [PATCH 1/8] dep: bump compileSdkVersion to 31

---
 CHANGELOG.md                                           |  9 ++++++++-
 bugsnag-benchmarks/build.gradle                        |  2 +-
 .../src/main/kotlin/com/bugsnag/android/Versions.kt    |  2 +-
 dockerfiles/Dockerfile.android-common                  |  2 +-
 examples/sdk-app-example/app/build.gradle              |  4 ++--
 .../sdk-app-example/app/src/main/AndroidManifest.xml   |  3 ++-
 features/fixtures/mazerunner/app/build.gradle          |  6 +++---
 .../mazerunner/app/src/main/AndroidManifest.xml        | 10 ++++++++--
 .../com/bugsnag/android/mazerunner/MainActivity.kt     |  7 +++++--
 .../mazerunner/cxx-scenarios-bugsnag/build.gradle      |  2 +-
 .../fixtures/mazerunner/cxx-scenarios/build.gradle     |  2 +-
 .../fixtures/mazerunner/jvm-scenarios/build.gradle     |  2 +-
 features/fixtures/minimalapp/app/build.gradle          |  4 ++--
 13 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a91d27c8e2..cf896ea6c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,15 @@
 # Changelog
 
+## TBD
+
+### Enhancements
+
+* Bump compileSdkVersion to apiLevel 31
+  [#1536](https://github.com/bugsnag/bugsnag-android/pull/1536)
+
 ## 5.16.0 (2021-11-29)
 
-## Bug fixes
+### Bug fixes
 
 * Increase resilience of NDK stackframe method capture
   [#1484](https://github.com/bugsnag/bugsnag-android/pull/1484)
diff --git a/bugsnag-benchmarks/build.gradle b/bugsnag-benchmarks/build.gradle
index bc1c73ec2a..3c7a3b956c 100644
--- a/bugsnag-benchmarks/build.gradle
+++ b/bugsnag-benchmarks/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     compileOptions {
diff --git a/buildSrc/src/main/kotlin/com/bugsnag/android/Versions.kt b/buildSrc/src/main/kotlin/com/bugsnag/android/Versions.kt
index 274a773336..0488f8f48b 100644
--- a/buildSrc/src/main/kotlin/com/bugsnag/android/Versions.kt
+++ b/buildSrc/src/main/kotlin/com/bugsnag/android/Versions.kt
@@ -8,7 +8,7 @@ import org.gradle.api.JavaVersion
 object Versions {
     // Note minSdkVersion must be >=21 for 64 bit architectures
     val minSdkVersion = 14
-    val compileSdkVersion = 30
+    val compileSdkVersion = 31
     val ndk = "17.2.4988734"
     val java = JavaVersion.VERSION_1_7
     val kotlin = "1.3.72"
diff --git a/dockerfiles/Dockerfile.android-common b/dockerfiles/Dockerfile.android-common
index a306c81e96..8352ec64a9 100644
--- a/dockerfiles/Dockerfile.android-common
+++ b/dockerfiles/Dockerfile.android-common
@@ -27,7 +27,7 @@ RUN rm $CMDLINE_TOOLS_NAME
 
 # Install Android tools using sdkmanager
 RUN yes | sdkmanager "platform-tools" > /dev/null
-RUN yes | sdkmanager "platforms;android-30" > /dev/null
+RUN yes | sdkmanager "platforms;android-31" > /dev/null
 RUN yes | sdkmanager "ndk;17.2.4988734" > /dev/null
 RUN yes | sdkmanager "cmake;3.6.4111459" > /dev/null
 RUN yes | sdkmanager "cmake;3.10.2.4988404" > /dev/null
diff --git a/examples/sdk-app-example/app/build.gradle b/examples/sdk-app-example/app/build.gradle
index 3baeb10330..c910a5523b 100644
--- a/examples/sdk-app-example/app/build.gradle
+++ b/examples/sdk-app-example/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     ndkVersion "17.2.4988734"
 
     defaultConfig {
         applicationId "com.example.bugsnag.android"
         minSdkVersion 14
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
diff --git a/examples/sdk-app-example/app/src/main/AndroidManifest.xml b/examples/sdk-app-example/app/src/main/AndroidManifest.xml
index 06c094be6a..9e3bd6979b 100644
--- a/examples/sdk-app-example/app/src/main/AndroidManifest.xml
+++ b/examples/sdk-app-example/app/src/main/AndroidManifest.xml
@@ -18,7 +18,8 @@
 
         <activity
             android:name=".ExampleActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/features/fixtures/mazerunner/app/build.gradle b/features/fixtures/mazerunner/app/build.gradle
index 6518fb6a64..0c017ec2e1 100644
--- a/features/fixtures/mazerunner/app/build.gradle
+++ b/features/fixtures/mazerunner/app/build.gradle
@@ -4,11 +4,11 @@ apply plugin: "io.gitlab.arturbosch.detekt"
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 34
         versionName "1.1.14"
         manifestPlaceholders = [
@@ -55,7 +55,7 @@ android {
         pickFirst "**/*.so"
     }
     lintOptions {
-        tasks.lint.enabled = false
+        abortOnError false
     }
 
     if (project.hasProperty("TEST_FIXTURE_NDK_VERSION")) {
diff --git a/features/fixtures/mazerunner/app/src/main/AndroidManifest.xml b/features/fixtures/mazerunner/app/src/main/AndroidManifest.xml
index e4863cdaa8..d706541504 100644
--- a/features/fixtures/mazerunner/app/src/main/AndroidManifest.xml
+++ b/features/fixtures/mazerunner/app/src/main/AndroidManifest.xml
@@ -10,14 +10,20 @@
         android:gwpAsanMode="always"
         android:name=".MazerunnerApp"
         >
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
 
             </intent-filter>
         </activity>
-        <activity android:name=".SecondActivity">
+        <activity
+            android:name=".SecondActivity"
+            android:exported="true"
+            >
             <intent-filter>
                 <action android:name="com.bugsnag.android.mazerunner.UPDATE_CONTEXT" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/features/fixtures/mazerunner/app/src/main/java/com/bugsnag/android/mazerunner/MainActivity.kt b/features/fixtures/mazerunner/app/src/main/java/com/bugsnag/android/mazerunner/MainActivity.kt
index 970cfed960..7bdf76f962 100644
--- a/features/fixtures/mazerunner/app/src/main/java/com/bugsnag/android/mazerunner/MainActivity.kt
+++ b/features/fixtures/mazerunner/app/src/main/java/com/bugsnag/android/mazerunner/MainActivity.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.os.Build
 import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
@@ -24,8 +25,10 @@ class MainActivity : Activity() {
         prefs = getPreferences(Context.MODE_PRIVATE)
 
         // Attempt to dismiss any system dialogs (such as "MazeRunner crashed")
-        val closeDialog = Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)
-        sendBroadcast(closeDialog)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+            val closeDialog = Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)
+            sendBroadcast(closeDialog)
+        }
 
         // load the scenario first, which initialises bugsnag without running any crashy code
         findViewById<Button>(R.id.start_bugsnag).setOnClickListener {
diff --git a/features/fixtures/mazerunner/cxx-scenarios-bugsnag/build.gradle b/features/fixtures/mazerunner/cxx-scenarios-bugsnag/build.gradle
index d0b64e3456..97f7fdfc60 100644
--- a/features/fixtures/mazerunner/cxx-scenarios-bugsnag/build.gradle
+++ b/features/fixtures/mazerunner/cxx-scenarios-bugsnag/build.gradle
@@ -7,7 +7,7 @@ apply plugin: "io.gitlab.arturbosch.detekt"
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 14
diff --git a/features/fixtures/mazerunner/cxx-scenarios/build.gradle b/features/fixtures/mazerunner/cxx-scenarios/build.gradle
index 6e102a468f..ff42a00443 100644
--- a/features/fixtures/mazerunner/cxx-scenarios/build.gradle
+++ b/features/fixtures/mazerunner/cxx-scenarios/build.gradle
@@ -7,7 +7,7 @@ apply plugin: "io.gitlab.arturbosch.detekt"
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 14
diff --git a/features/fixtures/mazerunner/jvm-scenarios/build.gradle b/features/fixtures/mazerunner/jvm-scenarios/build.gradle
index 428590dd53..3d7477944d 100644
--- a/features/fixtures/mazerunner/jvm-scenarios/build.gradle
+++ b/features/fixtures/mazerunner/jvm-scenarios/build.gradle
@@ -7,7 +7,7 @@ apply plugin: "io.gitlab.arturbosch.detekt"
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 14
diff --git a/features/fixtures/minimalapp/app/build.gradle b/features/fixtures/minimalapp/app/build.gradle
index fef1210f8e..3ca67dd4b3 100644
--- a/features/fixtures/minimalapp/app/build.gradle
+++ b/features/fixtures/minimalapp/app/build.gradle
@@ -9,12 +9,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.bugsnag.android.minimalapp"
         minSdkVersion 14
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

From e051794bc6a0025044877301de3241b1bf7cbab8 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Wed, 1 Dec 2021 11:27:37 +0000
Subject: [PATCH 2/8] fix: flush in memory session first

---
 CHANGELOG.md                                                 | 5 +++++
 .../src/main/java/com/bugsnag/android/SessionTracker.java    | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf896ea6c5..7d1e92e27e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@
 * Bump compileSdkVersion to apiLevel 31
   [#1536](https://github.com/bugsnag/bugsnag-android/pull/1536)
 
+### Bug fixes
+
+* Flush in-memory sessions first
+  [#1538](https://github.com/bugsnag/bugsnag-android/pull/1538)
+
 ## 5.16.0 (2021-11-29)
 
 ### Bug fixes
diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTracker.java b/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTracker.java
index 343e6ee9cc..2a5e95c7f1 100644
--- a/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTracker.java
+++ b/bugsnag-android-core/src/main/java/com/bugsnag/android/SessionTracker.java
@@ -181,12 +181,10 @@ private boolean trackSessionIfNeeded(final Session session) {
         if (deliverSession && session.isTracked().compareAndSet(false, true)) {
             currentSession = session;
             notifySessionStartObserver(session);
-            flushAsync();
             flushInMemorySession(session);
-
+            flushAsync();
             return true;
         }
-
         return false;
     }
 

From 749842ea37ea30010f26f962089c65013cf73707 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Wed, 1 Dec 2021 14:03:34 +0000
Subject: [PATCH 3/8] fix: avoid duplicate connectivity breadcrumb

---
 CHANGELOG.md                                  |  3 ++
 .../com/bugsnag/android/ConnectivityCompat.kt | 35 ++++++++++++----
 .../bugsnag/android/ConnectivityApi24Test.kt  | 42 +++++++++++++++++--
 features/steps/android_steps.rb               |  4 +-
 4 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d1e92e27e..62b4a1802b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,9 @@
 * Flush in-memory sessions first
   [#1538](https://github.com/bugsnag/bugsnag-android/pull/1538)
 
+* Avoid unnecessary network connectivity change breadcrumb
+  [#1540](https://github.com/bugsnag/bugsnag-android/pull/1540)
+
 ## 5.16.0 (2021-11-29)
 
 ### Bug fixes
diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt
index ad34e0b423..f256ef116f 100644
--- a/bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt
+++ b/bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt
@@ -9,6 +9,9 @@ import android.net.Network
 import android.net.NetworkCapabilities
 import android.os.Build
 import androidx.annotation.RequiresApi
+import androidx.annotation.VisibleForTesting
+import com.bugsnag.android.UnknownConnectivity.retrieveNetworkAccessState
+import java.util.concurrent.atomic.AtomicBoolean
 
 internal typealias NetworkChangeCallback = (hasConnection: Boolean, networkState: String) -> Unit
 
@@ -89,8 +92,10 @@ internal class ConnectivityLegacy(
         }
     }
 
-    private inner class ConnectivityChangeReceiver(private val cb: NetworkChangeCallback?) :
-        BroadcastReceiver() {
+    private inner class ConnectivityChangeReceiver(
+        private val cb: NetworkChangeCallback?
+    ) : BroadcastReceiver() {
+
         override fun onReceive(context: Context, intent: Intent) {
             cb?.invoke(hasNetworkConnection(), retrieveNetworkAccessState())
         }
@@ -122,22 +127,38 @@ internal class ConnectivityApi24(
         }
     }
 
-    private inner class ConnectivityTrackerCallback(private val cb: NetworkChangeCallback?) :
-        ConnectivityManager.NetworkCallback() {
+    @VisibleForTesting
+    internal class ConnectivityTrackerCallback(
+        private val cb: NetworkChangeCallback?
+    ) : ConnectivityManager.NetworkCallback() {
+
+        private val receivedFirstCallback = AtomicBoolean(false)
+
         override fun onUnavailable() {
             super.onUnavailable()
-            cb?.invoke(false, retrieveNetworkAccessState())
+            invokeNetworkCallback(false)
         }
 
         override fun onAvailable(network: Network) {
             super.onAvailable(network)
-            cb?.invoke(true, retrieveNetworkAccessState())
+            invokeNetworkCallback(true)
+        }
+
+        /**
+         * Invokes the network callback, as long as the ConnectivityManager callback has been
+         * triggered at least once before (when setting a NetworkCallback Android always
+         * invokes the callback with the current network state).
+         */
+        private fun invokeNetworkCallback(hasConnection: Boolean) {
+            if (receivedFirstCallback.getAndSet(true)) {
+                cb?.invoke(hasConnection, retrieveNetworkAccessState())
+            }
         }
     }
 }
 
 /**
- * Connectivity used in cases where we cannot access the system  ConnectivityManager.
+ * Connectivity used in cases where we cannot access the system ConnectivityManager.
  * We assume that there is some sort of network and do not attempt to report any network changes.
  */
 internal object UnknownConnectivity : Connectivity {
diff --git a/bugsnag-android-core/src/test/java/com/bugsnag/android/ConnectivityApi24Test.kt b/bugsnag-android-core/src/test/java/com/bugsnag/android/ConnectivityApi24Test.kt
index b5a9be7a63..d39e75f94c 100644
--- a/bugsnag-android-core/src/test/java/com/bugsnag/android/ConnectivityApi24Test.kt
+++ b/bugsnag-android-core/src/test/java/com/bugsnag/android/ConnectivityApi24Test.kt
@@ -1,5 +1,3 @@
-@file:Suppress("DEPRECATION")
-
 package com.bugsnag.android
 
 import android.content.Context
@@ -31,7 +29,7 @@ class ConnectivityApi24Test {
     lateinit var capabilities: NetworkCapabilities
 
     @Test
-    fun connectivityLegacyHasConnection() {
+    fun connectivityApi24HasConnection() {
         val conn = ConnectivityApi24(cm, null)
         assertFalse(conn.hasNetworkConnection())
         Mockito.`when`(cm.activeNetwork).thenReturn(info)
@@ -39,7 +37,7 @@ class ConnectivityApi24Test {
     }
 
     @Test
-    fun connectivityLegacyNetworkState() {
+    fun connectivityApi24NetworkState() {
         val conn = ConnectivityApi24(cm, null)
         Mockito.`when`(cm.activeNetwork).thenReturn(info)
 
@@ -50,4 +48,40 @@ class ConnectivityApi24Test {
         Mockito.`when`(capabilities.hasTransport(0)).thenReturn(true)
         assertEquals("cellular", conn.retrieveNetworkAccessState())
     }
+
+    @Test
+    fun connectivityApi24OnAvailable() {
+        var count = 0
+        val tracker = ConnectivityApi24.ConnectivityTrackerCallback { _, _ ->
+            count++
+        }
+        assertEquals(0, count)
+
+        tracker.onAvailable(info)
+        assertEquals(0, count)
+
+        tracker.onAvailable(info)
+        assertEquals(1, count)
+
+        tracker.onAvailable(info)
+        assertEquals(2, count)
+    }
+
+    @Test
+    fun connectivityApi24OnUnvailable() {
+        var count = 0
+        val tracker = ConnectivityApi24.ConnectivityTrackerCallback { _, _ ->
+            count++
+        }
+        assertEquals(0, count)
+
+        tracker.onUnavailable()
+        assertEquals(0, count)
+
+        tracker.onUnavailable()
+        assertEquals(1, count)
+
+        tracker.onUnavailable()
+        assertEquals(2, count)
+    }
 }
diff --git a/features/steps/android_steps.rb b/features/steps/android_steps.rb
index 27052bf386..97e3549622 100644
--- a/features/steps/android_steps.rb
+++ b/features/steps/android_steps.rb
@@ -276,11 +276,9 @@ def click_if_present(element)
 # which results in multiple similar log messages
 Then("Bugsnag confirms it has no errors to send") do
   steps %Q{
-    And I wait to receive 3 logs
+    And I wait to receive 2 logs
     Then the "debug" level log message equals "No startupcrash events to flush to Bugsnag."
     And I discard the oldest log
     Then the "debug" level log message equals "No regular events to flush to Bugsnag."
-    And I discard the oldest log
-    Then the "debug" level log message equals "No regular events to flush to Bugsnag."
   }
 end

From 6dd24de8c7296bad90750499e805a56db20412ba Mon Sep 17 00:00:00 2001
From: Karl Stenerud <kstenerud@gmail.com>
Date: Wed, 1 Dec 2021 14:59:12 +0100
Subject: [PATCH 4/8] Use signal stack unwinding mechanism when unwinding an
 ANR

---
 .../java/com/bugsnag/android/AnrPlugin.kt     |  2 +-
 .../java/com/bugsnag/android/NdkPlugin.kt     |  4 +--
 .../com/bugsnag/android/ndk/NativeBridge.kt   |  2 +-
 .../src/main/jni/bugsnag.c                    | 10 -------
 .../src/main/jni/bugsnag_ndk.c                | 29 +++++++++++++++----
 .../src/main/jni/bugsnag_ndk.h                |  4 +++
 6 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt b/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt
index ab45e5907d..f2bcb924c2 100644
--- a/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt
+++ b/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt
@@ -78,7 +78,7 @@ internal class AnrPlugin : Plugin {
         if (clz != null) {
             val ndkPlugin = client.getPlugin(clz)
             if (ndkPlugin != null) {
-                val method = ndkPlugin.javaClass.getMethod("getUnwindStackFunction")
+                val method = ndkPlugin.javaClass.getMethod("getSignalUnwindStackFunction")
 
                 @Suppress("UNCHECKED_CAST")
                 val function = method.invoke(ndkPlugin) as Long
diff --git a/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/NdkPlugin.kt b/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/NdkPlugin.kt
index 88846ea784..75492299d8 100644
--- a/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/NdkPlugin.kt
+++ b/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/NdkPlugin.kt
@@ -64,10 +64,10 @@ internal class NdkPlugin : Plugin {
         }
     }
 
-    fun getUnwindStackFunction(): Long {
+    fun getSignalUnwindStackFunction(): Long {
         val bridge = nativeBridge
         if (bridge != null) {
-            return bridge.getUnwindStackFunction()
+            return bridge.getSignalUnwindStackFunction()
         }
         return 0
     }
diff --git a/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.kt b/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.kt
index f67098e537..101b47787b 100644
--- a/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.kt
+++ b/bugsnag-plugin-android-ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.kt
@@ -76,7 +76,7 @@ class NativeBridge : StateObserver {
     external fun updateUserId(newValue: String)
     external fun updateUserEmail(newValue: String)
     external fun updateUserName(newValue: String)
-    external fun getUnwindStackFunction(): Long
+    external fun getSignalUnwindStackFunction(): Long
     external fun updateLowMemory(newValue: Boolean, memoryTrimLevelDescription: String)
 
     override fun onStateChange(event: StateEvent) {
diff --git a/bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c
index 4c982ff472..5a51da2f9c 100644
--- a/bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c
+++ b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c
@@ -335,13 +335,3 @@ exit : {
   bsg_safe_delete_local_ref(env, jtype);
   bsg_safe_delete_local_ref(env, jmessage);
 }
-
-// Unwind the stack using the default unwind style.
-// This function gets exposed via
-// Java_com_bugsnag_android_ndk_NativeBridge_getUnwindStackFunction()
-ssize_t
-bsg_unwind_stack_default(bugsnag_stackframe stacktrace[BUGSNAG_FRAMES_MAX],
-                         siginfo_t *info, void *user_context) __asyncsafe {
-  return bsg_unwind_stack(bsg_configured_unwind_style(), stacktrace, info,
-                          user_context);
-}
diff --git a/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.c b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.c
index 350e2d0d4a..8b1f5514f1 100644
--- a/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.c
+++ b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.c
@@ -43,6 +43,17 @@ bsg_unwinder bsg_configured_unwind_style() {
   return BSG_CUSTOM_UNWIND;
 }
 
+/**
+ * Get the configured unwind style for async-safe environments such as signal
+ * handlers.
+ */
+bsg_unwinder bsg_configured_signal_unwind_style() {
+  if (bsg_global_env != NULL)
+    return bsg_global_env->signal_unwind_style;
+
+  return BSG_CUSTOM_UNWIND;
+}
+
 void bugsnag_add_on_error(bsg_on_error on_error) {
   if (bsg_global_env != NULL) {
     bsg_global_env->on_error = on_error;
@@ -698,14 +709,20 @@ JNIEXPORT void JNICALL Java_com_bugsnag_android_ndk_NativeBridge_updateMetadata(
   bsg_release_env_write_lock();
 }
 
-ssize_t
-bsg_unwind_stack_default(bugsnag_stackframe stacktrace[BUGSNAG_FRAMES_MAX],
-                         siginfo_t *info, void *user_context) __asyncsafe;
+// Unwind the stack using the configured unwind style for signal handlers.
+// This function gets exposed via
+// Java_com_bugsnag_android_ndk_NativeBridge_getSignalUnwindStackFunction()
+static ssize_t
+bsg_unwind_stack_signal(bugsnag_stackframe stacktrace[BUGSNAG_FRAMES_MAX],
+                        siginfo_t *info, void *user_context) __asyncsafe {
+  return bsg_unwind_stack(bsg_configured_signal_unwind_style(), stacktrace,
+                          info, user_context);
+}
 
 JNIEXPORT jlong JNICALL
-Java_com_bugsnag_android_ndk_NativeBridge_getUnwindStackFunction(JNIEnv *env,
-                                                                 jobject thiz) {
-  return (jlong)bsg_unwind_stack_default;
+Java_com_bugsnag_android_ndk_NativeBridge_getSignalUnwindStackFunction(
+    JNIEnv *env, jobject thiz) {
+  return (jlong)bsg_unwind_stack_signal;
 }
 
 #ifdef __cplusplus
diff --git a/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.h b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.h
index 1dd7056a77..12e880611d 100644
--- a/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.h
+++ b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag_ndk.h
@@ -81,6 +81,10 @@ typedef struct {
   bsg_thread_send_policy send_threads;
 } bsg_environment;
 
+/**
+ * Get the configured unwind style for non-async-safe environments.
+ * DO NOT USE THIS IN A SIGNAL HANDLER!
+ */
 bsg_unwinder bsg_configured_unwind_style();
 
 /**

From e0e45e5ca8ae984f1502649d736b124aeb81b1f0 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Thu, 2 Dec 2021 10:56:41 +0000
Subject: [PATCH 5/8] chore: bump example app dependencies

---
 examples/sdk-app-example/app/build.gradle | 4 ++--
 examples/sdk-app-example/build.gradle     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/sdk-app-example/app/build.gradle b/examples/sdk-app-example/app/build.gradle
index c910a5523b..679f631de4 100644
--- a/examples/sdk-app-example/app/build.gradle
+++ b/examples/sdk-app-example/app/build.gradle
@@ -38,9 +38,9 @@ android {
 }
 
 dependencies {
-    implementation "com.bugsnag:bugsnag-android:5.12.0"
+    implementation "com.bugsnag:bugsnag-android:5.16.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation "androidx.appcompat:appcompat:1.4.0"
     implementation "com.google.android.material:material:1.4.0"
 }
 
diff --git a/examples/sdk-app-example/build.gradle b/examples/sdk-app-example/build.gradle
index 6fd8052a3d..3a747a3e3c 100644
--- a/examples/sdk-app-example/build.gradle
+++ b/examples/sdk-app-example/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
+        classpath "com.android.tools.build:gradle:7.0.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.bugsnag:bugsnag-android-gradle-plugin:7.0.0"
+        classpath "com.bugsnag:bugsnag-android-gradle-plugin:7.1.0"
     }
 }
 

From 11c4bd948952b55b76cbef3729fd9982aed1e184 Mon Sep 17 00:00:00 2001
From: Jason <jason.morris@bugsnag.com>
Date: Fri, 3 Dec 2021 11:22:32 +0000
Subject: [PATCH 6/8] fix(notify): clear the stack-trace memory to avoid UTF-8
 encoding errors in `bugsnag_notify_env` [full ci]

---
 CHANGELOG.md                                     |  3 +++
 .../src/main/jni/bugsnag.c                       |  1 +
 .../src/main/cpp/cxx-scenarios-bugsnag.cpp       | 16 ++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62b4a1802b..ecc0f4ce4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@
 * Avoid unnecessary network connectivity change breadcrumb
   [#1540](https://github.com/bugsnag/bugsnag-android/pull/1540)
 
+* Clear native stacktrace memory in `bugsnag_notify_env` before attempting to unwind the stack
+  [#1543](https://github.com/bugsnag/bugsnag-android/pull/1543)
+
 ## 5.16.0 (2021-11-29)
 
 ### Bug fixes
diff --git a/bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c
index 5a51da2f9c..71ec27bdc4 100644
--- a/bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c
+++ b/bugsnag-plugin-android-ndk/src/main/jni/bugsnag.c
@@ -132,6 +132,7 @@ void bugsnag_notify_env(JNIEnv *env, const char *name, const char *message,
   jbyteArray jmessage = NULL;
 
   bugsnag_stackframe stacktrace[BUGSNAG_FRAMES_MAX];
+  memset(stacktrace, 0, sizeof(stacktrace));
   ssize_t frame_count =
       bsg_unwind_stack(bsg_configured_unwind_style(), stacktrace, NULL, NULL);
 
diff --git a/features/fixtures/mazerunner/cxx-scenarios-bugsnag/src/main/cpp/cxx-scenarios-bugsnag.cpp b/features/fixtures/mazerunner/cxx-scenarios-bugsnag/src/main/cpp/cxx-scenarios-bugsnag.cpp
index c353aa1bef..6c1ad586a4 100644
--- a/features/fixtures/mazerunner/cxx-scenarios-bugsnag/src/main/cpp/cxx-scenarios-bugsnag.cpp
+++ b/features/fixtures/mazerunner/cxx-scenarios-bugsnag/src/main/cpp/cxx-scenarios-bugsnag.cpp
@@ -6,6 +6,16 @@
 extern "C" {
 
 
+bool __attribute__((noinline)) make_dirty_stack() {
+  const size_t depth = 1024 * 1024; // 1Mb random data
+  unsigned char junk[depth];
+  for(size_t i = 0; i < depth; i++) {
+    junk[i] = i & 0xff;
+  }
+
+  return junk[depth / 2] != 0;
+}
+
 bool on_err_true(void *event_ptr) {
   bugsnag_event_set_context(event_ptr, (char *) "Some custom context");
   return true;
@@ -157,6 +167,7 @@ JNIEXPORT void JNICALL
 Java_com_bugsnag_android_mazerunner_scenarios_CXXStartScenario_activate(
     JNIEnv *env,
     jobject instance) {
+  make_dirty_stack();
   bugsnag_start(env);
   bugsnag_leave_breadcrumb((char *) "Start scenario crumb", BSG_CRUMB_LOG);
   bugsnag_notify((char *) "Start scenario",
@@ -183,6 +194,7 @@ Java_com_bugsnag_android_mazerunner_scenarios_CXXRemoveOnErrorScenario_activate(
 JNIEXPORT void JNICALL
 Java_com_bugsnag_android_mazerunner_scenarios_CXXRemoveDataScenario_activate(JNIEnv *env,
                                                                              jobject instance) {
+  make_dirty_stack();
   bugsnag_notify_env(env, (char *) "RemoveDataScenario", (char *) "oh no", BSG_SEVERITY_ERR);
 }
 
@@ -252,12 +264,14 @@ Java_com_bugsnag_android_mazerunner_scenarios_CXXGetJavaDataScenario_activate(JN
 JNIEXPORT void JNICALL
 Java_com_bugsnag_android_mazerunner_scenarios_CXXBackgroundNotifyScenario_activate(JNIEnv *env,
                                                                                    jobject instance) {
+  make_dirty_stack();
   bugsnag_notify_env(env, (char *)"Ferret Escape!", (char *)"oh no", BSG_SEVERITY_ERR);
 }
 
 
 JNIEXPORT void JNICALL
 Java_com_bugsnag_android_mazerunner_scenarios_CXXNotifySmokeScenario_activate(JNIEnv *env, jobject instance) {
+  make_dirty_stack();
   bugsnag_set_user_env(env, (char *)"324523", NULL, (char *)"Jack Mill");
   bugsnag_leave_breadcrumb_env(env, (char *)"Cold beans detected", BSG_CRUMB_LOG);
   bugsnag_notify_env(env, (char *)"CXXNotifySmokeScenario",
@@ -281,6 +295,7 @@ Java_com_bugsnag_android_mazerunner_scenarios_CXXHandledOverrideScenario_activat
 JNIEXPORT void JNICALL
 Java_com_bugsnag_android_mazerunner_scenarios_MultiProcessHandledCXXErrorScenario_activate(JNIEnv *env,
                                                                                            jobject instance) {
+  make_dirty_stack();
   bugsnag_notify_env(env, (char *)"activate",
                      (char *)"MultiProcessHandledCXXErrorScenario", BSG_SEVERITY_ERR);
 }
@@ -318,6 +333,7 @@ Java_com_bugsnag_android_mazerunner_scenarios_CXXCaptureThreadsScenario_crash(JN
 JNIEXPORT void JNICALL
 Java_com_bugsnag_android_mazerunner_scenarios_CXXCaptureThreadsNotifyScenario_activate(JNIEnv *env,
                                                                                        jobject instance) {
+  make_dirty_stack();
   bugsnag_notify_env(env, (char *)"activate",
     (char *)"CXXCaptureThreadStatesNotifyScenario", BSG_SEVERITY_ERR);
 }

From 5fd32cdad194b8c7fe4786f4739daaae8bf88e53 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Wed, 8 Dec 2021 10:48:30 +0000
Subject: [PATCH 7/8] fix: avoid logging network breadcrumb for first call

---
 CHANGELOG.md                                                | 1 +
 .../src/main/java/com/bugsnag/android/ConnectivityCompat.kt | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecc0f4ce4e..fff02df49a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 
 * Avoid unnecessary network connectivity change breadcrumb
   [#1540](https://github.com/bugsnag/bugsnag-android/pull/1540)
+  [#1546](https://github.com/bugsnag/bugsnag-android/pull/1546)
 
 * Clear native stacktrace memory in `bugsnag_notify_env` before attempting to unwind the stack
   [#1543](https://github.com/bugsnag/bugsnag-android/pull/1543)
diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt
index f256ef116f..97e87553c1 100644
--- a/bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt
+++ b/bugsnag-android-core/src/main/java/com/bugsnag/android/ConnectivityCompat.kt
@@ -96,8 +96,12 @@ internal class ConnectivityLegacy(
         private val cb: NetworkChangeCallback?
     ) : BroadcastReceiver() {
 
+        private val receivedFirstCallback = AtomicBoolean(false)
+
         override fun onReceive(context: Context, intent: Intent) {
-            cb?.invoke(hasNetworkConnection(), retrieveNetworkAccessState())
+            if (receivedFirstCallback.getAndSet(true)) {
+                cb?.invoke(hasNetworkConnection(), retrieveNetworkAccessState())
+            }
         }
     }
 }

From 3dc9d3b94975a407b1397447c62ed9d65e5c19b5 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Wed, 8 Dec 2021 14:15:36 +0000
Subject: [PATCH 8/8] v5.17.0

---
 CHANGELOG.md                                                    | 2 +-
 .../src/main/java/com/bugsnag/android/Notifier.kt               | 2 +-
 gradle.properties                                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fff02df49a..b51fcab261 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## TBD
+## 5.17.0 (2021-12-08)
 
 ### Enhancements
 
diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/Notifier.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/Notifier.kt
index 5fa599c7ed..254ac28a6d 100644
--- a/bugsnag-android-core/src/main/java/com/bugsnag/android/Notifier.kt
+++ b/bugsnag-android-core/src/main/java/com/bugsnag/android/Notifier.kt
@@ -7,7 +7,7 @@ import java.io.IOException
  */
 class Notifier @JvmOverloads constructor(
     var name: String = "Android Bugsnag Notifier",
-    var version: String = "5.16.0",
+    var version: String = "5.17.0",
     var url: String = "https://bugsnag.com"
 ) : JsonStream.Streamable {
 
diff --git a/gradle.properties b/gradle.properties
index dcf028b5cd..0b888924b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx4096m
 # 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
-VERSION_NAME=5.16.0
+VERSION_NAME=5.17.0
 GROUP=com.bugsnag
 POM_SCM_URL=https://github.com/bugsnag/bugsnag-android
 POM_SCM_CONNECTION=scm:git@github.com:bugsnag/bugsnag-android.git