backport oreo fixes to acra 4

ACRA · Mar 21, 2018 · 05e9a53 · 05e9a53 · mikehardy · Jul 1, 2018
1 parent 3af731a
commit 05e9a53
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 20 deletions.
diff --git a/acra/build.gradle b/acra/build.gradle
@@ -6,14 +6,13 @@ apply plugin: 'com.jfrog.artifactory'
 
 android {
     compileSdkVersion Integer.parseInt(androidVersion)
-    buildToolsVersion '25.0.2'
 
     lintOptions {
         abortOnError false
     }
 
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion 14
         targetSdkVersion androidVersion
         versionName version
         consumerProguardFile proguardFile
@@ -26,7 +25,8 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v4:$supportVersion"
+    compile "com.android.support:support-compat:$supportVersion"
+    compile "com.android.support:support-fragment:$supportVersion"
     compile "com.android.support:support-annotations:$supportVersion"
     annotationProcessor project(':annotationprocessor')
     provided project(':annotations')

diff --git a/acra/gradle.properties b/acra/gradle.properties
@@ -1,8 +1,8 @@
-version=4.10.0
-group=com.faendir
+version=4.11
+group=ch.acra
 archivesBaseName=acra
-androidVersion=24
-supportVersion=24.1.1
+androidVersion=27
+supportVersion=27.1.0
 proguardFile=src/main/proguard/proguard.cfg
 release.useAutomaticVersion=true
 ossrhUser=

diff --git a/acra/src/main/AndroidManifest.xml b/acra/src/main/AndroidManifest.xml
@@ -17,6 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="ch.acra.acra">
 
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
     <application>
         <activity
             android:name="org.acra.dialog.CrashReportDialog"
@@ -29,6 +31,7 @@
         <service
             android:name="org.acra.sender.SenderService"
             android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE"
             android:process=":acra" />
 
         <provider

diff --git a/acra/src/main/java/org/acra/builder/ReportExecutor.java b/acra/src/main/java/org/acra/builder/ReportExecutor.java
@@ -6,6 +6,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Debug;
 import android.os.Looper;
 import android.support.annotation.NonNull;
@@ -125,10 +126,13 @@ public void execute(@NonNull final ReportBuilder reportBuilder) {
         reportPrimer.primeReport(context, reportBuilder);
 
         boolean sendOnlySilentReports = false;
-        final ReportingInteractionMode reportingInteractionMode;
+        ReportingInteractionMode reportingInteractionMode;
         if (!reportBuilder.isSendSilently()) {
             // No interaction mode defined in the ReportBuilder, we assume it has been set during ACRA.initACRA()
             reportingInteractionMode = config.reportingInteractionMode();
+            if (reportingInteractionMode == ReportingInteractionMode.NOTIFICATION && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                reportingInteractionMode = ReportingInteractionMode.SILENT;
+            }
         } else {
             reportingInteractionMode = ReportingInteractionMode.SILENT;
 

diff --git a/acra/src/main/java/org/acra/sender/SenderService.java b/acra/src/main/java/org/acra/sender/SenderService.java
@@ -19,6 +19,7 @@
 import android.content.Intent;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.JobIntentService;
 
 import org.acra.ACRA;
 import org.acra.ACRAConstants;
@@ -34,22 +35,21 @@
 
 import static org.acra.ACRA.LOG_TAG;
 
-public class SenderService extends IntentService {
+public class SenderService extends JobIntentService {
 
     public static final String EXTRA_ONLY_SEND_SILENT_REPORTS = "onlySendSilentReports";
     public static final String EXTRA_APPROVE_REPORTS_FIRST = "approveReportsFirst";
     public static final String EXTRA_ACRA_CONFIG = "acraConfig";
 
-    private final ReportLocator locator = new ReportLocator(this);
+    private final ReportLocator locator;
 
     public SenderService() {
-        super("ACRA SenderService");
-        setIntentRedelivery(true);
+        locator = new ReportLocator(this);
     }
 
     @Override
-    protected void onHandleIntent(@Nullable final Intent intent) {
-        if (intent == null || !intent.hasExtra(EXTRA_ACRA_CONFIG)) {
+    protected void onHandleWork(@NonNull final Intent intent) {
+        if (!intent.hasExtra(EXTRA_ACRA_CONFIG)) {
             if(ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "SenderService was started but no valid intent was delivered, will now quit");
             return;
         }

diff --git a/acra/src/main/java/org/acra/sender/SenderServiceStarter.java b/acra/src/main/java/org/acra/sender/SenderServiceStarter.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.NonNull;
+import android.support.v4.app.JobIntentService;
 
 import org.acra.ACRA;
 import org.acra.config.ACRAConfiguration;
@@ -30,10 +31,10 @@ public SenderServiceStarter(@NonNull Context context, @NonNull ACRAConfiguration
      */
     public void startService(boolean onlySendSilentReports, boolean approveReportsFirst) {
         if (ACRA.DEV_LOGGING) ACRA.log.d(LOG_TAG, "About to start SenderService");
-        final Intent intent = new Intent(context, SenderService.class);
+        final Intent intent = new Intent();
         intent.putExtra(SenderService.EXTRA_ONLY_SEND_SILENT_REPORTS, onlySendSilentReports);
         intent.putExtra(SenderService.EXTRA_APPROVE_REPORTS_FIRST, approveReportsFirst);
         intent.putExtra(SenderService.EXTRA_ACRA_CONFIG, config);
-        context.startService(intent);
+        JobIntentService.enqueueWork(context, SenderService.class, 0, intent);
     }
 }
diff --git a/acra/src/main/java/org/acra/util/ApplicationStartupProcessor.java b/acra/src/main/java/org/acra/util/ApplicationStartupProcessor.java
@@ -3,6 +3,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
+import android.os.Handler;
+import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.widget.Toast;
 import org.acra.ACRA;
@@ -79,7 +81,12 @@ public void sendApprovedReports() {
 
         // Send the approved reports.
         final SenderServiceStarter starter = new SenderServiceStarter(context, config);
-        starter.startService(false, false);
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                starter.startService(false, false);
+            }
+        });
 
     }
 

diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.0-rc02'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.4.0"
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.9.0"
@@ -21,6 +22,7 @@ apply plugin: 'io.codearte.nexus-staging'
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Feb 17 03:38:03 CET 2017
+#Wed Mar 21 18:52:10 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip