From 74f402e699ac163398c1ad92465b78a8967c6937 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 11 Apr 2019 16:05:38 -0500 Subject: [PATCH] Replace javax.annotation usage --- .../java/com/todoroo/astrid/activity/MainActivity.java | 3 +-- app/src/main/java/org/tasks/billing/SkusAdapter.java | 8 ++++---- app/src/main/java/org/tasks/files/FileHelper.java | 2 +- .../org/tasks/injection/InjectingJobIntentService.java | 3 +-- app/src/main/java/org/tasks/jobs/WorkManager.java | 2 +- .../main/java/org/tasks/receivers/RefreshReceiver.java | 4 ++-- .../main/java/org/tasks/ui/NavigationDrawerFragment.java | 4 ++-- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java index c62035f14..5f3c8e30b 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java +++ b/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; diff --git a/app/src/main/java/org/tasks/billing/SkusAdapter.java b/app/src/main/java/org/tasks/billing/SkusAdapter.java index 03827908b..97828d940 100644 --- a/app/src/main/java/org/tasks/billing/SkusAdapter.java +++ b/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 } @Override - @Nonnull - public RowViewHolder onCreateViewHolder(@Nonnull ViewGroup parent, @RowTypeDef int viewType) { + @NonNull + 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 } @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()); diff --git a/app/src/main/java/org/tasks/files/FileHelper.java b/app/src/main/java/org/tasks/files/FileHelper.java index de22cbd2c..c08d3a895 100644 --- a/app/src/main/java/org/tasks/files/FileHelper.java +++ b/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; diff --git a/app/src/main/java/org/tasks/injection/InjectingJobIntentService.java b/app/src/main/java/org/tasks/injection/InjectingJobIntentService.java index 24c62d91c..adfc8bfed 100644 --- a/app/src/main/java/org/tasks/injection/InjectingJobIntentService.java +++ b/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); } diff --git a/app/src/main/java/org/tasks/jobs/WorkManager.java b/app/src/main/java/org/tasks/jobs/WorkManager.java index 98ecf2295..83dc20b7e 100644 --- a/app/src/main/java/org/tasks/jobs/WorkManager.java +++ b/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; diff --git a/app/src/main/java/org/tasks/receivers/RefreshReceiver.java b/app/src/main/java/org/tasks/receivers/RefreshReceiver.java index 2105a65b1..9b98e75f0 100644 --- a/app/src/main/java/org/tasks/receivers/RefreshReceiver.java +++ b/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)); diff --git a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index ae77b9922..cae78edc8 100644 --- a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/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));