Merge branch 'acra-email' into 'master'

Make acra report email configurable via gradle

See merge request fdroid/fdroidclient!900
This commit is contained in:
Hans-Christoph Steiner 2020-07-02 09:29:38 +00:00
commit c226523ecc
2 changed files with 2 additions and 1 deletions

View File

@ -46,6 +46,7 @@ android {
useProguard true useProguard true
shrinkResources true shrinkResources true
buildConfigField "String", "PRIVILEGED_EXTENSION_PACKAGE_NAME", privilegedExtensionApplicationId buildConfigField "String", "PRIVILEGED_EXTENSION_PACKAGE_NAME", privilegedExtensionApplicationId
buildConfigField "String", "ACRA_REPORT_EMAIL", '"reports@f-droid.org"' // String needs both quotes
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'src/androidTest/proguard-rules.pro' testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'src/androidTest/proguard-rules.pro'
} }

View File

@ -85,7 +85,7 @@ import java.security.Security;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ReportsCrashes(mailTo = "reports@f-droid.org", @ReportsCrashes(mailTo = BuildConfig.ACRA_REPORT_EMAIL,
mode = ReportingInteractionMode.DIALOG, mode = ReportingInteractionMode.DIALOG,
reportDialogClass = org.fdroid.fdroid.acra.CrashReportActivity.class, reportDialogClass = org.fdroid.fdroid.acra.CrashReportActivity.class,
reportSenderFactoryClasses = org.fdroid.fdroid.acra.CrashReportSenderFactory.class, reportSenderFactoryClasses = org.fdroid.fdroid.acra.CrashReportSenderFactory.class,