Revert "Merge branch 'asl'"

This reverts commit 6553fea, reversing
changes made to d516023.

acra-advanced-scheduler/src/main/java/org/acra/scheduler/AdvancedSenderScheduler.java

@@ -21,7 +21,7 @@
 import android.support.annotation.NonNull;
 import androidx.work.Constraints;
 import androidx.work.OneTimeWorkRequest;
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 import org.acra.config.ConfigUtils;
 import org.acra.config.CoreConfiguration;
 import org.acra.config.SchedulerConfiguration;

acra-advanced-scheduler/src/main/java/org/acra/scheduler/RestartingAdministrator.java

@@ -21,7 +21,7 @@
 import android.content.Intent;
 import android.support.annotation.NonNull;
 import androidx.work.*;
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 import org.acra.ACRA;
 import org.acra.builder.LastActivityManager;
 import org.acra.config.ConfigUtils;

acra-core/build.gradle

@@ -30,7 +30,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-fragment'
     }
     api project(':acra-javacore')
-    implementation "com.faendir.asl:serviceloader:$aslVersion"
+    compileOnly "com.google.auto.service:auto-service:$autoServiceVersion"
     annotationProcessor project(':annotationprocessor')
     compileOnly project(':annotations')
 }

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

@@ -81,7 +81,7 @@ public ReportExecutor(@NonNull Context context, @NonNull CoreConfiguration confi
         this.crashReportDataFactory = crashReportDataFactory;
         this.defaultExceptionHandler = defaultExceptionHandler;
         this.processFinisher = processFinisher;
-        reportingAdministrators = config.pluginLoader().loadEnabled(context, config, ReportingAdministrator.class);
+        reportingAdministrators = config.pluginLoader().loadEnabled(config, ReportingAdministrator.class);
         this.schedulerStarter = schedulerStarter;
         this.lastActivityManager = lastActivityManager;
     }

acra-core/src/main/java/org/acra/collector/ConfigurationCollector.java

@@ -21,7 +21,7 @@
 import android.support.annotation.Nullable;
 import android.util.SparseArray;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ACRA;
 import org.acra.ReportField;

acra-core/src/main/java/org/acra/collector/CustomDataCollector.java

@@ -18,7 +18,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/DeviceFeaturesCollector.java

@@ -20,7 +20,7 @@
 import android.content.pm.PackageManager;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/DeviceIdCollector.java

@@ -21,7 +21,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresPermission;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ACRA;
 import org.acra.ReportField;

acra-core/src/main/java/org/acra/collector/DisplayManagerCollector.java

@@ -26,7 +26,7 @@
 import android.view.Display;
 import android.view.Surface;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ACRA;
 import org.acra.ReportField;

acra-core/src/main/java/org/acra/collector/DropBoxCollector.java

@@ -21,7 +21,7 @@
 import android.os.DropBoxManager;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ACRA;
 import org.acra.ReportField;

acra-core/src/main/java/org/acra/collector/LogCatCollector.java

@@ -20,7 +20,7 @@
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 import org.acra.ACRA;
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/LogFileCollector.java

@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/MediaCodecListCollector.java

@@ -25,7 +25,7 @@
 import android.support.annotation.Nullable;
 import android.util.SparseArray;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/MemoryInfoCollector.java

@@ -22,7 +22,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ACRA;
 import org.acra.ReportField;

acra-core/src/main/java/org/acra/collector/PackageManagerCollector.java

@@ -19,7 +19,7 @@
 import android.content.pm.PackageInfo;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/ReflectionCollector.java

@@ -21,7 +21,7 @@
 import android.os.Environment;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/SettingsCollector.java

@@ -25,7 +25,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ACRA;
 import org.acra.ReportField;

acra-core/src/main/java/org/acra/collector/SharedPreferencesCollector.java

@@ -20,7 +20,7 @@
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ACRA;
 import org.acra.ReportField;

acra-core/src/main/java/org/acra/collector/SimpleValuesCollector.java

@@ -19,7 +19,7 @@
 import android.os.Build;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/StacktraceCollector.java

@@ -20,7 +20,7 @@
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/ThreadCollector.java

@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ReportField;
 import org.acra.builder.ReportBuilder;

acra-core/src/main/java/org/acra/collector/TimeCollector.java

@@ -18,7 +18,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 
 import org.acra.ACRAConstants;
 import org.acra.ReportField;

acra-core/src/main/java/org/acra/config/BaseCoreConfigurationBuilder.java

@@ -55,7 +55,7 @@ public final class BaseCoreConfigurationBuilder {
 
     private List<ConfigurationBuilder> configurationBuilders() {
         if (configurationBuilders == null) {
-            List<ConfigurationBuilderFactory> factories = pluginLoader.load(app, ConfigurationBuilderFactory.class);
+            List<ConfigurationBuilderFactory> factories = pluginLoader.load(ConfigurationBuilderFactory.class);
             if (ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "Found ConfigurationBuilderFactories : " + factories);
             configurationBuilders = new ArrayList<>(factories.size());
             for (ConfigurationBuilderFactory factory : factories) {

acra-core/src/main/java/org/acra/data/CrashReportDataFactory.java

@@ -50,7 +50,7 @@ public final class CrashReportDataFactory {
     public CrashReportDataFactory(@NonNull Context context, @NonNull CoreConfiguration config) {
         this.context = context;
         this.config = config;
-        collectors = config.pluginLoader().loadEnabled(context, config, Collector.class);
+        collectors = config.pluginLoader().loadEnabled(config, Collector.class);
         //noinspection Java8ListSort
         Collections.sort(collectors, (c1, c2) -> {
             Collector.Order o1;

acra-core/src/main/java/org/acra/interaction/ReportInteractionExecutor.java

@@ -44,7 +44,7 @@ public class ReportInteractionExecutor {
     public ReportInteractionExecutor(@NonNull final Context context, @NonNull final CoreConfiguration config) {
         this.context = context;
         this.config = config;
-        reportInteractions = config.pluginLoader().loadEnabled(context, config, ReportInteraction.class);
+        reportInteractions = config.pluginLoader().loadEnabled(config, ReportInteraction.class);
     }
 
     public boolean hasInteractions() {

acra-core/src/main/java/org/acra/plugins/PluginLoader.java

@@ -16,7 +16,6 @@
 
 package org.acra.plugins;
 
-import android.content.Context;
 import android.support.annotation.NonNull;
 import org.acra.config.CoreConfiguration;
 
@@ -28,7 +27,7 @@
  * @since 01.07.18
  */
 public interface PluginLoader extends Serializable {
-    <T extends Plugin> List<T> load(@NonNull Context context, @NonNull Class<T> clazz);
+    <T extends Plugin> List<T> load(@NonNull Class<T> clazz);
 
-    <T extends Plugin> List<T> loadEnabled(@NonNull Context context, @NonNull CoreConfiguration config, @NonNull Class<T> clazz);
+    <T extends Plugin> List<T> loadEnabled(@NonNull CoreConfiguration config, @NonNull Class<T> clazz);
 }

acra-core/src/main/java/org/acra/plugins/ServicePluginLoader.java

@@ -16,7 +16,6 @@
 
 package org.acra.plugins;
 
-import android.content.Context;
 import android.support.annotation.NonNull;
 import org.acra.ACRA;
 import org.acra.config.CoreConfiguration;
@@ -35,26 +34,19 @@
 public class ServicePluginLoader implements PluginLoader {
 
     @Override
-    public <T extends Plugin> List<T> load(@NonNull Context context, @NonNull Class<T> clazz) {
-        return loadInternal(context, clazz, plugin -> true);
+    public <T extends Plugin> List<T> load(@NonNull Class<T> clazz) {
+        return loadInternal(clazz, plugin -> true);
     }
 
     @Override
-    public <T extends Plugin> List<T> loadEnabled(@NonNull Context context, @NonNull CoreConfiguration config, @NonNull Class<T> clazz) {
-        return loadInternal(context, clazz, plugin -> plugin.enabled(config));
+    public <T extends Plugin> List<T> loadEnabled(@NonNull CoreConfiguration config, @NonNull Class<T> clazz) {
+        return loadInternal(clazz, plugin -> plugin.enabled(config));
     }
 
-    private <T extends Plugin> List<T> loadInternal(@NonNull Context context, @NonNull Class<T> clazz, Predicate<T> shouldLoadPredicate) {
-        List<T> plugins = new ArrayList<>(new com.faendir.asl.serviceloader.ServiceLoader(context).load(clazz));
-        for (Iterator<T> iterator = plugins.iterator(); iterator.hasNext(); ) {
-            T plugin = iterator.next();
-            if (!shouldLoadPredicate.apply(plugin)) {
-                iterator.remove();
-            } else if (ACRA.DEV_LOGGING) ACRA.log.d(ACRA.LOG_TAG, "Loaded " + clazz.getSimpleName() + " of type " + plugin.getClass().getName());
-        }
-        //legacy
+    private <T extends Plugin> List<T> loadInternal(@NonNull Class<T> clazz, Predicate<T> shouldLoadPredicate) {
+        List<T> plugins = new ArrayList<>();
         //noinspection ForLoopReplaceableByForEach
-        final ServiceLoader<T> serviceLoader = ServiceLoader.load(clazz, context.getClassLoader());
+        final ServiceLoader<T> serviceLoader = ServiceLoader.load(clazz, getClass().getClassLoader());
         if (ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "ServicePluginLoader loading services from ServiceLoader : " + serviceLoader);
 
         for (final Iterator<T> iterator = serviceLoader.iterator(); iterator.hasNext(); ) {

acra-core/src/main/java/org/acra/plugins/SimplePluginLoader.java

@@ -16,7 +16,6 @@
 
 package org.acra.plugins;
 
-import android.content.Context;
 import android.support.annotation.NonNull;
 import org.acra.ACRA;
 import org.acra.config.CoreConfiguration;
@@ -41,7 +40,7 @@ public SimplePluginLoader(@NonNull Class<? extends Plugin>... plugins) {
     }
 
     @Override
-    public <T extends Plugin> List<T> load(@NonNull Context context, @NonNull Class<T> clazz) {
+    public <T extends Plugin> List<T> load(@NonNull Class<T> clazz) {
         List<T> list = new ArrayList<>();
         if (ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "SimplePluginLoader loading services from plugin classes : " + plugins);
         for (Class<? extends Plugin> plugin : plugins) {
@@ -59,8 +58,8 @@ public <T extends Plugin> List<T> load(@NonNull Context context, @NonNull Class<
     }
 
     @Override
-    public <T extends Plugin> List<T> loadEnabled(@NonNull Context context, @NonNull CoreConfiguration config, @NonNull Class<T> clazz) {
-        List<T> list = load(context, clazz);
+    public <T extends Plugin> List<T> loadEnabled(@NonNull CoreConfiguration config, @NonNull Class<T> clazz) {
+        List<T> list = load(clazz);
         //noinspection Java8CollectionRemoveIf
         for (Iterator<T> iterator = list.iterator(); iterator.hasNext(); ) {
             T plugin = iterator.next();

acra-core/src/main/java/org/acra/scheduler/SchedulerStarter.java

@@ -39,7 +39,7 @@ public class SchedulerStarter {
 
     public SchedulerStarter(@NonNull Context context, @NonNull CoreConfiguration config) {
         locator = new ReportLocator(context);
-        List<SenderSchedulerFactory> schedulerFactories = config.pluginLoader().loadEnabled(context, config, SenderSchedulerFactory.class);
+        List<SenderSchedulerFactory> schedulerFactories = config.pluginLoader().loadEnabled(config, SenderSchedulerFactory.class);
         if (schedulerFactories.isEmpty()) {
             senderScheduler = new DefaultSenderScheduler(context, config);
         } else {

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

@@ -162,9 +162,21 @@ private void sendReports(@NonNull CoreConfiguration config, boolean onlySendSile
     @NonNull
     private List<ReportSender> getSenderInstances(@NonNull CoreConfiguration config) {
         List<Class<? extends ReportSenderFactory>> factoryClasses = config.reportSenderFactoryClasses();
-        List<ReportSenderFactory> factories = !factoryClasses.isEmpty() ? new InstanceCreator().create(factoryClasses) : config.pluginLoader()
-                .loadEnabled(this, config, ReportSenderFactory.class);
+
+        if (ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "config#reportSenderFactoryClasses : " + factoryClasses);
+
+        final List<ReportSenderFactory> factories;
+        if (factoryClasses.isEmpty()) {
+            if (ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "Using PluginLoader to find ReportSender factories");
+            final PluginLoader loader = config.pluginLoader();
+            factories = loader.loadEnabled(config, ReportSenderFactory.class);
+        } else {
+            if (ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "Creating reportSenderFactories for reportSenderFactory config");
+            factories = new InstanceCreator().create(factoryClasses);
+        }
         if (ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "reportSenderFactories : " + factories);
+
+
         final List<ReportSender> reportSenders = new ArrayList<>();
         for (ReportSenderFactory factory : factories) {
             final ReportSender sender = factory.create(this.getApplication(), config);

acra-core/src/main/java/org/acra/startup/StartupProcessorExecutor.java

@@ -63,7 +63,7 @@ public void processReports(boolean isAcraEnabled) {
             for (File r : reportLocator.getApprovedReports()) {
                 reports.add(new Report(r, true));
             }
-            final List<StartupProcessor> startupProcessors = config.pluginLoader().loadEnabled(context, config, StartupProcessor.class);
+            final List<StartupProcessor> startupProcessors = config.pluginLoader().loadEnabled(config, StartupProcessor.class);
             for (StartupProcessor processor : startupProcessors) {
                 processor.processReports(context, config, reports);
             }

acra-core/src/main/java/org/acra/startup/UnapprovedStartupProcessor.java

@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import com.faendir.asl.annotation.AutoService;
+import com.google.auto.service.AutoService;
 import org.acra.config.CoreConfiguration;
 import org.acra.file.LastModifiedComparator;
 

acra-core/src/test/java/org/acra/ACRATest.java

@@ -19,7 +19,6 @@
 import android.app.Application;
 import android.content.Context;
 import android.support.annotation.NonNull;
-import androidx.test.core.app.ApplicationProvider;
 import org.acra.builder.ReportBuilder;
 import org.acra.collector.StacktraceCollector;
 import org.acra.config.CoreConfiguration;
@@ -30,6 +29,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.*;
@@ -43,15 +43,15 @@ public class ACRATest {
 
     @Test
     public void init() {
-        Application application = ApplicationProvider.getApplicationContext();
+        Application application = RuntimeEnvironment.application;
         CoreConfigurationBuilder builder = new CoreConfigurationBuilder(application).setPluginLoader(new SimplePluginLoader(StacktraceCollector.class, TestAdministrator.class));
         ACRA.init(application, builder);
         ACRA.getErrorReporter().handleException(new RuntimeException());
     }
 
     @Test(expected = AssertionError.class)
     public void failing() {
-        Application application = ApplicationProvider.getApplicationContext();
+        Application application = RuntimeEnvironment.application;
         CoreConfigurationBuilder builder = new CoreConfigurationBuilder(application).setPluginLoader(new SimplePluginLoader(FailingTestAdministrator.class));
         ACRA.init(application, builder);
         ACRA.getErrorReporter().handleException(new RuntimeException());