Replace javax.annotation usage

app/src/main/java/com/todoroo/astrid/activity/MainActivity.java

@@ -38,7 +38,6 @@ import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
-import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import org.jetbrains.annotations.Nullable;
 import org.tasks.BuildConfig;
@@ -263,7 +262,7 @@ public class MainActivity extends InjectingAppCompatActivity
     openTaskListFragment(newTaskListFragment(filter));
   }
 
-  private void openTaskListFragment(@Nonnull TaskListFragment taskListFragment) {
+  private void openTaskListFragment(@NonNull TaskListFragment taskListFragment) {
     assertMainThread();
 
     filter = taskListFragment.filter;

app/src/main/java/org/tasks/billing/SkusAdapter.java

@@ -25,12 +25,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import java.lang.annotation.Retention;
 import java.util.List;
-import javax.annotation.Nonnull;
 import org.tasks.BuildConfig;
 import org.tasks.R;
 import org.tasks.billing.row.RowDataProvider;
@@ -66,8 +66,8 @@ public class SkusAdapter extends RecyclerView.Adapter<RowViewHolder>
   }
 
   @Override
-  @Nonnull
+  @NonNull
-  public RowViewHolder onCreateViewHolder(@Nonnull ViewGroup parent, @RowTypeDef int viewType) {
+  public RowViewHolder onCreateViewHolder(@NonNull ViewGroup parent, @RowTypeDef int viewType) {
     // Selecting a flat layout for header rows
     if (viewType == SkusAdapter.TYPE_HEADER) {
       View item =
@@ -82,7 +82,7 @@ public class SkusAdapter extends RecyclerView.Adapter<RowViewHolder>
   }
 
   @Override
-  public void onBindViewHolder(@Nonnull RowViewHolder holder, int position) {
+  public void onBindViewHolder(@NonNull RowViewHolder holder, int position) {
     SkuRowData data = getData(position);
     if (data != null) {
       holder.title.setText(data.getTitle());

app/src/main/java/org/tasks/files/FileHelper.java

@@ -22,6 +22,7 @@ import android.os.Build;
 import android.provider.OpenableColumns;
 import android.webkit.MimeTypeMap;
 import android.widget.Toast;
+import androidx.annotation.Nullable;
 import androidx.documentfile.provider.DocumentFile;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Files;
@@ -32,7 +33,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.tasks.R;
 import timber.log.Timber;
 

app/src/main/java/org/tasks/injection/InjectingJobIntentService.java

@@ -3,7 +3,6 @@ package org.tasks.injection;
 import android.content.Intent;
 import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
-import javax.annotation.Nonnull;
 import timber.log.Timber;
 
 public abstract class InjectingJobIntentService extends JobIntentService {
@@ -26,7 +25,7 @@ public abstract class InjectingJobIntentService extends JobIntentService {
     }
   }
 
-  protected abstract void doWork(@Nonnull Intent intent);
+  protected abstract void doWork(@NonNull Intent intent);
 
   protected abstract void inject(ServiceComponent component);
 }

app/src/main/java/org/tasks/jobs/WorkManager.java

@@ -17,6 +17,7 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import androidx.annotation.Nullable;
 import androidx.work.BackoffPolicy;
 import androidx.work.Constraints;
 import androidx.work.Data;
@@ -34,7 +35,6 @@ import io.reactivex.schedulers.Schedulers;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 import org.tasks.R;
 import org.tasks.data.CaldavDao;

app/src/main/java/org/tasks/receivers/RefreshReceiver.java

@@ -2,10 +2,10 @@ package org.tasks.receivers;
 
 import android.content.Context;
 import android.content.Intent;
+import androidx.annotation.NonNull;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.provider.Astrid2TaskProvider;
-import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import org.tasks.R;
 import org.tasks.injection.ForApplication;
@@ -22,7 +22,7 @@ public class RefreshReceiver extends InjectingJobIntentService {
   @Inject Preferences preferences;
 
   @Override
-  protected void doWork(@Nonnull Intent intent) {
+  protected void doWork(@NonNull Intent intent) {
     if (preferences.getBoolean(R.string.p_badges_enabled, true)) {
       Filter badgeFilter = defaultFilterProvider.getBadgeFilter();
       ShortcutBadger.applyCount(context, taskDao.count(badgeFilter));

app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java

@@ -14,6 +14,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
+import androidx.annotation.NonNull;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.FragmentActivity;
@@ -30,7 +31,6 @@ import io.reactivex.schedulers.Schedulers;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import org.tasks.LocalBroadcastManager;
 import org.tasks.R;
@@ -105,7 +105,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
     }
   }
 
-  private void openFilter(@Nonnull Filter filter) {
+  private void openFilter(@NonNull Filter filter) {
     FragmentActivity activity = getActivity();
     if (activity != null) {
       activity.startActivity(TaskIntents.getTaskListIntent(activity, filter));