Merge pull request #3907 from k9mail/androidx_migration

Androidx migration

.travis.yml

@@ -3,12 +3,12 @@ android:
  components:
     - tools
     - build-tools-28.0.3
-    - android-27
+    - android-28
     - extra-android-m2repository
 
 jdk: oraclejdk8
 
 before_install:
-- yes | sdkmanager "platforms;android-27"
+- yes | sdkmanager "platforms;android-28"
 
 script: ./gradlew testDebug

app/core/src/main/java/com/fsck/k9/Account.java

@@ -12,7 +12,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.fsck.k9.backend.api.SyncConfig.ExpungePolicy;

app/core/src/main/java/com/fsck/k9/ActivityExtensions.kt

@@ -1,7 +1,7 @@
 package com.fsck.k9
 
 import android.app.Activity
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import android.widget.Toast
 
 fun Activity.finishWithErrorToast(@StringRes errorRes: Int, vararg formatArgs: String) {

app/core/src/main/java/com/fsck/k9/Preferences.java

@@ -13,10 +13,10 @@ import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import android.content.Context;
-import android.support.annotation.GuardedBy;
-import android.support.annotation.NonNull;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.RestrictTo.Scope;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 
 import com.fsck.k9.backend.BackendManager;
 import com.fsck.k9.mail.MessagingException;

app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeader.java

@@ -3,7 +3,7 @@ package com.fsck.k9.autocrypt;
 
 import java.util.Arrays;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 class AutocryptGossipHeader {

app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParser.java

@@ -6,9 +6,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.mail.Part;
 import com.fsck.k9.mail.internet.MimeUtility;

app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeader.java

@@ -4,7 +4,7 @@ package com.fsck.k9.autocrypt;
 import java.util.Arrays;
 import java.util.Map;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import okio.ByteString;
 

app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptHeaderParser.java

@@ -4,9 +4,9 @@ package com.fsck.k9.autocrypt;
 import java.util.ArrayList;
 import java.util.Map;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.internet.MimeUtility;

app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptOperations.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.fsck.k9.mail.Address;
 import com.fsck.k9.mail.Message;

app/core/src/main/java/com/fsck/k9/cache/EmailProviderCache.java

@@ -7,7 +7,7 @@ import java.util.Map;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mailstore.LocalMessage;

app/core/src/main/java/com/fsck/k9/controller/MessageReference.java

@@ -3,7 +3,7 @@ package com.fsck.k9.controller;
 
 import java.util.StringTokenizer;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.fsck.k9.mail.Flag;
 import com.fsck.k9.mail.filter.Base64;

app/core/src/main/java/com/fsck/k9/controller/MessagingController.java

@@ -30,8 +30,8 @@ import android.content.Intent;
 import android.os.PowerManager;
 import android.os.Process;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.Account.DeletePolicy;

app/core/src/main/java/com/fsck/k9/crypto/MessageCryptoStructureDetector.java

@@ -7,8 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.helper.StringHelper;
 import com.fsck.k9.mail.Body;

app/core/src/main/java/com/fsck/k9/helper/Contacts.java

@@ -12,7 +12,7 @@ import android.net.Uri;
 import android.provider.ContactsContract;
 import timber.log.Timber;
 import android.provider.ContactsContract.CommonDataKinds.Photo;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import com.fsck.k9.mail.Address;
 

app/core/src/main/java/com/fsck/k9/helper/K9AlarmManager.java

@@ -5,8 +5,8 @@ import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.power.DozeChecker;
 

app/core/src/main/java/com/fsck/k9/helper/ReplyToParser.java

@@ -6,7 +6,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.mail.Address;

app/core/src/main/java/com/fsck/k9/helper/RetainFragment.java

@@ -2,8 +2,8 @@ package com.fsck.k9.helper;
 
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 
 public class RetainFragment<T> extends Fragment {

app/core/src/main/java/com/fsck/k9/helper/SingleLiveEvent.java

@@ -19,12 +19,12 @@ package com.fsck.k9.helper;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.Observer;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import timber.log.Timber;
 
@@ -43,7 +43,7 @@ public class SingleLiveEvent<T> extends MutableLiveData<T> {
     private final AtomicBoolean pending = new AtomicBoolean(false);
 
     @MainThread
-    public void observe(@NonNull LifecycleOwner owner, @NonNull final Observer<T> observer) {
+    public void observe(@NonNull LifecycleOwner owner, @NonNull final Observer<? super T> observer) {
 
         if (hasActiveObservers()) {
             Timber.w("Multiple observers registered but only one will be notified of changes.");
@@ -73,4 +73,4 @@ public class SingleLiveEvent<T> extends MutableLiveData<T> {
     public void recall() {
         setValue(getValue());
     }
-}
+}

app/core/src/main/java/com/fsck/k9/helper/jsoup/NodeFilter.java

@@ -1,7 +1,7 @@
 package com.fsck.k9.helper.jsoup;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.jsoup.nodes.Node;
 

app/core/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java

@@ -7,9 +7,9 @@ import java.util.Map;
 import java.util.Stack;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
 
 import com.fsck.k9.DI;
 import timber.log.Timber;

app/core/src/main/java/com/fsck/k9/mailstore/CryptoResultAnnotation.java

@@ -2,8 +2,8 @@ package com.fsck.k9.mailstore;
 
 
 import android.app.PendingIntent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fsck.k9.mail.internet.MimeBodyPart;
 

app/core/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java

@@ -10,8 +10,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import timber.log.Timber;
 
 import com.fsck.k9.mail.MessagingException;

app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java

@@ -24,7 +24,7 @@ import java.util.UUID;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.DI;

app/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java

@@ -9,7 +9,7 @@ import java.util.Date;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.core.BuildConfig;

app/core/src/main/java/com/fsck/k9/mailstore/LocalStore.java

@@ -24,7 +24,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.fsck.k9.Account;

app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java

@@ -6,9 +6,9 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
 
 import com.fsck.k9.CoreResourceProvider;
 import com.fsck.k9.crypto.MessageCryptoStructureDetector;

app/core/src/main/java/com/fsck/k9/message/AutocryptStatusInteractor.java

@@ -5,10 +5,10 @@ import java.io.InputStream;
 
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
 
 import org.openintents.openpgp.OpenPgpError;
 import org.openintents.openpgp.util.OpenPgpApi;

app/core/src/main/java/com/fsck/k9/message/PgpMessageBuilder.java

@@ -9,9 +9,9 @@ import java.util.Arrays;
 
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.CoreResourceProvider;
 import com.fsck.k9.DI;

app/core/src/main/java/com/fsck/k9/message/SimpleMessageBuilder.java

@@ -2,7 +2,7 @@ package com.fsck.k9.message;
 
 
 import android.content.Intent;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.CoreResourceProvider;
 import com.fsck.k9.DI;

app/core/src/main/java/com/fsck/k9/message/extractors/AttachmentInfoExtractor.java

@@ -9,11 +9,11 @@ import java.util.Locale;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import timber.log.Timber;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.WorkerThread;
 
 import com.fsck.k9.mail.Body;
 import com.fsck.k9.mail.MessagingException;

app/core/src/main/java/com/fsck/k9/message/extractors/MessageFulltextCreator.java

@@ -1,7 +1,7 @@
 package com.fsck.k9.message.extractors;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fsck.k9.message.html.HtmlConverter;
 import com.fsck.k9.mail.Message;

app/core/src/main/java/com/fsck/k9/message/extractors/MessagePreviewCreator.java

@@ -1,7 +1,7 @@
 package com.fsck.k9.message.extractors;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.Part;

app/core/src/main/java/com/fsck/k9/message/extractors/PreviewResult.java

@@ -1,7 +1,7 @@
 package com.fsck.k9.message.extractors;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 public class PreviewResult {

app/core/src/main/java/com/fsck/k9/message/extractors/PreviewTextExtractor.java

@@ -1,7 +1,7 @@
 package com.fsck.k9.message.extractors;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fsck.k9.message.html.HtmlConverter;
 import com.fsck.k9.mail.Part;

app/core/src/main/java/com/fsck/k9/message/extractors/TextPartFinder.java

@@ -1,8 +1,8 @@
 package com.fsck.k9.message.extractors;
 
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fsck.k9.mail.Body;
 import com.fsck.k9.mail.BodyPart;

app/core/src/main/java/com/fsck/k9/message/signature/HtmlSignatureRemover.java

@@ -3,7 +3,7 @@ package com.fsck.k9.message.signature;
 
 import java.util.regex.Pattern;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fsck.k9.helper.jsoup.AdvancedNodeTraversor;
 import com.fsck.k9.helper.jsoup.NodeFilter;

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

@@ -2,9 +2,9 @@ package com.fsck.k9.notification;
 
 
 import android.app.PendingIntent;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.BigTextStyle;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.BigTextStyle;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.fsck.k9.Account;
 

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

@@ -3,9 +3,9 @@ package com.fsck.k9.notification;
 
 import android.app.PendingIntent;
 import android.content.Context;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.BigTextStyle;
-import android.support.v4.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.BigTextStyle;
+import androidx.core.app.NotificationCompat.Builder;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;

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

@@ -2,8 +2,8 @@ package com.fsck.k9.notification;
 
 
 import android.app.PendingIntent;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.fsck.k9.Account;
 

app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt

@@ -2,7 +2,7 @@ package com.fsck.k9.notification
 
 import android.app.NotificationManager
 import android.content.Context
-import android.support.v4.app.NotificationManagerCompat
+import androidx.core.app.NotificationManagerCompat
 import com.fsck.k9.AccountPreferenceSerializer
 import com.fsck.k9.LocalKeyStoreManager
 import com.fsck.k9.mail.ssl.LocalKeyStore

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

@@ -8,9 +8,9 @@ import android.app.KeyguardManager;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.app.NotificationCompat.InboxStyle;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationCompat.InboxStyle;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;

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

@@ -6,8 +6,8 @@ import java.util.List;
 import java.util.Set;
 
 import android.app.Notification;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.Builder;
 import android.text.TextUtils;
 
 import com.fsck.k9.Account;

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

@@ -2,7 +2,7 @@ package com.fsck.k9.notification;
 
 
 import android.app.Notification;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.util.SparseArray;
 
 import com.fsck.k9.Account;

app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt

@@ -5,7 +5,7 @@ import android.app.NotificationChannel
 import android.app.NotificationChannelGroup
 import android.app.NotificationManager
 import android.os.Build
-import android.support.annotation.RequiresApi
+import androidx.annotation.RequiresApi
 import com.fsck.k9.Account
 import com.fsck.k9.Preferences
 import java.util.concurrent.Executor

app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt

@@ -2,8 +2,8 @@ package com.fsck.k9.notification
 
 import android.content.Context
 import android.net.Uri
-import android.support.v4.app.NotificationCompat
-import android.support.v4.app.NotificationManagerCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import android.text.TextUtils
 import com.fsck.k9.Account
 import com.fsck.k9.K9

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

@@ -2,8 +2,8 @@ package com.fsck.k9.notification;
 
 
 import android.app.PendingIntent;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.helper.ExceptionHelper;

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

@@ -2,8 +2,8 @@ package com.fsck.k9.notification;
 
 
 import android.app.PendingIntent;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.mail.Folder;

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

@@ -5,9 +5,9 @@ import java.util.ArrayList;
 
 import android.app.Notification;
 import android.app.PendingIntent;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.app.NotificationCompat.WearableExtender;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationCompat.WearableExtender;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;

app/core/src/main/java/com/fsck/k9/power/DozeChecker.java

@@ -4,7 +4,7 @@ package com.fsck.k9.power;
 import android.content.Context;
 import android.os.Build;
 import android.os.PowerManager;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 
 public class DozeChecker {

app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.java

@@ -14,7 +14,7 @@ import java.util.UUID;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
 import com.fsck.k9.Account;

app/core/src/main/java/com/fsck/k9/preferences/StoragePersister.kt

@@ -1,6 +1,6 @@
 package com.fsck.k9.preferences
 
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 
 
 interface StoragePersister {

app/core/src/main/java/com/fsck/k9/provider/AttachmentProvider.java

@@ -11,8 +11,8 @@ import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fsck.k9.DI;
 import com.fsck.k9.mailstore.LocalStoreProvider;

app/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java

@@ -13,10 +13,10 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+import androidx.core.content.FileProvider;
 import timber.log.Timber;
 
 import com.fsck.k9.K9;

app/core/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java

@@ -14,10 +14,10 @@ import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
 import android.text.TextUtils;
 import timber.log.Timber;
 

app/core/src/main/java/com/fsck/k9/provider/EmailProvider.java

@@ -538,7 +538,7 @@ public class EmailProvider extends ContentProvider {
     }
 
     /**
-     * This class is needed to make {@link android.support.v4.widget.CursorAdapter} work with our database schema.
+     * This class is needed to make {@link androidx.cursoradapter.widget.CursorAdapter} work with our database schema.
      *
      * <p>
      * {@code CursorAdapter} requires a column named {@code "_id"} containing a stable id. We use

app/core/src/main/java/com/fsck/k9/provider/RawMessageProvider.java

@@ -14,8 +14,8 @@ import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.DI;

app/core/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java

@@ -9,7 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 import android.os.PowerManager;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.DI;

app/core/src/test/java/com/fsck/k9/controller/UidReverseComparatorTest.java

@@ -1,7 +1,7 @@
 package com.fsck.k9.controller;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fsck.k9.mail.Message;
 import org.junit.Before;

app/core/src/test/java/com/fsck/k9/mailstore/MessageViewInfoExtractorTest.java

@@ -11,7 +11,7 @@ import java.util.TimeZone;
 import android.app.Application;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fsck.k9.DI;
 import com.fsck.k9.K9RobolectricTest;

app/core/src/test/java/com/fsck/k9/message/extractors/AttachmentInfoExtractorTest.java

@@ -3,7 +3,7 @@ package com.fsck.k9.message.extractors;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.fsck.k9.RobolectricTest;
 import com.fsck.k9.mail.Part;

app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationsTest.java

@@ -3,9 +3,9 @@ package com.fsck.k9.notification;
 
 import android.app.Notification;
 import android.app.PendingIntent;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.testing.MockHelper;

app/core/src/test/java/com/fsck/k9/notification/BaseNotificationsTest.java

@@ -1,8 +1,8 @@
 package com.fsck.k9.notification;
 
 
-import android.support.v4.app.NotificationCompat.BigTextStyle;
-import android.support.v4.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationCompat.BigTextStyle;
+import androidx.core.app.NotificationCompat.Builder;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;

app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationsTest.java

@@ -3,9 +3,9 @@ package com.fsck.k9.notification;
 
 import android.app.Notification;
 import android.app.PendingIntent;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.testing.MockHelper;

app/core/src/test/java/com/fsck/k9/notification/DeviceNotificationsTest.java

@@ -6,10 +6,10 @@ import java.util.List;
 
 import android.app.Application;
 import android.app.Notification;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.BigTextStyle;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.app.NotificationCompat.InboxStyle;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.BigTextStyle;
+import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationCompat.InboxStyle;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;

app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationTest.java

@@ -5,8 +5,8 @@ import java.util.Arrays;
 
 import android.app.Notification;
 import android.content.Context;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.Builder;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;

app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationsTest.java

@@ -2,7 +2,7 @@ package com.fsck.k9.notification;
 
 
 import android.app.Notification;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;

app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationsTest.java

@@ -3,9 +3,9 @@ package com.fsck.k9.notification;
 
 import android.app.Notification;
 import android.app.PendingIntent;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.testing.MockHelper;

app/core/src/test/java/com/fsck/k9/notification/SyncNotificationsTest.java

@@ -3,9 +3,9 @@ package com.fsck.k9.notification;
 
 import android.app.Notification;
 import android.app.PendingIntent;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.testing.MockHelper;

app/core/src/test/java/com/fsck/k9/notification/WearNotificationsTest.java

@@ -4,10 +4,10 @@ package com.fsck.k9.notification;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.support.v4.app.NotificationCompat.Action;
-import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.app.NotificationCompat.Extender;
-import android.support.v4.app.NotificationCompat.WearableExtender;
+import androidx.core.app.NotificationCompat.Action;
+import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationCompat.Extender;
+import androidx.core.app.NotificationCompat.WearableExtender;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;

app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/EncryptionDetector.java

@@ -1,7 +1,7 @@
 package com.fsck.k9.crypto.openpgp;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fsck.k9.crypto.MessageCryptoStructureDetector;
 import com.fsck.k9.mail.Body;

app/k9mail/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     implementation project(":backend:pop3")
     implementation project(":backend:webdav")
 
-    implementation "com.android.support:appcompat-v7:${versions.supportLibrary}"
+    implementation "androidx.appcompat:appcompat:${versions.androidxAppCompat}"
     implementation "com.jakewharton.timber:timber:${versions.timber}"
 
     testImplementation "org.robolectric:robolectric:${versions.robolectric}"
@@ -31,7 +31,7 @@ dependencies {
     testImplementation "org.jdom:jdom2:2.0.6"
     testImplementation "org.koin:koin-test:${versions.koin}"
 
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.1"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.1.1"
 }
 
 android {
@@ -50,7 +50,7 @@ android {
 
         generatedDensities = ['mdpi', 'hdpi', 'xhdpi']
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {

app/k9mail/proguard-rules.pro

@@ -23,6 +23,6 @@
 
 -keep public class org.openintents.openpgp.**
 
--keepclassmembers class * extends android.support.v7.widget.SearchView {
-   public <init>(android.content.Context);
+-keepclassmembers class * extends androidx.appcompat.widget.SearchView {
+    public <init>(android.content.Context);
 }

app/k9mail/src/androidTest/java/com/fsck/k9/external/MessageProviderTest.java

@@ -5,7 +5,7 @@ import java.util.List;
 
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 import android.test.ProviderTestCase2;
 import android.test.mock.MockContentResolver;
 

app/k9mail/src/androidTest/java/com/fsck/k9/helper/FileHelperTest.java

@@ -1,6 +1,6 @@
 package com.fsck.k9.helper;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/k9mail/src/androidTest/java/com/fsck/k9/provider/EmailProviderTest.java

@@ -8,8 +8,8 @@ import java.util.GregorianCalendar;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 import android.test.ProviderTestCase2;
 
 import com.fsck.k9.Account;

app/k9mail/src/main/java/com/fsck/k9/directshare/K9ChooserTargetService.java

@@ -15,8 +15,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.service.chooser.ChooserTarget;
 import android.service.chooser.ChooserTargetService;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fsck.k9.activity.MessageCompose;
 import com.fsck.k9.activity.compose.RecipientLoader;

app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.java

@@ -6,7 +6,7 @@ import java.util.List;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.TaskStackBuilder;
 import android.text.TextUtils;
 
 import com.fsck.k9.Account;

app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java

@@ -11,7 +11,7 @@ import android.database.Cursor;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Binder;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.text.SpannableString;
 import android.text.style.StyleSpan;
 import android.view.View;

app/k9mail/src/test/java/com/fsck/k9/DependencyInjectionTest.kt

@@ -1,7 +1,7 @@
 package com.fsck.k9
 
-import android.arch.lifecycle.Lifecycle
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
 import com.fsck.k9.ui.endtoend.AutocryptKeyTransferActivity
 import com.nhaarman.mockito_kotlin.doReturn
 import com.nhaarman.mockito_kotlin.mock

app/storage/src/main/java/com/fsck/k9/preferences/K9StoragePersister.java

@@ -10,7 +10,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;
 import android.os.SystemClock;
-import android.support.annotation.CheckResult;
+import androidx.annotation.CheckResult;
 
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.preferences.migrations.StorageMigrations;

app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo51.java

@@ -12,9 +12,9 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
 import com.fsck.k9.Account;

app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo60.java

@@ -11,7 +11,7 @@ import java.util.Map;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 import com.fsck.k9.controller.MessagingControllerCommands.PendingAppend;
 import com.fsck.k9.controller.MessagingControllerCommands.PendingCommand;

app/ui/build.gradle

@@ -18,21 +18,21 @@ dependencies {
     implementation project(':plugins:HoloColorPicker')
     implementation project(':plugins:openpgp-api-lib:openpgp-api')
 
-    implementation "com.android.support:appcompat-v7:${versions.supportLibrary}"
-    implementation "com.takisoft.fix:preference-v7:${versions.preferencesFix}"
-    implementation "com.takisoft.fix:preference-v7-datetimepicker:${versions.preferencesFix}"
-    implementation "com.takisoft.fix:preference-v7-colorpicker:${versions.preferencesFix}"
-    implementation "com.takisoft.fix:preference-v7-ringtone:${versions.preferencesFix}"
-    implementation "com.android.support:recyclerview-v7:${versions.supportLibrary}"
-    implementation "android.arch.lifecycle:extensions:${versions.lifecycleExtensions}"
+    implementation "androidx.appcompat:appcompat:${versions.androidxAppCompat}"
+    implementation "com.takisoft.preferencex:preferencex:${versions.preferencesFix}"
+    implementation "com.takisoft.preferencex:preferencex-datetimepicker:${versions.preferencesFix}"
+    implementation "com.takisoft.preferencex:preferencex-colorpicker:${versions.preferencesFix}"
+    implementation "com.takisoft.preferencex:preferencex-ringtone:${versions.preferencesFix}"
+    implementation "androidx.recyclerview:recyclerview:${versions.androidxRecyclerView}"
+    implementation "androidx.lifecycle:lifecycle-extensions:${versions.androidxLifecycleExtensions}"
     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 "com.github.amlcurran.showcaseview:library:5.4.1"
-    implementation "com.xwray:groupie:2.1.0"
-    implementation "com.xwray:groupie-kotlin-android-extensions:2.1.0"
-    implementation 'com.mikepenz:materialdrawer:6.0.7'
+    implementation "com.xwray:groupie:2.3.0"
+    implementation "com.xwray:groupie-kotlin-android-extensions:2.3.0"
+    implementation 'com.mikepenz:materialdrawer:6.1.1'
     implementation 'com.mikepenz:fontawesome-typeface:5.3.1.1@aar'
     implementation 'com.github.ByteHamster:SearchPreference:v1.1.4'
 

app/ui/src/main/java/com/fsck/k9/account/AccountRemoverService.kt

@@ -2,7 +2,7 @@ package com.fsck.k9.account
 
 import android.content.Context
 import android.content.Intent
-import android.support.v4.app.JobIntentService
+import androidx.core.app.JobIntentService
 import org.koin.standalone.KoinComponent
 import org.koin.standalone.inject
 

app/ui/src/main/java/com/fsck/k9/activity/Accounts.java

@@ -27,7 +27,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.SparseBooleanArray;

app/ui/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java

@@ -8,8 +8,8 @@ import android.content.res.Resources;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.AttrRes;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;

app/ui/src/main/java/com/fsck/k9/activity/AppCompatPreferenceActivity.java

@@ -18,11 +18,11 @@ package com.fsck.k9.activity;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/ui/src/main/java/com/fsck/k9/activity/FolderList.java

@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.text.TextUtils.TruncateAt;
 import android.text.format.DateUtils;
 import android.view.ContextMenu;

app/ui/src/main/java/com/fsck/k9/activity/K9Activity.java

@@ -4,12 +4,12 @@ package com.fsck.k9.activity;
 import android.Manifest;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StringRes;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MotionEvent;
 
 import android.view.View;

app/ui/src/main/java/com/fsck/k9/activity/K9PreferenceActivity.java

@@ -1,13 +1,13 @@
 package com.fsck.k9.activity;
 
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.Lifecycle.State;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.LifecycleRegistry;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.Lifecycle.State;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.MenuItem;
 
 import com.fsck.k9.K9;

app/ui/src/main/java/com/fsck/k9/activity/MessageCompose.java

@@ -24,9 +24,9 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.app.ActionBar;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.TypedValue;

app/ui/src/main/java/com/fsck/k9/activity/MessageList.java

@@ -15,12 +15,12 @@ import android.content.res.TypedArray;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentManager.OnBackStackChangedListener;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentManager.OnBackStackChangedListener;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.ActionBarDrawerToggle;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;

app/ui/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java

@@ -8,13 +8,13 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
+import androidx.fragment.app.FragmentManager;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.Preferences;

app/ui/src/main/java/com/fsck/k9/activity/NotificationDeleteConfirmation.java

@@ -10,7 +10,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;

app/ui/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java

@@ -8,7 +8,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.widget.TextView;
 
 import com.fsck.k9.Account;

app/ui/src/main/java/com/fsck/k9/activity/compose/AttachmentPresenter.java

@@ -12,8 +12,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
 
 import com.fsck.k9.activity.compose.ComposeCryptoStatus.AttachErrorState;
 import com.fsck.k9.activity.loader.AttachmentContentLoader;

app/ui/src/main/java/com/fsck/k9/activity/compose/PgpEnabledErrorDialog.java

@@ -8,7 +8,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.view.LayoutInflater;
 import android.view.View;
 

app/ui/src/main/java/com/fsck/k9/activity/compose/PgpEncryptDescriptionDialog.java

@@ -8,7 +8,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.view.LayoutInflater;
 import android.view.View;
 

app/ui/src/main/java/com/fsck/k9/activity/compose/PgpInlineDialog.java

@@ -8,7 +8,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.view.LayoutInflater;
 import android.view.View;
 

app/ui/src/main/java/com/fsck/k9/activity/compose/PgpSignOnlyDialog.java

@@ -8,7 +8,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.view.LayoutInflater;
 import android.view.View;