Merge pull request #613 from F43nd1r/mail

Add subject & filename config in mail
ACRA · Jan 8, 2018 · 2199f9f · 2199f9f
2 parents 39e9f94 + f245ba0
commit 2199f9f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/acra-mail/src/main/java/org/acra/annotation/AcraMailSender.java b/acra-mail/src/main/java/org/acra/annotation/AcraMailSender.java
@@ -17,6 +17,10 @@
 package org.acra.annotation;
 
 import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+
+import org.acra.ACRAConstants;
+import org.acra.sender.EmailIntentSender;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -51,4 +55,21 @@
      * @since 5.0.0
      */
     boolean reportAsFile() default true;
+
+    /**
+     * custom file name for the report
+     *
+     * @return report file name
+     * @since 5.0.1
+     */
+    @NonNull String reportFileName() default EmailIntentSender.DEFAULT_REPORT_FILENAME;
+
+    /**
+     * custom email subject.
+     * Default is "&lt;applicationId&gt; Crash Report"
+     *
+     * @return resource id of the custom email subject
+     * @since 5.0.1
+     */
+    @StringRes int subject() default ACRAConstants.DEFAULT_RES_VALUE;
 }
diff --git a/acra-mail/src/main/java/org/acra/sender/EmailIntentSender.java b/acra-mail/src/main/java/org/acra/sender/EmailIntentSender.java
@@ -52,11 +52,14 @@
  */
 @SuppressWarnings("WeakerAccess")
 public class EmailIntentSender implements ReportSender {
+    public static final String DEFAULT_REPORT_FILENAME = "ACRA-report" + ACRAConstants.REPORTFILE_EXTENSION;
 
     private final CoreConfiguration config;
+    private final MailSenderConfiguration mailConfig;
 
     public EmailIntentSender(@NonNull CoreConfiguration config) {
         this.config = config;
+        this.mailConfig = ConfigUtils.getPluginConfiguration(config, MailSenderConfiguration.class);
     }
 
     @Override
@@ -206,6 +209,9 @@ private void grantPermission(@NonNull Context context, Intent intent, String pac
      */
     @NonNull
     protected String buildSubject(@NonNull Context context) {
+        if (mailConfig.subject() != ACRAConstants.DEFAULT_RES_VALUE) {
+            return context.getString(mailConfig.subject());
+        }
         return context.getPackageName() + " Crash Report";
     }
 
@@ -220,8 +226,8 @@ protected String buildSubject(@NonNull Context context) {
     protected boolean fillAttachmentList(@NonNull Context context, @NonNull String body, @NonNull List<Uri> attachments) {
         final InstanceCreator instanceCreator = new InstanceCreator();
         attachments.addAll(instanceCreator.create(config.attachmentUriProvider(), new DefaultAttachmentProvider()).getAttachments(context, config));
-        if (ConfigUtils.getPluginConfiguration(config, MailSenderConfiguration.class).reportAsFile()) {
-            final Uri report = createAttachmentFromString(context, "ACRA-report" + ACRAConstants.REPORTFILE_EXTENSION, body);
+        if (mailConfig.reportAsFile()) {
+            final Uri report = createAttachmentFromString(context, mailConfig.reportFileName(), body);
             if (report != null) {
                 attachments.add(report);
                 return true;