Merge branch 'develop' into release-5.0.1

Author: miquelbeltran

provider/src/main/java/com/raygun/raygun4android/CrashReporting.kt

@@ -163,7 +163,7 @@ object CrashReporting {
             }
 
             if (RaygunClient.user != null) {
-                msg.details.userInfo = RaygunClient.user
+                msg.details.user = RaygunClient.user
             } else {
                 msg.details.setUserInfo()
             }

provider/src/main/java/com/raygun/raygun4android/RaygunMessageBuilder.kt

@@ -54,7 +54,7 @@ class RaygunMessageBuilder {
     }
 
     fun setUserInfo(raygunUserInfo: RaygunUserInfo): RaygunMessageBuilder {
-        raygunMessage.details.userInfo = raygunUserInfo
+        raygunMessage.details.user = raygunUserInfo
         return this
     }
 

provider/src/main/java/com/raygun/raygun4android/messages/crashreporting/RaygunMessageDetails.kt

@@ -22,22 +22,22 @@ data class RaygunMessageDetails(
     // Custom Data
     @SerializedName("userCustomData") var customData: Map<*, *>? = null,
     // App Context
-    var appContext: RaygunAppContext? = null,
+    var context: RaygunAppContext? = null,
     // User
-    var userInfo: RaygunUserInfo? = null,
+    var user: RaygunUserInfo? = null,
     // Network Info
-    var networkInfo: NetworkInfo? = null,
+    var request: NetworkInfo? = null,
     var breadcrumbs: List<RaygunBreadcrumbMessage>? = null,
 ) {
     fun setAppContext(identifier: String?) {
-        this.appContext = RaygunAppContext(identifier)
+        this.context = RaygunAppContext(identifier)
     }
 
     suspend fun setUserInfo() {
-        this.userInfo = RaygunUserInfo.anonymous()
+        this.user = RaygunUserInfo.anonymous()
     }
 
     fun setNetworkInfo(context: Context) {
-        this.networkInfo = NetworkInfo(context)
+        this.request = NetworkInfo(context)
     }
 }

provider/src/test/java/com/raygun/raygun4android/RaygunMessageBuilderTest.kt

@@ -65,7 +65,7 @@ class RaygunMessageBuilderTest {
         val mockUser = mock<RaygunUserInfo>()
         val message = raygunMessageBuilder.setUserInfo(mockUser).build()
 
-        assertEquals(mockUser, message.details.userInfo)
+        assertEquals(mockUser, message.details.user)
     }
 
     @Test