Merge pull request #655 from F43nd1r/issue_654

Fix handleSilentException bugs

Author: F43nd1r

acra-core/src/main/java/org/acra/builder/ReportExecutor.java

@@ -22,6 +22,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.widget.Toast;
+
 import org.acra.ACRA;
 import org.acra.ACRAConstants;
 import org.acra.config.CoreConfiguration;
@@ -249,9 +250,7 @@ private void startSendingReports(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 != null ? timestamp : new Date().getTime()) // Need to check for null because old version of ACRA did not always capture USER_CRASH_DATE
-                + (isSilent != null ? ACRAConstants.SILENT_SUFFIX : "")
-                + ACRAConstants.REPORTFILE_EXTENSION;
+        final String fileName = timestamp + (isSilent != null ? ACRAConstants.SILENT_SUFFIX : "") + ACRAConstants.REPORTFILE_EXTENSION;
         final ReportLocator reportLocator = new ReportLocator(context);
         return new File(reportLocator.getUnapprovedFolder(), fileName);
     }

acra-core/src/main/java/org/acra/file/CrashReportFileNameParser.java

@@ -20,18 +20,23 @@
 import org.acra.ACRAConstants;
 import org.acra.ErrorReporter;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+
 /**
  * Responsible for determining the state of a Crash Report based on its file name.
  *
- * @author William Ferguson
+ * @author William Ferguson & F43nd1r
  * @since 4.3.0
  */
 public final class CrashReportFileNameParser {
 
     /**
      * Guess that a report is silent from its file name.
      *
-     * @param reportFileName    Name of the report to check whether it should be sent silently.
+     * @param reportFileName Name of the report to check whether it should be sent silently.
      * @return True if the report has been declared explicitly silent using {@link ErrorReporter#handleSilentException(Throwable)}.
      */
     public boolean isSilent(@NonNull String reportFileName) {
@@ -41,17 +46,36 @@ public boolean isSilent(@NonNull String reportFileName) {
     /**
      * Returns true if the report is considered as approved.
      * <p>
-          This includes:
+     * This includes:
      * </p>
      * <ul>
      * <li>Reports which were pending when the user agreed to send a report in the NOTIFICATION mode Dialog.</li>
      * <li>Explicit silent reports</li>
      * </ul>
      *
-     * @param reportFileName    Name of report to check whether it is approved to be sent.
+     * @param reportFileName Name of report to check whether it is approved to be sent.
      * @return True if a report can be sent.
+     * @deprecated use {@link ReportLocator#getApprovedReports()} and {@link ReportLocator#getUnapprovedReports()} instead
      */
+    @Deprecated
     public boolean isApproved(@NonNull String reportFileName) {
         return isSilent(reportFileName) || reportFileName.contains(ACRAConstants.APPROVED_SUFFIX);
     }
+
+    /**
+     * Gets the timestamp of a report from its name
+     *
+     * @param reportFileName Name of the report to get the timestamp from.
+     * @return timestamp of the report
+     */
+    @NonNull
+    public Calendar getTimestamp(@NonNull String reportFileName) {
+        final String timestamp = reportFileName.replace(ACRAConstants.REPORTFILE_EXTENSION, "").replace(ACRAConstants.SILENT_SUFFIX, "");
+        final Calendar calendar = Calendar.getInstance();
+        try {
+            calendar.setTime(new SimpleDateFormat(ACRAConstants.DATE_TIME_FORMAT_STRING, Locale.ENGLISH).parse(timestamp));
+        } catch (ParseException ignored) {
+        }
+        return calendar;
+    }
 }

acra-core/src/main/java/org/acra/sender/SenderService.java

@@ -79,10 +79,13 @@ protected void onHandleWork(@NonNull Intent intent) {
             // Iterate over approved reports and send via all Senders.
             int reportsSentCount = 0; // Use to rate limit sending
             final CrashReportFileNameParser fileNameParser = new CrashReportFileNameParser();
+            boolean anyNonSilent = false;
             for (final File report : reports) {
-                if (onlySendSilentReports && !fileNameParser.isSilent(report.getName())) {
+                final boolean isNonSilent = !fileNameParser.isSilent(report.getName());
+                if (onlySendSilentReports && isNonSilent) {
                     continue;
                 }
+                anyNonSilent |= isNonSilent;
 
                 if (reportsSentCount >= ACRAConstants.MAX_SEND_REPORTS) {
                     break; // send only a few reports to avoid overloading the network
@@ -92,8 +95,8 @@ protected void onHandleWork(@NonNull Intent intent) {
                     reportsSentCount++;
                 }
             }
-            final String toast = reportsSentCount > 0 ? config.reportSendSuccessToast() : config.reportSendFailureToast();
-            if (toast != null) {
+            final String toast;
+            if (anyNonSilent && (toast = reportsSentCount > 0 ? config.reportSendSuccessToast() : config.reportSendFailureToast()) != null) {
                 new Handler(Looper.getMainLooper()).post(() -> ToastSender.sendToast(this, toast, Toast.LENGTH_LONG));
             }
         } catch (Exception e) {

acra-core/src/main/java/org/acra/util/ApplicationStartupProcessor.java

@@ -23,14 +23,20 @@
 import android.support.annotation.NonNull;
 
 import org.acra.ACRA;
+import org.acra.ACRAConstants;
 import org.acra.config.CoreConfiguration;
 import org.acra.file.BulkReportDeleter;
+import org.acra.file.CrashReportFileNameParser;
 import org.acra.file.ReportLocator;
 import org.acra.interaction.ReportInteractionExecutor;
 import org.acra.prefs.SharedPreferencesFactory;
 import org.acra.sender.SenderServiceStarter;
 
 import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
 
 /**
  * Looks for any existing reports and starts sending them.
@@ -50,6 +56,7 @@ public ApplicationStartupProcessor(@NonNull Context context, @NonNull CoreConfig
     }
 
     public void checkReports(boolean enableAcra) {
+        final Calendar now = Calendar.getInstance();
         //application is not ready in onAttachBaseContext, so delay this. also run it on a background thread because we're doing disk I/O
         new Handler(context.getMainLooper()).post(() -> new Thread(() -> {
             if (config.deleteOldUnsentReportsOnApplicationStart()) {
@@ -60,19 +67,22 @@ public void checkReports(boolean enableAcra) {
             }
             if (enableAcra) {
                 sendApprovedReports();
-                approveOneReport();
+                approveOneReport(now);
             }
         }).start());
     }
 
-    private void approveOneReport() {
+    private void approveOneReport(Calendar ignoreReportsAfter) {
         final File[] reports = reportLocator.getUnapprovedReports();
 
         if (reports.length == 0) {
             return; // There are no unapproved reports, so bail now.
         }
-        //only approve one report at a time to prevent overwhelming users
-        new ReportInteractionExecutor(context, config).performInteractions(reports[0]);
+        //if a report was created after the application launch, it might be currently handled, so ignore it for now.
+        if (new CrashReportFileNameParser().getTimestamp(reports[0].getName()).before(ignoreReportsAfter)) {
+            //only approve one report at a time to prevent overwhelming users
+            new ReportInteractionExecutor(context, config).performInteractions(reports[0]);
+        }
     }
 
     /**