Merge pull request #728 from F43nd1r/silent

Fix report files always marked as silent
ACRA · Feb 7, 2019 · 3f8e4a6 · 3f8e4a6
2 parents 3518de1 + 06639ae
commit 3f8e4a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/acra-core/src/main/java/org/acra/builder/ReportExecutor.java b/acra-core/src/main/java/org/acra/builder/ReportExecutor.java
@@ -255,7 +255,7 @@ private void sendReport(@NonNull File report, boolean onlySendSilentReports) {
  private File getReportFileName(@NonNull CrashReportData crashData) {
  final String timestamp = crashData.getString(USER_CRASH_DATE);
  final String isSilent = crashData.getString(IS_SILENT);
- final String fileName = timestamp + (isSilent != null ? ACRAConstants.SILENT_SUFFIX : "") + ACRAConstants.REPORTFILE_EXTENSION;
+ final String fileName = timestamp + (isSilent != null && Boolean.parseBoolean(isSilent) ? ACRAConstants.SILENT_SUFFIX : "") + ACRAConstants.REPORTFILE_EXTENSION;
  final ReportLocator reportLocator = new ReportLocator(context);
  return new File(reportLocator.getUnapprovedFolder(), fileName);
  }

diff --git a/acra-core/src/main/java/org/acra/sender/SendingConductor.java b/acra-core/src/main/java/org/acra/sender/SendingConductor.java
@@ -66,6 +66,7 @@ public void sendReports(boolean onlySendSilentReports) {
  }
  final String toast;
  if (anyNonSilent && (toast = reportsSentCount > 0 ? config.reportSendSuccessToast() : config.reportSendFailureToast()) != null) {
+ if (ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "About to show " + (reportsSentCount > 0 ? "success" : "failure") + " toast");
  new Handler(Looper.getMainLooper()).post(() -> ToastSender.sendToast(context, toast, Toast.LENGTH_LONG));
  }
  } catch (Exception e) {