Wire up settings to send procedure

Author: jakeouellette

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

@@ -52,6 +52,7 @@ public class SessionReportingCoordinatorTest {
   @Mock private LogFileManager logFileManager;
   @Mock private UserMetadata reportMetadata;
   @Mock private SendReportPredicate mockSendReportPredicate;
+  @Mock private SendReportPredicate mockSendNativeReportPredicate;
   @Mock private CrashlyticsReport mockReport;
   @Mock private CrashlyticsReport.Session.Event mockEvent;
   @Mock private CrashlyticsReport.Session.Event.Builder mockEventBuilder;
@@ -343,6 +344,7 @@ public void onSessionsFinalize_finalizesReports() {
   @SuppressWarnings("unchecked")
   public void onReportSend_successfulReportsAreDeleted() {
     when(mockSendReportPredicate.shouldSendViaDataTransport()).thenReturn(true);
+    when(mockSendNativeReportPredicate.shouldSendViaDataTransport()).thenReturn(true);
     final String orgId = "testOrgId";
     final String sessionId1 = "sessionId1";
     final String sessionId2 = "sessionId2";
@@ -361,7 +363,8 @@ public void onReportSend_successfulReportsAreDeleted() {
     when(reportSender.sendReport(mockReport1)).thenReturn(successfulTask);
     when(reportSender.sendReport(mockReport2)).thenReturn(failedTask);
 
-    reportManager.sendReports(orgId, Runnable::run, mockSendReportPredicate);
+    reportManager.sendReports(
+        orgId, Runnable::run, mockSendReportPredicate, mockSendNativeReportPredicate);
 
     verify(reportSender).sendReport(mockReport1);
     verify(reportSender).sendReport(mockReport2);
@@ -373,14 +376,18 @@ public void onReportSend_successfulReportsAreDeleted() {
   @Test
   public void onReportSend_reportsAreDeletedWithoutBeingSent_whenSendPredicateIsFalse() {
     when(mockSendReportPredicate.shouldSendViaDataTransport()).thenReturn(false);
-    reportManager.sendReports("testOrgId", Runnable::run, mockSendReportPredicate);
+    when(mockSendNativeReportPredicate.shouldSendViaDataTransport()).thenReturn(false);
+    reportManager.sendReports(
+        "testOrgId", Runnable::run, mockSendReportPredicate, mockSendNativeReportPredicate);
 
     verify(reportPersistence).deleteAllReports();
     verify(reportPersistence, never()).loadFinalizedReports();
     verify(reportPersistence, never()).deleteFinalizedReport(anyString());
     verifyZeroInteractions(reportSender);
   }
 
+  // FIXME: Add a test here
+
   @Test
   public void testPersistUserIdForCurrentSession_persistsCurrentUserIdForCurrentSessionId() {
     final String currentSessionId = "currentSessionId";

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistenceTest.java

@@ -387,12 +387,12 @@ public void testFinalizeSessionWithNativeEvent_writesNativeSessions() {
                         .build()))
             .build();
 
-    CrashlyticsReport report = makeTestNativeReport();
+    CrashlyticsReport report = makeTestNativeReport().withNdkPayload(filesPayload);
     List<CrashlyticsReport> finalizedReports = reportPersistence.loadFinalizedReports();
 
     assertEquals(0, finalizedReports.size());
 
-    reportPersistence.finalizeSessionWithNativeEvent("sessionId", report, filesPayload);
+    reportPersistence.finalizeSessionWithNativeEvent("sessionId", report);
 
     finalizedReports = reportPersistence.loadFinalizedReports();
     assertEquals(1, finalizedReports.size());

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java

@@ -433,7 +433,9 @@ public Task<Void> then(@Nullable AppSettingsData appSettingsData)
                             reportingCoordinator.sendReports(
                                 appSettingsData.organizationId,
                                 executor,
-                                shouldSendViaDataTransport(appSettingsData.reportUploadVariant));
+                                shouldSendViaDataTransport(appSettingsData.reportUploadVariant),
+                                shouldSendViaDataTransport(
+                                    appSettingsData.nativeReportUploadVariant));
                             return recordFatalFirebaseEventTask;
                           }
                         });
@@ -587,8 +589,9 @@ public Task<Void> then(@Nullable AppSettingsData appSettingsData)
                                 reportingCoordinator.sendReports(
                                     appSettingsData.organizationId,
                                     executor,
+                                    shouldSendViaDataTransport(appSettingsData.reportUploadVariant),
                                     shouldSendViaDataTransport(
-                                        appSettingsData.reportUploadVariant));
+                                        appSettingsData.nativeReportUploadVariant));
                                 unsentReportsHandled.trySetResult(null);
 
                                 return Tasks.forResult(null);
@@ -1103,7 +1106,7 @@ public boolean accept(File dir, String filename) {
 
   // endregion
 
-  private void finalizePreviousNativeSession(String previousSessionId) throws IOException {
+  private void finalizePreviousNativeSession(String previousSessionId) {
     Logger.getLogger().d("Finalizing native report for session " + previousSessionId);
     NativeSessionFileProvider nativeSessionFileProvider =
         nativeComponent.getSessionFileProvider(previousSessionId);
@@ -1128,10 +1131,8 @@ private void finalizePreviousNativeSession(String previousSessionId) throws IOEx
             getContext(),
             getFilesDir(),
             previousSessionLogManager.getBytesForLog());
-
     NativeSessionFileGzipper.processNativeSessions(nativeSessionDirectory, nativeSessionFiles);
     reportingCoordinator.finalizeSessionWithNativeEvent(previousSessionId, nativeSessionFiles);
-
     previousSessionLogManager.clearLog();
   }
 

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinator.java

@@ -147,7 +147,7 @@ public void finalizeSessionWithNativeEvent(
       filesPayloadBuilder.setFiles(ImmutableList.from(nativeFiles));
 
       reportPersistence.finalizeSessionWithNativeEvent(
-          sessionId, dataCapture.captureReportData(), filesPayloadBuilder.build());
+          sessionId, dataCapture.captureReportData().withNdkPayload(filesPayloadBuilder.build()));
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -178,14 +178,22 @@ public void removeAllReports() {
   public void sendReports(
       String organizationId,
       Executor reportSendCompleteExecutor,
-      SendReportPredicate sendReportPredicate) {
+      SendReportPredicate sendReportPredicate,
+      SendReportPredicate sendNativeReportPredicate) {
     if (!sendReportPredicate.shouldSendViaDataTransport()) {
       Logger.getLogger().d("Send via DataTransport disabled. Removing reports.");
       reportPersistence.deleteAllReports();
       return;
     }
     final List<CrashlyticsReport> reportsToSend = reportPersistence.loadFinalizedReports();
     for (CrashlyticsReport report : reportsToSend) {
+      if (report.getNdkPayload() != null
+          && !sendNativeReportPredicate.shouldSendViaDataTransport()) {
+        Logger.getLogger().d("Send native reports via DataTransport disabled. Removing reports.");
+        //        reportPersistence.deleteFinalizedReport(report.getNdkPayload());
+        // TODO: Delete that thang
+        continue;
+      }
       reportsSender
           .sendReport(report.withOrganizationId(organizationId))
           .continueWith(reportSendCompleteExecutor, this::onReportSendComplete);

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistence.java

@@ -168,8 +168,7 @@ public void deleteFinalizedReport(String sessionId) {
   }
 
   public void finalizeSessionWithNativeEvent(
-      String sessionId, CrashlyticsReport crashlyticsReport, CrashlyticsReport.FilesPayload files) {
-    crashlyticsReport = crashlyticsReport.withNdkPayload(files);
+      String sessionId, CrashlyticsReport crashlyticsReport) {
     final File outputDirectory = prepareDirectory(nativeReportsDirectory);
     writeTextFile(new File(outputDirectory, sessionId), TRANSFORM.reportToJson(crashlyticsReport));
   }