Use androidx.annotation rather than JSR305 annotations.

oeffi/build.gradle

@@ -20,7 +20,6 @@ dependencies {
     compile 'org.osmdroid:osmdroid-android:6.0.2'
     compile 'org.slf4j:slf4j-api:1.7.25'
     compile 'com.github.tony19:logback-android:1.3.0-2'
-    compile 'com.google.code.findbugs:jsr305:3.0.0'
     testCompile 'junit:junit:4.12'
 }
 

oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java

@@ -32,7 +32,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java

@@ -30,7 +30,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nullable;
 import javax.net.ssl.SSLException;
 
 import org.osmdroid.api.IGeoPoint;
@@ -131,6 +130,7 @@ import android.widget.Filterable;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.TimePicker;
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;

oeffi/src/de/schildbach/oeffi/directions/LocationView.java

@@ -19,8 +19,6 @@ package de.schildbach.oeffi.directions;
 
 import java.util.Locale;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Strings;
 
 import de.schildbach.oeffi.Constants;
@@ -59,6 +57,7 @@ import android.widget.FrameLayout;
 import android.widget.ListAdapter;
 import android.widget.PopupMenu;
 import android.widget.TextView.OnEditorActionListener;
+import androidx.annotation.Nullable;
 
 public class LocationView extends FrameLayout implements LocationHelper.Callback {
     public static interface Listener {

oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java

@@ -23,8 +23,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Preconditions;
 
 import de.schildbach.oeffi.R;
@@ -58,6 +56,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Adapter;
 import android.widget.BaseAdapter;
+import androidx.annotation.Nullable;
 
 public final class TripsGalleryAdapter extends BaseAdapter {
     private List<Trip> trips = Collections.emptyList();

oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java

@@ -33,7 +33,6 @@ import java.util.NavigableSet;
 import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
 import javax.net.ssl.SSLException;
 
 import org.slf4j.Logger;
@@ -77,6 +76,7 @@ import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 
 public class TripsOverviewActivity extends OeffiActivity {
     private static final String INTENT_EXTRA_NETWORK = TripsOverviewActivity.class.getName() + ".network";

oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java

@@ -17,10 +17,10 @@
 
 package de.schildbach.oeffi.directions.list;
 
-import javax.annotation.Nullable;
-
 import de.schildbach.pte.dto.Location;
 
+import androidx.annotation.Nullable;
+
 public interface QueryHistoryContextMenuItemListener {
     boolean onQueryHistoryContextMenuItemClick(int adapterPosition, Location from, Location to,
             @Nullable byte[] serializedSavedTrip, int menuItemId, @Nullable Location menuItemLocation);

oeffi/src/de/schildbach/oeffi/network/NetworkResources.java

@@ -21,11 +21,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Locale;
 
-import javax.annotation.Nullable;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import androidx.annotation.Nullable;
 
 public class NetworkResources {
     public final @Nullable Drawable icon;

oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java

@@ -17,8 +17,6 @@
 
 package de.schildbach.oeffi.network.list;
 
-import javax.annotation.Nullable;
-
 import de.schildbach.oeffi.R;
 import de.schildbach.oeffi.network.NetworkResources;
 
@@ -30,6 +28,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 public class NetworkViewHolder extends RecyclerView.ViewHolder {

oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java

@@ -28,8 +28,6 @@ import java.util.Locale;
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,6 +82,7 @@ import android.view.animation.AnimationUtils;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.ViewAnimator;
+import androidx.annotation.Nullable;
 import okhttp3.HttpUrl;
 
 public class PlanActivity extends Activity {

oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java

@@ -37,8 +37,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 
-import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,6 +61,7 @@ import android.database.CursorWrapper;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
+import androidx.annotation.Nullable;
 import okhttp3.HttpUrl;
 
 public class PlanContentProvider extends ContentProvider {

oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java

@@ -20,8 +20,6 @@ package de.schildbach.oeffi.plans;
 import java.io.File;
 import java.net.HttpURLConnection;
 
-import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,6 +59,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.pm.ShortcutInfoCompat;

oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java

@@ -19,8 +19,6 @@ package de.schildbach.oeffi.plans.list;
 
 import java.util.Date;
 
-import javax.annotation.Nullable;
-
 import de.schildbach.oeffi.R;
 import de.schildbach.oeffi.network.NetworkResources;
 
@@ -37,6 +35,7 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import okhttp3.Call;
 

oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java

@@ -24,8 +24,6 @@ import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import de.schildbach.oeffi.Application;
 import de.schildbach.oeffi.Constants;
 import de.schildbach.oeffi.R;
@@ -40,6 +38,7 @@ import android.os.Handler;
 import android.provider.BaseColumns;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import okhttp3.Cache;
 import okhttp3.Call;

oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java

@@ -21,8 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import de.schildbach.oeffi.MyActionBar;
 import de.schildbach.oeffi.OeffiActivity;
 import de.schildbach.oeffi.R;
@@ -42,6 +40,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ViewAnimator;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 

oeffi/src/de/schildbach/oeffi/stations/NetworkContentProvider.java

@@ -27,8 +27,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,6 +45,7 @@ import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
+import androidx.annotation.Nullable;
 import okhttp3.HttpUrl;
 
 public final class NetworkContentProvider extends ContentProvider {

oeffi/src/de/schildbach/oeffi/stations/Station.java

@@ -23,8 +23,6 @@ import java.util.Date;
 import java.util.EnumSet;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import de.schildbach.pte.NetworkId;
 import de.schildbach.pte.dto.Departure;
 import de.schildbach.pte.dto.LineDestination;
@@ -32,6 +30,8 @@ import de.schildbach.pte.dto.Location;
 import de.schildbach.pte.dto.Product;
 import de.schildbach.pte.dto.QueryDeparturesResult;
 
+import androidx.annotation.Nullable;
+
 public class Station {
     public final NetworkId network;
     public Location location;

oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java

@@ -31,8 +31,6 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
-
 import org.osmdroid.util.GeoPoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -87,6 +85,7 @@ import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.ViewAnimator;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 

oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java

@@ -36,8 +36,6 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
-
 import org.osmdroid.util.BoundingBox;
 import org.osmdroid.util.GeoPoint;
 import org.slf4j.Logger;
@@ -123,6 +121,7 @@ import android.widget.Button;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.ViewAnimator;
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.ItemTouchHelper;

oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java

@@ -17,8 +17,6 @@
 
 package de.schildbach.oeffi.stations.list;
 
-import javax.annotation.Nullable;
-
 import de.schildbach.oeffi.R;
 import de.schildbach.oeffi.stations.FavoriteStationsProvider;
 import de.schildbach.pte.NetworkId;
@@ -31,6 +29,7 @@ import android.net.Uri;
 import android.provider.BaseColumns;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 public class FavoriteStationsAdapter extends RecyclerView.Adapter<FavoriteStationViewHolder> {

oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java

@@ -19,12 +19,12 @@ package de.schildbach.oeffi.stations.list;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import de.schildbach.pte.NetworkId;
 import de.schildbach.pte.dto.Departure;
 import de.schildbach.pte.dto.Location;
 
+import androidx.annotation.Nullable;
+
 public interface StationContextMenuItemListener {
     boolean onStationContextMenuItemClick(int adapterPosition, NetworkId network, Location station,
             @Nullable List<Departure> departures, int menuItemId);

oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java

@@ -25,8 +25,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Joiner;
 
 import de.schildbach.oeffi.Constants;
@@ -61,6 +59,7 @@ import android.widget.ImageButton;
 import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnMenuItemClickListener;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 public class StationViewHolder extends RecyclerView.ViewHolder {

oeffi/src/de/schildbach/oeffi/util/ChangelogDialogBuilder.java

@@ -17,8 +17,6 @@
 
 package de.schildbach.oeffi.util;
 
-import javax.annotation.Nullable;
-
 import de.schildbach.oeffi.Constants;
 import de.schildbach.oeffi.R;
 
@@ -31,6 +29,7 @@ import android.view.View;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import androidx.annotation.Nullable;
 import okhttp3.HttpUrl;
 
 public class ChangelogDialogBuilder extends AlertDialog.Builder {

oeffi/src/de/schildbach/oeffi/util/Downloader.java

@@ -32,8 +32,6 @@ import java.util.Date;
 import java.util.Random;
 import java.util.concurrent.Semaphore;
 
-import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,6 +42,7 @@ import com.google.common.util.concurrent.Striped;
 import de.schildbach.oeffi.Application;
 import de.schildbach.oeffi.util.bzip2.BZip2CompressorInputStream;
 
+import androidx.annotation.Nullable;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.Headers;