From 8d640cc3a5294a2de7f0f3b93b27c18909bf5539 Mon Sep 17 00:00:00 2001
From: Kai Koenig <kai@ventego-creative.co.nz>
Date: Tue, 11 Jun 2019 21:57:00 +0200
Subject: [PATCH 1/6] Small syntax improvement

---
 .../com/raygun/raygun4android/logging/TimberRaygunLogger.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/provider/src/main/java/com/raygun/raygun4android/logging/TimberRaygunLogger.java b/provider/src/main/java/com/raygun/raygun4android/logging/TimberRaygunLogger.java
index 2f4f504..fe46a19 100644
--- a/provider/src/main/java/com/raygun/raygun4android/logging/TimberRaygunLogger.java
+++ b/provider/src/main/java/com/raygun/raygun4android/logging/TimberRaygunLogger.java
@@ -1,7 +1,6 @@
 package com.raygun.raygun4android.logging;
 
 interface TimberRaygunLogger {
-    static void init(){
-    };
+    static void init(){}
 }
 

From 490a6a12beec05b49c0536f7a256ed1a205428c7 Mon Sep 17 00:00:00 2001
From: Kai Koenig <kai@ventego-creative.co.nz>
Date: Tue, 11 Jun 2019 21:58:21 +0200
Subject: [PATCH 2/6] Improving situation with context tracking in RUM and
 moved to WeakReferences to avoid leaks as much as possible.

---
 .../java/com/raygun/raygun4android/RUM.java   | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/provider/src/main/java/com/raygun/raygun4android/RUM.java b/provider/src/main/java/com/raygun/raygun4android/RUM.java
index 2e72a65..cd7cbdf 100644
--- a/provider/src/main/java/com/raygun/raygun4android/RUM.java
+++ b/provider/src/main/java/com/raygun/raygun4android/RUM.java
@@ -9,6 +9,7 @@
 import android.os.Build;
 import android.os.Bundle;
 
+import java.lang.ref.WeakReference;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -30,9 +31,9 @@
 
 public class RUM implements ActivityLifecycleCallbacks {
     private static RUM rum;
-    private static Activity mainActivity;
-    private static Activity currentActivity;
-    private static Activity loadingActivity;
+    private static WeakReference<Activity> mainActivity;
+    private static WeakReference<Activity> currentActivity;
+    private static WeakReference<Activity> loadingActivity;
     private static long startTime;
     private static long lastSeenTime;
     private static String sessionId;
@@ -45,8 +46,8 @@ private static void attach(Activity mainActivity) {
             Application application = mainActivity.getApplication();
 
             if (application != null) {
-                RUM.mainActivity = mainActivity;
-                RUM.currentActivity = mainActivity;
+                RUM.mainActivity = new WeakReference<>(mainActivity);
+                RUM.currentActivity = new WeakReference<>(mainActivity);
                 RUM.startTime = System.nanoTime();
 
                 RUM.rum = new RUM();
@@ -69,18 +70,18 @@ static void attach(Activity mainActivity, boolean networkLogging) {
     }
 
     protected static void detach() {
-        if (RUM.rum != null && RUM.mainActivity != null && RUM.mainActivity.getApplication() != null) {
-            RUM.mainActivity.getApplication().unregisterActivityLifecycleCallbacks(RUM.rum);
-            RUM.mainActivity = null;
-            RUM.currentActivity = null;
+        if (RUM.rum != null && RUM.mainActivity.get() != null && RUM.mainActivity.get().getApplication() != null) {
+            RUM.mainActivity.get().getApplication().unregisterActivityLifecycleCallbacks(RUM.rum);
+            RUM.mainActivity.clear();
+            RUM.currentActivity.clear();
             RUM.rum = null;
         }
     }
 
     static void sendRemainingActivity() {
         if (RUM.rum != null) {
-            if (RUM.loadingActivity != null) {
-                String activityName = getActivityName(RUM.loadingActivity);
+            if (RUM.loadingActivity.get() != null) {
+                String activityName = getActivityName(RUM.loadingActivity.get());
 
                 long diff = System.nanoTime() - RUM.startTime;
                 long duration = TimeUnit.NANOSECONDS.toMillis(diff);
@@ -107,15 +108,15 @@ private static void enqueueWorkForRUMService(String apiKey, String jsonPayload)
     @Override
     public void onActivityCreated(Activity activity, Bundle bundle) {
         RaygunLogger.v("RUM - onActivityCreated");
-        if (RUM.currentActivity == null) {
+        if (RUM.currentActivity.get() == null) {
             if (doesNeedSessionRotation()) {
                 rotateSession(currentSessionUser,currentSessionUser);
             }
         }
 
-        if (activity != RUM.currentActivity) {
-            RUM.currentActivity = activity;
-            RUM.loadingActivity = activity;
+        if (activity != RUM.currentActivity.get()) {
+            RUM.currentActivity = new WeakReference<>(activity);
+            RUM.loadingActivity = new WeakReference<>(activity);
             RUM.startTime = System.nanoTime();
         }
 
@@ -125,15 +126,15 @@ public void onActivityCreated(Activity activity, Bundle bundle) {
     @Override
     public void onActivityStarted(Activity activity) {
         RaygunLogger.v("RUM - onActivityStarted");
-        if (RUM.currentActivity == null) {
+        if (RUM.currentActivity.get() == null) {
             if (doesNeedSessionRotation()) {
                 rotateSession(currentSessionUser,currentSessionUser);
             }
         }
 
-        if (activity != RUM.currentActivity) {
-            RUM.currentActivity = activity;
-            RUM.loadingActivity = activity;
+        if (activity != RUM.currentActivity.get()) {
+            RUM.currentActivity = new WeakReference<>(activity);
+            RUM.loadingActivity = new WeakReference<>(activity);
             RUM.startTime = System.nanoTime();
         }
 
@@ -143,7 +144,7 @@ public void onActivityStarted(Activity activity) {
     @Override
     public void onActivityResumed(Activity activity) {
         RaygunLogger.v("RUM - onActivityResumed");
-        if (RUM.currentActivity == null) {
+        if (RUM.currentActivity.get() == null) {
             if (doesNeedSessionRotation()) {
                 rotateSession(currentSessionUser,currentSessionUser);
             }
@@ -152,13 +153,13 @@ public void onActivityResumed(Activity activity) {
         String activityName = getActivityName(activity);
         long duration = 0;
 
-        if (activity == RUM.currentActivity) {
+        if (activity == RUM.currentActivity.get()) {
             long diff = System.nanoTime() - RUM.startTime;
             duration = TimeUnit.NANOSECONDS.toMillis(diff);
         }
 
-        RUM.currentActivity = activity;
-        RUM.loadingActivity = null;
+        RUM.currentActivity = new WeakReference<>(activity);
+        RUM.loadingActivity.clear();
 
         sendRUMTimingEvent(RaygunRUMEventType.ACTIVITY_LOADED, activityName, duration);
 
@@ -174,9 +175,9 @@ public void onActivityPaused(Activity activity) {
     @Override
     public void onActivityStopped(Activity activity) {
         RaygunLogger.v("RUM - onActivityStopped");
-        if (activity == RUM.currentActivity) {
-            RUM.currentActivity = null;
-            RUM.loadingActivity = null;
+        if (activity == RUM.currentActivity.get()) {
+            RUM.currentActivity.clear();
+            RUM.loadingActivity.clear();
             RUM.lastSeenTime = System.currentTimeMillis();
         }
     }

From 8290251399b231f68d7204e4a0834e1dde86047c Mon Sep 17 00:00:00 2001
From: Kai Koenig <kai@ventego-creative.co.nz>
Date: Wed, 12 Jun 2019 12:19:39 +0200
Subject: [PATCH 3/6] Fixing some issues around WR.

---
 .../java/com/raygun/raygun4android/RUM.java   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/provider/src/main/java/com/raygun/raygun4android/RUM.java b/provider/src/main/java/com/raygun/raygun4android/RUM.java
index cd7cbdf..a7ada7a 100644
--- a/provider/src/main/java/com/raygun/raygun4android/RUM.java
+++ b/provider/src/main/java/com/raygun/raygun4android/RUM.java
@@ -72,15 +72,15 @@ static void attach(Activity mainActivity, boolean networkLogging) {
     protected static void detach() {
         if (RUM.rum != null && RUM.mainActivity.get() != null && RUM.mainActivity.get().getApplication() != null) {
             RUM.mainActivity.get().getApplication().unregisterActivityLifecycleCallbacks(RUM.rum);
-            RUM.mainActivity.clear();
-            RUM.currentActivity.clear();
+            RUM.mainActivity = null;
+            RUM.currentActivity = null;
             RUM.rum = null;
         }
     }
 
     static void sendRemainingActivity() {
         if (RUM.rum != null) {
-            if (RUM.loadingActivity.get() != null) {
+            if (RUM.loadingActivity != null && RUM.loadingActivity.get() != null) {
                 String activityName = getActivityName(RUM.loadingActivity.get());
 
                 long diff = System.nanoTime() - RUM.startTime;
@@ -108,13 +108,13 @@ private static void enqueueWorkForRUMService(String apiKey, String jsonPayload)
     @Override
     public void onActivityCreated(Activity activity, Bundle bundle) {
         RaygunLogger.v("RUM - onActivityCreated");
-        if (RUM.currentActivity.get() == null) {
+        if (RUM.currentActivity == null || RUM.currentActivity.get() == null) {
             if (doesNeedSessionRotation()) {
                 rotateSession(currentSessionUser,currentSessionUser);
             }
         }
 
-        if (activity != RUM.currentActivity.get()) {
+        if (RUM.currentActivity == null || RUM.currentActivity != null && RUM.currentActivity.get() != activity) {
             RUM.currentActivity = new WeakReference<>(activity);
             RUM.loadingActivity = new WeakReference<>(activity);
             RUM.startTime = System.nanoTime();
@@ -126,13 +126,13 @@ public void onActivityCreated(Activity activity, Bundle bundle) {
     @Override
     public void onActivityStarted(Activity activity) {
         RaygunLogger.v("RUM - onActivityStarted");
-        if (RUM.currentActivity.get() == null) {
+        if (RUM.currentActivity == null || RUM.currentActivity.get() == null) {
             if (doesNeedSessionRotation()) {
                 rotateSession(currentSessionUser,currentSessionUser);
             }
         }
 
-        if (activity != RUM.currentActivity.get()) {
+        if (RUM.currentActivity == null || RUM.currentActivity != null && RUM.currentActivity.get() != activity) {
             RUM.currentActivity = new WeakReference<>(activity);
             RUM.loadingActivity = new WeakReference<>(activity);
             RUM.startTime = System.nanoTime();
@@ -144,7 +144,7 @@ public void onActivityStarted(Activity activity) {
     @Override
     public void onActivityResumed(Activity activity) {
         RaygunLogger.v("RUM - onActivityResumed");
-        if (RUM.currentActivity.get() == null) {
+        if (RUM.currentActivity == null || RUM.currentActivity.get() == null) {
             if (doesNeedSessionRotation()) {
                 rotateSession(currentSessionUser,currentSessionUser);
             }
@@ -153,13 +153,13 @@ public void onActivityResumed(Activity activity) {
         String activityName = getActivityName(activity);
         long duration = 0;
 
-        if (activity == RUM.currentActivity.get()) {
+        if (RUM.currentActivity != null && activity == RUM.currentActivity.get()) {
             long diff = System.nanoTime() - RUM.startTime;
             duration = TimeUnit.NANOSECONDS.toMillis(diff);
         }
 
         RUM.currentActivity = new WeakReference<>(activity);
-        RUM.loadingActivity.clear();
+        RUM.loadingActivity = null;
 
         sendRUMTimingEvent(RaygunRUMEventType.ACTIVITY_LOADED, activityName, duration);
 
@@ -175,9 +175,9 @@ public void onActivityPaused(Activity activity) {
     @Override
     public void onActivityStopped(Activity activity) {
         RaygunLogger.v("RUM - onActivityStopped");
-        if (activity == RUM.currentActivity.get()) {
-            RUM.currentActivity.clear();
-            RUM.loadingActivity.clear();
+        if (RUM.currentActivity != null && activity == RUM.currentActivity.get()) {
+            RUM.currentActivity = null;
+            RUM.loadingActivity = null;
             RUM.lastSeenTime = System.currentTimeMillis();
         }
     }

From 6791a1f92423f359ee4a89f6c3b2cc48f4ed2d14 Mon Sep 17 00:00:00 2001
From: Kai Koenig <kai@ventego-creative.co.nz>
Date: Mon, 17 Jun 2019 22:44:18 +0200
Subject: [PATCH 4/6] Implemented Second Activity in sample app

---
 app/src/main/AndroidManifest.xml              |  5 +
 .../raygun4android/sample/MainActivity.kt     | 22 +++--
 .../raygun4android/sample/SecondActivity.kt   | 83 ++++++++++++++++
 app/src/main/res/layout/activity_main.xml     |  9 ++
 app/src/main/res/layout/activity_second.xml   | 94 +++++++++++++++++++
 5 files changed, 205 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/com/raygun/raygun4android/sample/SecondActivity.kt
 create mode 100644 app/src/main/res/layout/activity_second.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d93a21c..091a47e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".SecondActivity"
+            android:parentActivityName=".MainActivity">
+        </activity>
+
         <service
             android:name="com.raygun.raygun4android.services.CrashReportingPostService"
             android:exported="false"
diff --git a/app/src/main/java/com/raygun/raygun4android/sample/MainActivity.kt b/app/src/main/java/com/raygun/raygun4android/sample/MainActivity.kt
index 1169c52..07bc6db 100644
--- a/app/src/main/java/com/raygun/raygun4android/sample/MainActivity.kt
+++ b/app/src/main/java/com/raygun/raygun4android/sample/MainActivity.kt
@@ -25,14 +25,15 @@ class MainActivity : AppCompatActivity() {
 
         RaygunClient.setCustomData(initialCustomData)
 
-        val buttonSend = findViewById(R.id.button_send) as Button
-        val buttonCrash = findViewById(R.id.button_crash) as Button
-        val buttonHandleException = findViewById(R.id.button_handleException) as Button
-        val buttonSetUserAnon = findViewById(R.id.button_set_user_anon) as Button
-        val buttonSetUserA = findViewById(R.id.button_set_user_A) as Button
-        val buttonSetUserB = findViewById(R.id.button_set_user_B) as Button
-        val textViewAppVersion = findViewById(R.id.textView_appVersion) as TextView
-        val textViewProviderVersion = findViewById(R.id.textView_providerVersion) as TextView
+        val buttonSend = findViewById<Button>(R.id.button_send)
+        val buttonCrash = findViewById<Button>(R.id.button_crash)
+        val buttonHandleException = findViewById<Button>(R.id.button_handleException)
+        val buttonSetUserAnon = findViewById<Button>(R.id.button_set_user_anon)
+        val buttonSetUserA = findViewById<Button>(R.id.button_set_user_A)
+        val buttonSetUserB = findViewById<Button>(R.id.button_set_user_B)
+        val textViewAppVersion = findViewById<TextView>(R.id.textView_appVersion)
+        val textViewProviderVersion = findViewById<TextView>(R.id.textView_providerVersion)
+        val buttonSecondActivity = findViewById<Button>(R.id.button_secondActivity)
 
         buttonSend.setOnClickListener {
             val tw = HashMap<String,String>()
@@ -80,6 +81,11 @@ class MainActivity : AppCompatActivity() {
             RaygunClient.setUser(user)
         }
 
+        buttonSecondActivity.setOnClickListener {
+            startActivity(SecondActivity.getIntent(this@MainActivity))
+        }
+
+
         textViewAppVersion.text = "App ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE} ${BuildConfig.BUILD_TYPE})"
         textViewProviderVersion.text = "Provider ${com.raygun.raygun4android.BuildConfig.VERSION_NAME} (${com.raygun.raygun4android.BuildConfig.VERSION_CODE} ${BuildConfig.BUILD_TYPE})"
     }
diff --git a/app/src/main/java/com/raygun/raygun4android/sample/SecondActivity.kt b/app/src/main/java/com/raygun/raygun4android/sample/SecondActivity.kt
new file mode 100644
index 0000000..5132c8f
--- /dev/null
+++ b/app/src/main/java/com/raygun/raygun4android/sample/SecondActivity.kt
@@ -0,0 +1,83 @@
+package com.raygun.raygun4android.sample
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.util.Log
+import android.widget.Button
+import android.widget.TextView
+import com.raygun.raygun4android.RaygunClient
+import com.raygun.raygun4android.messages.shared.RaygunUserInfo
+
+class SecondActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_second)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        val buttonSend = findViewById(R.id.button_send) as Button
+        val buttonCrash = findViewById(R.id.button_crash) as Button
+        val buttonHandleException = findViewById(R.id.button_handleException) as Button
+        val buttonSetUserAnon = findViewById(R.id.button_set_user_anon) as Button
+        val buttonSetUserA = findViewById(R.id.button_set_user_A) as Button
+        val buttonSetUserB = findViewById(R.id.button_set_user_B) as Button
+        val textViewAppVersion = findViewById(R.id.textView_appVersion) as TextView
+        val textViewProviderVersion = findViewById(R.id.textView_providerVersion) as TextView
+
+        buttonSend.setOnClickListener {
+            val tw = HashMap<String,String>()
+            tw["secondkey"] = "secondvalue"
+
+            // Manual exception creation & sending
+            RaygunClient.send(Exception("Congratulations, you have sent errors with Raygun4Android from SecondActivity"), null, tw)
+        }
+
+        buttonCrash.setOnClickListener {
+            // A real exception will be thrown here, which will be caught & sent by RaygunClient
+            val i = 3 / 0
+            Log.d("Raygun4Android-Sample", "This is here purely so that our division by zero calculation in i gets used and not optimised away in a release build: $i")
+        }
+
+        buttonHandleException.setOnClickListener {
+            // Handle an exception yourself - nothing should be sent to Raygun
+            try {
+                val i = 3 / 0
+                Log.d("Raygun4Android-Sample", "This is here purely so that our division by zero calculation in i gets used and not optimised away in a release build: $i")
+            } catch (ex: Exception) {
+                val i = 4
+                Log.d("Raygun4Android-Sample", "This is here purely so that our alternative value for i gets used and not optimised away in a release build: $i")
+            }
+        }
+
+        buttonSetUserAnon.setOnClickListener {
+            val user = RaygunUserInfo()
+            RaygunClient.setUser(user)
+        }
+
+        buttonSetUserA.setOnClickListener {
+            val user = RaygunUserInfo("superuser3")
+            user.fullName = "User Name C"
+            user.firstName = "User C"
+            user.email = "e@f.com.com"
+            RaygunClient.setUser(user)
+        }
+
+        buttonSetUserB.setOnClickListener{
+            val user = RaygunUserInfo("superuser4")
+            user.fullName = "User Name D"
+            user.firstName = "User D"
+            user.email = "g@h.com"
+            RaygunClient.setUser(user)
+        }
+
+        textViewAppVersion.text = "App ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE} ${BuildConfig.BUILD_TYPE})"
+        textViewProviderVersion.text = "Provider ${com.raygun.raygun4android.BuildConfig.VERSION_NAME} (${com.raygun.raygun4android.BuildConfig.VERSION_CODE} ${BuildConfig.BUILD_TYPE})"
+    }
+
+    companion object {
+        fun getIntent(context: Context): Intent = Intent(context, SecondActivity::class.java)
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f126074..7864f16 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -91,4 +91,13 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button_crash" />
 
+    <Button
+        android:id="@+id/button_secondActivity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Go to a second Activity"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_set_user_B" />
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
new file mode 100644
index 0000000..f126074
--- /dev/null
+++ b/app/src/main/res/layout/activity_second.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.378" />
+
+    <Button
+        android:id="@+id/button_send"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Send an error"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
+
+    <Button
+        android:id="@+id/button_crash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Crash app"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_send" />
+
+    <Button
+        android:id="@+id/button_set_user_anon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Set user anonymous"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_handleException" />
+
+    <Button
+        android:id="@+id/button_set_user_A"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Set user A"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_set_user_anon" />
+
+    <Button
+        android:id="@+id/button_set_user_B"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Set user B"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_set_user_A" />
+
+    <TextView
+        android:id="@+id/textView_appVersion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView_providerVersion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView_appVersion" />
+
+    <Button
+        android:id="@+id/button_handleException"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Handle Crash"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button_crash" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 7a26306fe30bb11c1be129917ffbadb4a6f451d6 Mon Sep 17 00:00:00 2001
From: Kai Koenig <kai@ventego-creative.co.nz>
Date: Tue, 18 Jun 2019 14:45:52 +0200
Subject: [PATCH 5/6] Lint findings/changes

---
 .../raygun4android/sample/SecondActivity.kt      | 16 ++++++++--------
 provider/gradle-mvn-push.gradle                  |  2 +-
 .../raygun/raygun4android/CrashReporting.java    |  4 +++-
 .../messages/crashreporting/NetworkInfo.java     | 10 ++++------
 .../crashreporting/RaygunEnvironmentMessage.java |  2 +-
 .../network/RaygunNetworkLogger.java             |  4 +---
 .../network/RaygunNetworkUtils.java              |  2 ++
 .../raygun4android/utils/RaygunFileUtils.java    |  6 +++++-
 8 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/raygun/raygun4android/sample/SecondActivity.kt b/app/src/main/java/com/raygun/raygun4android/sample/SecondActivity.kt
index 5132c8f..38296e5 100644
--- a/app/src/main/java/com/raygun/raygun4android/sample/SecondActivity.kt
+++ b/app/src/main/java/com/raygun/raygun4android/sample/SecondActivity.kt
@@ -18,14 +18,14 @@ class SecondActivity : AppCompatActivity() {
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        val buttonSend = findViewById(R.id.button_send) as Button
-        val buttonCrash = findViewById(R.id.button_crash) as Button
-        val buttonHandleException = findViewById(R.id.button_handleException) as Button
-        val buttonSetUserAnon = findViewById(R.id.button_set_user_anon) as Button
-        val buttonSetUserA = findViewById(R.id.button_set_user_A) as Button
-        val buttonSetUserB = findViewById(R.id.button_set_user_B) as Button
-        val textViewAppVersion = findViewById(R.id.textView_appVersion) as TextView
-        val textViewProviderVersion = findViewById(R.id.textView_providerVersion) as TextView
+        val buttonSend = findViewById<Button>(R.id.button_send)
+        val buttonCrash = findViewById<Button>(R.id.button_crash)
+        val buttonHandleException = findViewById<Button>(R.id.button_handleException)
+        val buttonSetUserAnon = findViewById<Button>(R.id.button_set_user_anon)
+        val buttonSetUserA = findViewById<Button>(R.id.button_set_user_A)
+        val buttonSetUserB = findViewById<Button>(R.id.button_set_user_B)
+        val textViewAppVersion = findViewById<TextView>(R.id.textView_appVersion)
+        val textViewProviderVersion = findViewById<TextView>(R.id.textView_providerVersion)
 
         buttonSend.setOnClickListener {
             val tw = HashMap<String,String>()
diff --git a/provider/gradle-mvn-push.gradle b/provider/gradle-mvn-push.gradle
index 58997da..c48f6c9 100644
--- a/provider/gradle-mvn-push.gradle
+++ b/provider/gradle-mvn-push.gradle
@@ -18,7 +18,7 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 def isReleaseBuild() {
-    return VERSION_NAME.contains("SNAPSHOT") == false
+    return !VERSION_NAME.contains("SNAPSHOT")
 }
 
 def getReleaseRepositoryUrl() {
diff --git a/provider/src/main/java/com/raygun/raygun4android/CrashReporting.java b/provider/src/main/java/com/raygun/raygun4android/CrashReporting.java
index 95c2f2b..870b36e 100644
--- a/provider/src/main/java/com/raygun/raygun4android/CrashReporting.java
+++ b/provider/src/main/java/com/raygun/raygun4android/CrashReporting.java
@@ -171,7 +171,9 @@ static void postCachedMessages() {
                             ois = new ObjectInputStream(new FileInputStream(f));
                             SerializedMessage serializedMessage = (SerializedMessage) ois.readObject();
                             enqueueWorkForCrashReportingService(RaygunClient.getApiKey(), serializedMessage.message);
-                            f.delete();
+                            if (!f.delete()) {
+                                RaygunLogger.w("Couldn't delete cached report (" + f.getName() + ")");
+                            }
                         } finally {
                             if (ois != null) {
                                 ois.close();
diff --git a/provider/src/main/java/com/raygun/raygun4android/messages/crashreporting/NetworkInfo.java b/provider/src/main/java/com/raygun/raygun4android/messages/crashreporting/NetworkInfo.java
index cc6f6b5..1331a32 100644
--- a/provider/src/main/java/com/raygun/raygun4android/messages/crashreporting/NetworkInfo.java
+++ b/provider/src/main/java/com/raygun/raygun4android/messages/crashreporting/NetworkInfo.java
@@ -121,13 +121,11 @@ private void readIPAddress() {
                                 iPAddress.add(sAddr);
                             }
                         } else {
-                            if (!isIPv4) {
-                                int delim = sAddr.indexOf('%'); // drop ip6 port suffix
-                                String delimited = delim < 0 ? sAddr : sAddr.substring(0, delim);
+                            int delim = sAddr.indexOf('%'); // drop ip6 port suffix
+                            String delimited = delim < 0 ? sAddr : sAddr.substring(0, delim);
 
-                                if (!iPAddress.contains(delimited)) {
-                                    iPAddress.add(delimited);
-                                }
+                            if (!iPAddress.contains(delimited)) {
+                                iPAddress.add(delimited);
                             }
                         }
                     }
diff --git a/provider/src/main/java/com/raygun/raygun4android/messages/crashreporting/RaygunEnvironmentMessage.java b/provider/src/main/java/com/raygun/raygun4android/messages/crashreporting/RaygunEnvironmentMessage.java
index 89f9f3a..1031af2 100644
--- a/provider/src/main/java/com/raygun/raygun4android/messages/crashreporting/RaygunEnvironmentMessage.java
+++ b/provider/src/main/java/com/raygun/raygun4android/messages/crashreporting/RaygunEnvironmentMessage.java
@@ -96,7 +96,7 @@ public RaygunEnvironmentMessage(Context context) {
 
     private String getTotalRam() throws IOException {
         RandomAccessFile reader = null;
-        String load = null;
+        String load;
         try {
             reader = new RandomAccessFile("/proc/meminfo", "r");
             load = reader.readLine();
diff --git a/provider/src/main/java/com/raygun/raygun4android/network/RaygunNetworkLogger.java b/provider/src/main/java/com/raygun/raygun4android/network/RaygunNetworkLogger.java
index 20372b2..e638fc5 100644
--- a/provider/src/main/java/com/raygun/raygun4android/network/RaygunNetworkLogger.java
+++ b/provider/src/main/java/com/raygun/raygun4android/network/RaygunNetworkLogger.java
@@ -65,9 +65,7 @@ public static synchronized void endNetworkCall(String url, String requestMethod,
     public static synchronized void cancelNetworkCall(String url, String requestMethod, long endTime, String exception) {
         if (url != null) {
             String id = sanitiseURL(url);
-            if ((connections != null) && (connections.containsKey(id))) {
-                connections.remove(id);
-            }
+            connections.remove(id);
         }
     }
 
diff --git a/provider/src/main/java/com/raygun/raygun4android/network/RaygunNetworkUtils.java b/provider/src/main/java/com/raygun/raygun4android/network/RaygunNetworkUtils.java
index 5492389..ec3deb6 100644
--- a/provider/src/main/java/com/raygun/raygun4android/network/RaygunNetworkUtils.java
+++ b/provider/src/main/java/com/raygun/raygun4android/network/RaygunNetworkUtils.java
@@ -1,5 +1,6 @@
 package com.raygun.raygun4android.network;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
@@ -48,6 +49,7 @@ public static String getDeviceUuid(Context context) {
             if (id != null) {
                 return UUID.fromString(id).toString();
             } else {
+                @SuppressLint("HardwareIds")
                 final String androidId = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
 
                 try {
diff --git a/provider/src/main/java/com/raygun/raygun4android/utils/RaygunFileUtils.java b/provider/src/main/java/com/raygun/raygun4android/utils/RaygunFileUtils.java
index 09efddb..4c9dff0 100644
--- a/provider/src/main/java/com/raygun/raygun4android/utils/RaygunFileUtils.java
+++ b/provider/src/main/java/com/raygun/raygun4android/utils/RaygunFileUtils.java
@@ -3,6 +3,8 @@
 import android.content.Context;
 
 import com.raygun.raygun4android.RaygunSettings;
+import com.raygun.raygun4android.logging.RaygunLogger;
+
 import java.io.File;
 
 public class RaygunFileUtils {
@@ -27,7 +29,9 @@ public static void clearCachedReports(Context context) {
 
             for (File f : fileList) {
                 if (RaygunFileUtils.getExtension(f.getName()).equalsIgnoreCase(RaygunSettings.DEFAULT_FILE_EXTENSION)) {
-                    f.delete();
+                    if (!f.delete()) {
+                        RaygunLogger.w("Couldn't delete cached report (" + f.getName() + ")");
+                    }
                 }
             }
         }

From 7b8d390221ef9a245fbb18ec2fce72b9b29c583e Mon Sep 17 00:00:00 2001
From: Kai Koenig <kai@ventego-creative.co.nz>
Date: Tue, 18 Jun 2019 19:49:21 +0200
Subject: [PATCH 6/6] Release prep 4.0.0

---
 CHANGELOG.md      |  6 +++++-
 README.md         | 12 ++++++------
 app/build.gradle  |  2 +-
 gradle.properties |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ea3074..beee738 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 ## Changelog
 
-- Towards v4.0.0-beta3:
+- v4.0.0:
+  - Minor internal changes to memory handling
+  - Linting cleanup
+
+- v4.0.0-beta3:
   - API changes for setting and working with custom data: the field userCustomData is now being referred to as customData. This is reflected in API method changes.
   - Documentation for both Raygun4Android Gradle tasks
   - Added Timber 4.7.1 dependency for debug/prod logging
diff --git a/README.md b/README.md
index 74872b0..09a9206 100644
--- a/README.md
+++ b/README.md
@@ -6,15 +6,15 @@ Supports Android 4.1+ (API 16+).
 
 ## IMPORTANT
 
-### 6 May 2019
+### 17 Juni 2019
 
-Raygun4Android is currently actively being worked on for a release of version 4.
+Raygun4Android 4.0 is considered stable.
 
-With the release of beta2, the 4.0.0 development branch has now been merged into master and is now the mainstream development line. The code is quite stable and we encourage you to use the 4.0.0-beta2 release.
+Raygun4Android is currently actively being worked on towards a release of version 4.1.
 
-If you want the fully stable version 3.0.6 please check out the changeset labelled with v3.0.6 and go from there.
+With the release of 4.0.0-beta2, the 4.0.0 development branch has been merged into master and is now the mainstream development line.
 
-The master branch of this repository is currently heading towards a beta3 release.
+If you want the older stable version 3.0.6 please check out the change set labelled with v3.0.6 and go from there.
 
 ## Requirements
 
@@ -41,7 +41,7 @@ Then add the following to your **module's** build.gradle:
 ```gradle
 dependencies {
     ...
-    implementation 'com.raygun:raygun4android:4.0.0-beta2'
+    implementation 'com.raygun:raygun4android:4.0.0'
 }
 ```
 
diff --git a/app/build.gradle b/app/build.gradle
index 248344f..9687c47 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -113,7 +113,7 @@ dependencies {
     // Build from local provider library src
     implementation project(':provider')
     // Build from external repo
-    //implementation 'com.raygun:raygun4android:4.0.0-beta1'
+    //implementation 'com.raygun:raygun4android:4.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
diff --git a/gradle.properties b/gradle.properties
index be16adb..a2e0a7b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1536m
 # 5.3.3-beta2-SNAPSHOT
 #
 # Adding -SNAPSHOT to VERSION_NAME triggers publishing to a snapshot server at Maven Central.
-VERSION_NAME=4.0.0-beta3
+VERSION_NAME=4.0.0
 
 # Use a numeric value for VERSION_CODE
 #
@@ -40,7 +40,7 @@ VERSION_NAME=4.0.0-beta3
 # 4.0.0-alpha1 -> 40000031
 # 5.2.3        -> 50203000
 # 5.3.3-beta2  -> 50303072
-VERSION_CODE=40000073
+VERSION_CODE=40000099
 
 GROUP=com.raygun