Raise deployment target and migrate to AndroidX

src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java

@@ -6,7 +6,7 @@ import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 

src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Arrays;
 import java.util.List;

src/org/thoughtcrime/securesms/jobmanager/Constraint.java

@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.jobmanager;
 
 import android.app.job.JobInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 public interface Constraint {
 

src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;

src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface ConstraintObserver {
 

src/org/thoughtcrime/securesms/jobmanager/Data.java

@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.ExecutorService;
 

src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager;
 
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 

src/org/thoughtcrime/securesms/jobmanager/Job.java

@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.jobmanager;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.logging.Log;
 

src/org/thoughtcrime/securesms/jobmanager/JobController.java

@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.jobmanager;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import com.annimon.stream.Stream;
 

src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;

src/org/thoughtcrime/securesms/jobmanager/JobLogger.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 public class JobLogger {

src/org/thoughtcrime/securesms/jobmanager/JobManager.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobmanager;
 import android.app.Application;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.impl.DefaultExecutorFactory;
 import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer;

src/org/thoughtcrime/securesms/jobmanager/JobRunner.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager;
 
 import android.app.Application;
 import android.os.PowerManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 

src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java

@@ -8,8 +8,8 @@ import android.app.job.JobService;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.logging.Log;

src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobmanager;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Service that keeps the application in memory while the app is closed.

src/org/thoughtcrime/securesms/jobmanager/Scheduler.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.List;
 

src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl;
 
 import android.app.Application;
 import android.app.job.JobInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 import org.thoughtcrime.securesms.sms.TelephonyServiceState;

src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl;
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.TelephonyManager;

src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.impl;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.ExecutorFactory;
 

src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.impl;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.logging.Log;

src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java

@@ -5,8 +5,8 @@ import android.app.job.JobInfo;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 

src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java

@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.ConstraintObserver;
 

src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl;
 
 import android.app.Application;
 import android.app.job.JobInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 

src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl;
 
 import android.app.Application;
 import android.app.job.JobInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.impl;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;

src/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.migration;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.logging.Log;

src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerDatabase.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;

src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java

@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobmanager.migration;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob;
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob;

src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerMigrator.java

@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.jobmanager.migration;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec;

src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Objects;
 

src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Objects;
 

src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java

@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.List;
 import java.util.Objects;

src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java

@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Objects;
 

src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java

@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import java.util.List;