Add settings field for NDK sessions through DataTransport

Author: mrwillis21

firebase-crashlytics/src/androidTest/assets/firebase_settings.json

@@ -8,6 +8,7 @@
   "app": {
     "status": "activated",
     "report_upload_variant": 2,
+    "native_report_upload_variant": 2,
     "update_required": true
   },
   "fabric": {

firebase-crashlytics/src/androidTest/assets/firebase_settings_new.json

@@ -8,6 +8,7 @@
   "app": {
     "status": "new",
     "report_upload_variant": 2,
+    "native_report_upload_variant": 2,
     "update_required": true
   },
   "fabric": {

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java

@@ -117,7 +117,10 @@ protected void setUp() throws Exception {
     when(mockFileStore.getFilesDirPath()).thenReturn(testFilesDirectory.getPath());
 
     final SettingsData testSettingsData =
-        new TestSettingsData(3, CrashlyticsController.REPORT_UPLOAD_VARIANT_LEGACY);
+        new TestSettingsData(
+            3,
+            CrashlyticsController.REPORT_UPLOAD_VARIANT_LEGACY,
+            CrashlyticsController.REPORT_UPLOAD_VARIANT_LEGACY);
     appSettingsData = testSettingsData.appData;
     sessionSettingsData = testSettingsData.sessionData;
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java

@@ -610,7 +610,10 @@ private Task<CrashlyticsCore> startCoreAsync(CrashlyticsCore crashlyticsCore) {
 
     SettingsController mockSettingsController = mock(SettingsController.class);
     final SettingsData settings =
-        new TestSettingsData(3, CrashlyticsController.REPORT_UPLOAD_VARIANT_LEGACY);
+        new TestSettingsData(
+            3,
+            CrashlyticsController.REPORT_UPLOAD_VARIANT_LEGACY,
+            CrashlyticsController.REPORT_UPLOAD_VARIANT_LEGACY);
     when(mockSettingsController.getSettings()).thenReturn(settings);
     when(mockSettingsController.getAppSettings()).thenReturn(Tasks.forResult(settings.appData));
 

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransformTest.java

@@ -86,6 +86,7 @@ private void assertAppData(AppSettingsData appData, boolean isAppNew) {
         appData.ndkReportsUrl);
     assertTrue(appData.updateRequired);
     assertEquals(2, appData.reportUploadVariant);
+    assertEquals(2, appData.nativeReportUploadVariant);
   }
 
   private void assertSettingsData(SessionSettingsData settingsData) {

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/settings/TestSettingsData.java

@@ -22,13 +22,14 @@
 public class TestSettingsData extends SettingsData {
 
   public TestSettingsData() {
-    this(2, 0);
+    this(2, 0, 0);
   }
 
-  public TestSettingsData(int settingsVersion, int reportUploadVariant) {
+  public TestSettingsData(
+      int settingsVersion, int reportUploadVariant, int nativeReportUploadVariant) {
     super(
         5,
-        buildAppData(reportUploadVariant),
+        buildAppData(reportUploadVariant, nativeReportUploadVariant),
         buildSettingsData(),
         buildFeaturesData(),
         settingsVersion,
@@ -43,7 +44,8 @@ private static SessionSettingsData buildSettingsData() {
     return new SessionSettingsData(64, 4);
   }
 
-  private static AppSettingsData buildAppData(int reportUploadVariant) {
+  private static AppSettingsData buildAppData(
+      int reportUploadVariant, int nativeReportUploadVariant) {
     return new AppSettingsData(
         AppSettingsData.STATUS_ACTIVATED,
         "http://localhost",
@@ -52,6 +54,7 @@ private static AppSettingsData buildAppData(int reportUploadVariant) {
         "testBundleId",
         "testOrganizationId",
         false,
-        reportUploadVariant);
+        reportUploadVariant,
+        nativeReportUploadVariant);
   }
 }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsJsonConstants.java

@@ -44,10 +44,12 @@ class SettingsJsonConstants {
   static final String APP_NDK_REPORTS_URL_KEY = "ndk_reports_url";
   static final String APP_UPDATE_REQUIRED_KEY = "update_required";
   static final String APP_REPORT_UPLOAD_VARIANT_KEY = "report_upload_variant";
+  static final String APP_NATIVE_REPORT_UPLOAD_VARIANT_KEY = "native_report_upload_variant";
 
   // App JSON Defaults
   static final boolean APP_UPDATE_REQUIRED_DEFAULT = false;
   static final int APP_REPORT_UPLOAD_VARIANT_DEFAULT = 0;
+  static final int APP_NATIVE_REPORT_UPLOAD_VARIANT_DEFAULT = 0;
 
   // Settings JSON Keys
   static final String SETTINGS_MAX_CUSTOM_EXCEPTION_EVENTS_KEY = "max_custom_exception_events";

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/SettingsV3JsonTransform.java

@@ -96,6 +96,11 @@ private static AppSettingsData buildAppDataFrom(JSONObject fabricJson, JSONObjec
             SettingsJsonConstants.APP_REPORT_UPLOAD_VARIANT_KEY,
             SettingsJsonConstants.APP_REPORT_UPLOAD_VARIANT_DEFAULT);
 
+    final int nativeReportUploadVariant =
+        appJson.optInt(
+            SettingsJsonConstants.APP_NATIVE_REPORT_UPLOAD_VARIANT_KEY,
+            SettingsJsonConstants.APP_NATIVE_REPORT_UPLOAD_VARIANT_DEFAULT);
+
     return new AppSettingsData(
         status,
         url,
@@ -104,7 +109,8 @@ private static AppSettingsData buildAppDataFrom(JSONObject fabricJson, JSONObjec
         bundleId,
         organizationId,
         updateRequired,
-        reportUploadVariant);
+        reportUploadVariant,
+        nativeReportUploadVariant);
   }
 
   private static FeaturesSettingsData buildFeaturesSessionDataFrom(JSONObject json) {
@@ -141,7 +147,10 @@ private JSONObject toAppJson(AppSettingsData appData) throws JSONException {
         new JSONObject()
             .put(SettingsJsonConstants.APP_STATUS_KEY, appData.status)
             .put(SettingsJsonConstants.APP_UPDATE_REQUIRED_KEY, appData.updateRequired)
-            .put(SettingsJsonConstants.APP_REPORT_UPLOAD_VARIANT_KEY, appData.reportUploadVariant);
+            .put(SettingsJsonConstants.APP_REPORT_UPLOAD_VARIANT_KEY, appData.reportUploadVariant)
+            .put(
+                SettingsJsonConstants.APP_NATIVE_REPORT_UPLOAD_VARIANT_KEY,
+                appData.nativeReportUploadVariant);
 
     return json;
   }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/settings/model/AppSettingsData.java

@@ -28,6 +28,7 @@ public class AppSettingsData {
   public final String organizationId;
   public final boolean updateRequired;
   public final int reportUploadVariant;
+  public final int nativeReportUploadVariant;
 
   public AppSettingsData(
       String status,
@@ -37,7 +38,8 @@ public AppSettingsData(
       String bundleId,
       String organizationId,
       boolean updateRequired,
-      int reportUploadVariant) {
+      int reportUploadVariant,
+      int nativeReportUploadVariant) {
     this.status = status;
     this.url = url;
     this.reportsUrl = reportsUrl;
@@ -46,10 +48,11 @@ public AppSettingsData(
     this.organizationId = organizationId;
     this.updateRequired = updateRequired;
     this.reportUploadVariant = reportUploadVariant;
+    this.nativeReportUploadVariant = nativeReportUploadVariant;
   }
 
   public AppSettingsData(
       String status, String url, String reportsUrl, String ndkReportsUrl, boolean updateRequired) {
-    this(status, url, reportsUrl, ndkReportsUrl, null, null, updateRequired, 0);
+    this(status, url, reportsUrl, ndkReportsUrl, null, null, updateRequired, 0, 0);
   }
 }