Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b396c801 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #4267 from k9mail/minSdkVersion_21 

Set minSdkVersion 21
parents 1303430e 1d781b93

app/autodiscovery/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ class ThunderbirdAutoconfigFetcher(private val okHttpClient: OkHttpClient) { 
        val response = okHttpClient.newCall(request).execute()



        return if (response.isSuccessful) {

            response.body()?.byteStream()

            response.body?.byteStream()

        } else {

            null

        }

app/core/src/main/java/com/fsck/k9/notification/LockScreenNotification.java

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ class LockScreenNotification { 
    }



    public void configureLockScreenNotification(Builder builder, NotificationData notificationData) {

        if (!NotificationController.platformSupportsLockScreenNotifications()) {

            return;

        }



        switch (K9.getLockScreenNotificationVisibility()) {

            case NOTHING: {

                builder.setVisibility(NotificationCompat.VISIBILITY_SECRET);

app/core/src/main/java/com/fsck/k9/notification/NotificationController.java

+0 −7
Original line number Diff line number Diff line 
package com.fsck.k9.notification;





import android.os.Build;



import com.fsck.k9.Account;

import com.fsck.k9.controller.MessageReference;

import com.fsck.k9.mail.Folder;
@@ -17,11 +15,6 @@ public class NotificationController { 
    private final NewMailNotifications newMailNotifications;





    public static boolean platformSupportsLockScreenNotifications() {

        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;

    }





    NotificationController(

            CertificateErrorNotifications certificateErrorNotifications,

            AuthenticationErrorNotifications authenticationErrorNotifications,

app/ui/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ dependencies { 
    implementation "de.cketti.library.changelog:ckchangelog:1.2.1"

    implementation "com.github.bumptech.glide:glide:3.6.1"

    implementation "com.splitwise:tokenautocomplete:2.0.7"

    implementation "de.cketti.safecontentresolver:safe-content-resolver-v14:0.9.0"

    implementation "de.cketti.safecontentresolver:safe-content-resolver-v21:0.9.0"

    implementation "com.github.amlcurran.showcaseview:library:5.4.1"

    implementation "com.xwray:groupie:2.3.0"

    implementation "com.xwray:groupie-kotlin-android-extensions:2.3.0"

app/ui/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java

+1 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ import androidx.loader.content.AsyncTaskLoader; 
import com.fsck.k9.activity.misc.Attachment;

import com.fsck.k9.message.Attachment.LoadingState;

import de.cketti.safecontentresolver.SafeContentResolver;

import de.cketti.safecontentresolver.SafeContentResolverCompat;

import org.apache.commons.io.IOUtils;

import timber.log.Timber;
@@ -59,7 +58,7 @@ public class AttachmentContentLoader extends AsyncTaskLoader<Attachment> { 


            Timber.v("Saving attachment to %s", file.getAbsolutePath());



            SafeContentResolver safeContentResolver = SafeContentResolverCompat.newInstance(context);

            SafeContentResolver safeContentResolver = SafeContentResolver.newInstance(context);

            InputStream in = safeContentResolver.openInputStream(sourceAttachment.uri);

            try {

                FileOutputStream out = new FileOutputStream(file);