Upgrade to KSCrash 1.11.2

Fixes bugsnag#130 Fixes bugsnag#128 Fixes bugsnag#124
mytrus · Jan 30, 2017 · 73c5dac · 73c5dac
1 parent 40ce876
commit 73c5dac
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/Bugsnag.podspec.json b/Bugsnag.podspec.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "KSCrash/RecordingAdvanced": [
-      "= 1.8.13"
+      "= 1.11.2"
     ]
   }
 }
diff --git a/Carthage/Checkouts/KSCrash b/Carthage/Checkouts/KSCrash
diff --git a/Source/BSGKSCrashReportWriter.h b/Source/BSGKSCrashReportWriter.h
@@ -71,7 +71,7 @@ typedef struct BSGKSCrashReportWriter
      */
     void (*addIntegerElement)(const struct BSGKSCrashReportWriter* writer,
                               const char* name,
-                              long long value);
+                              int64_t value);
 
     /** Add an unsigned integer element to the report.
      *
@@ -83,7 +83,7 @@ typedef struct BSGKSCrashReportWriter
      */
     void (*addUIntegerElement)(const struct BSGKSCrashReportWriter* writer,
                                const char* name,
-                               unsigned long long value);
+                               uint64_t value);
 
     /** Add a string element to the report.
      *
@@ -109,6 +109,21 @@ typedef struct BSGKSCrashReportWriter
                                const char* name,
                                const char* filePath);
 
+    /** Add a JSON element from a text file to the report.
+     *
+     * @param writer This writer.
+     *
+     * @param name The name to give this element.
+     *
+     * @param filePath The path to the file containing the value to add.
+     *
+     * @param closeLastContainer If false, do not close the last container.
+     */
+    void (*addJSONFileElement)(const struct BSGKSCrashReportWriter* writer,
+                               const char* name,
+                               const char* filePath,
+                               const bool closeLastContainer);
+
     /** Add a hex encoded data element to the report.
      *
      * @param writer This writer.
@@ -122,7 +137,7 @@ typedef struct BSGKSCrashReportWriter
     void (*addDataElement)(const struct BSGKSCrashReportWriter* writer,
                            const char* name,
                            const char* value,
-                           const size_t length);
+                           const int length);
 
     /** Begin writing a hex encoded data element to the report.
      *
@@ -143,7 +158,7 @@ typedef struct BSGKSCrashReportWriter
      */
     void (*appendDataElement)(const struct BSGKSCrashReportWriter* writer,
                               const char* value,
-                              const size_t length);
+                              const int length);
 
     /** Complete writing a hex encoded data element to the report.
      *
@@ -173,7 +188,8 @@ typedef struct BSGKSCrashReportWriter
      */
     void (*addJSONElement)(const struct BSGKSCrashReportWriter* writer,
                            const char* name,
-                           const char* jsonElement);
+                           const char* jsonElement,
+                           bool closeLastContainer);
 
     /** Begin a new object container.
      *

diff --git a/Source/BugsnagNotifier.m b/Source/BugsnagNotifier.m
@@ -73,16 +73,16 @@
  */
 void BSSerializeDataCrashHandler(const KSCrashReportWriter *writer) {
     if (g_bugsnag_data.configJSON) {
-        writer->addJSONElement(writer, "config", g_bugsnag_data.configJSON);
+        writer->addJSONElement(writer, "config", g_bugsnag_data.configJSON, true);
     }
     if (g_bugsnag_data.metaDataJSON) {
-        writer->addJSONElement(writer, "metaData", g_bugsnag_data.metaDataJSON);
+        writer->addJSONElement(writer, "metaData", g_bugsnag_data.metaDataJSON, true);
     }
     if (g_bugsnag_data.stateJSON) {
-        writer->addJSONElement(writer, "state", g_bugsnag_data.stateJSON);
+        writer->addJSONElement(writer, "state", g_bugsnag_data.stateJSON, true);
     }
     if (g_bugsnag_data.userOverridesJSON) {
-        writer->addJSONElement(writer, "overrides", g_bugsnag_data.userOverridesJSON);
+        writer->addJSONElement(writer, "overrides", g_bugsnag_data.userOverridesJSON, true);
     }
     if (g_bugsnag_data.onCrash) {
         g_bugsnag_data.onCrash(writer);