From 1ec70d18865dc2ca8072832af03de6142feb04b6 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 25 Mar 2023 16:06:40 +0100 Subject: [PATCH] Nullable: use annotation from `javax.annotation` --- oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java | 2 +- .../src/de/schildbach/oeffi/directions/DirectionsActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/directions/LocationView.java | 2 +- .../de/schildbach/oeffi/directions/TripsGalleryAdapter.java | 2 +- .../de/schildbach/oeffi/directions/TripsOverviewActivity.java | 2 +- .../directions/list/QueryHistoryContextMenuItemListener.java | 3 ++- oeffi/src/de/schildbach/oeffi/network/NetworkResources.java | 2 +- .../de/schildbach/oeffi/network/list/NetworkViewHolder.java | 3 ++- oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java | 2 +- oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java | 2 +- oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java | 2 +- oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java | 3 ++- oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java | 3 ++- .../src/de/schildbach/oeffi/preference/DirectionsFragment.java | 3 ++- oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java | 3 ++- .../de/schildbach/oeffi/stations/FavoriteStationsActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/stations/Station.java | 2 +- .../de/schildbach/oeffi/stations/StationDetailsActivity.java | 2 +- oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java | 2 +- .../oeffi/stations/list/FavoriteStationsAdapter.java | 3 ++- .../oeffi/stations/list/StationContextMenuItemListener.java | 2 +- .../de/schildbach/oeffi/stations/list/StationViewHolder.java | 2 +- oeffi/src/de/schildbach/oeffi/util/Downloader.java | 2 +- 25 files changed, 32 insertions(+), 25 deletions(-) diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java index 73b32cd..fbab782 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java @@ -37,7 +37,6 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import androidx.annotation.Nullable; import androidx.core.view.MenuProvider; import androidx.drawerlayout.widget.DrawerLayout; import androidx.recyclerview.widget.LinearLayoutManager; @@ -72,6 +71,7 @@ import okhttp3.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java index ea0dbd9..7d1b8a8 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java @@ -61,7 +61,6 @@ import android.widget.TextView; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContract; import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; @@ -118,6 +117,7 @@ import org.osmdroid.views.overlay.Overlay; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import javax.net.ssl.SSLException; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java index da74771..7c14a5b 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/LocationView.java +++ b/oeffi/src/de/schildbach/oeffi/directions/LocationView.java @@ -41,7 +41,6 @@ import android.widget.FrameLayout; import android.widget.ListAdapter; import android.widget.PopupMenu; import android.widget.TextView.OnEditorActionListener; -import androidx.annotation.Nullable; import com.google.common.base.Strings; import de.schildbach.oeffi.Constants; import de.schildbach.oeffi.R; @@ -53,6 +52,7 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.Point; +import javax.annotation.Nullable; import java.util.Locale; public class LocationView extends FrameLayout implements LocationHelper.Callback { diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java b/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java index 7d1d88c..01f314e 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java @@ -41,7 +41,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Adapter; import android.widget.BaseAdapter; -import androidx.annotation.Nullable; import com.google.common.base.Preconditions; import de.schildbach.oeffi.R; import de.schildbach.pte.dto.Line; @@ -53,6 +52,7 @@ import de.schildbach.pte.dto.Trip.Individual; import de.schildbach.pte.dto.Trip.Leg; import de.schildbach.pte.dto.Trip.Public; +import javax.annotation.Nullable; import java.util.Collections; import java.util.Date; import java.util.List; diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java index 59d544f..ad62ea8 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java @@ -31,7 +31,6 @@ import android.text.format.DateUtils; import android.view.View; import android.widget.AdapterView; import android.widget.TextView; -import androidx.annotation.Nullable; import com.google.common.collect.ComparisonChain; import com.google.common.collect.Ordering; import com.google.common.util.concurrent.Uninterruptibles; @@ -54,6 +53,7 @@ import de.schildbach.pte.exception.SessionExpiredException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import javax.net.ssl.SSLException; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java b/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java index 74d0179..a8a2f54 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java +++ b/oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java @@ -17,9 +17,10 @@ package de.schildbach.oeffi.directions.list; -import androidx.annotation.Nullable; import de.schildbach.pte.dto.Location; +import javax.annotation.Nullable; + public interface QueryHistoryContextMenuItemListener { boolean onQueryHistoryContextMenuItemClick(int adapterPosition, Location from, Location to, @Nullable byte[] serializedSavedTrip, int menuItemId, @Nullable Location menuItemLocation); diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java b/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java index a4b3f61..69e6e7d 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkResources.java @@ -20,8 +20,8 @@ package de.schildbach.oeffi.network; import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import androidx.annotation.Nullable; +import javax.annotation.Nullable; import java.util.Locale; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java b/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java index e943777..62e3160 100644 --- a/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java +++ b/oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java @@ -24,11 +24,12 @@ 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; import de.schildbach.oeffi.R; import de.schildbach.oeffi.network.NetworkResources; +import javax.annotation.Nullable; + public class NetworkViewHolder extends RecyclerView.ViewHolder { private final Context context; private final Resources res; diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java index f2ff948..15a4591 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java @@ -36,7 +36,6 @@ import android.widget.PopupMenu; import android.widget.TextView; import android.widget.ViewAnimator; import androidx.activity.ComponentActivity; -import androidx.annotation.Nullable; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -68,6 +67,7 @@ import okhttp3.HttpUrl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java b/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java index 3517dbc..058993d 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java @@ -25,7 +25,6 @@ import android.database.CursorWrapper; import android.database.MatrixCursor; import android.net.Uri; import android.provider.BaseColumns; -import androidx.annotation.Nullable; import com.google.common.base.Objects; import com.google.common.base.Splitter; import com.google.common.base.Strings; @@ -42,6 +41,7 @@ import okhttp3.HttpUrl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java index 1ce67d9..58e29db 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java @@ -35,7 +35,6 @@ import android.view.View; import android.widget.TextView; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.core.content.pm.ShortcutInfoCompat; import androidx.core.content.pm.ShortcutManagerCompat; @@ -64,6 +63,7 @@ import okhttp3.HttpUrl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.File; import java.net.HttpURLConnection; diff --git a/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java b/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java index 57693fa..f539e8e 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java +++ b/oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java @@ -29,12 +29,12 @@ 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 de.schildbach.oeffi.R; import de.schildbach.oeffi.network.NetworkResources; import okhttp3.Call; +import javax.annotation.Nullable; import java.util.Date; public class PlanViewHolder extends RecyclerView.ViewHolder { diff --git a/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java b/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java index bbf2b66..4e5debd 100644 --- a/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java +++ b/oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java @@ -26,7 +26,6 @@ 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 de.schildbach.oeffi.Constants; import de.schildbach.oeffi.R; @@ -39,6 +38,7 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.util.Date; diff --git a/oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java b/oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java index 9f30553..8fb27e2 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java +++ b/oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java @@ -24,11 +24,12 @@ import android.os.Build; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; -import androidx.annotation.Nullable; import de.schildbach.oeffi.Application; import de.schildbach.oeffi.R; import de.schildbach.oeffi.util.Installer; +import javax.annotation.Nullable; + public class AboutFragment extends PreferenceFragment { private static final String KEY_ABOUT_VERSION = "about_version"; private static final String KEY_ABOUT_MARKET_APP = "about_market_app"; diff --git a/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java b/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java index a1bc3ec..cd73015 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java +++ b/oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java @@ -20,9 +20,10 @@ package de.schildbach.oeffi.preference; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceFragment; -import androidx.annotation.Nullable; import de.schildbach.oeffi.R; +import javax.annotation.Nullable; + public class CommonFragment extends PreferenceFragment { private static final String KEY_BATTERY_OPTIMIZATIONS = "battery_optimizations"; diff --git a/oeffi/src/de/schildbach/oeffi/preference/DirectionsFragment.java b/oeffi/src/de/schildbach/oeffi/preference/DirectionsFragment.java index cdb06ac..2706ad3 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/DirectionsFragment.java +++ b/oeffi/src/de/schildbach/oeffi/preference/DirectionsFragment.java @@ -19,9 +19,10 @@ package de.schildbach.oeffi.preference; import android.os.Bundle; import android.preference.PreferenceFragment; -import androidx.annotation.Nullable; import de.schildbach.oeffi.R; +import javax.annotation.Nullable; + public class DirectionsFragment extends PreferenceFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { diff --git a/oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java b/oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java index 4b29fc6..890c797 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java +++ b/oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java @@ -21,9 +21,10 @@ import android.content.ActivityNotFoundException; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; -import androidx.annotation.Nullable; import de.schildbach.oeffi.R; +import javax.annotation.Nullable; + public class DonateFragment extends PreferenceFragment { private static final String KEY_ABOUT_DONATE_BITCOIN = "about_donate_bitcoin"; diff --git a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java index 37416e7..87ea4ed 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java @@ -25,7 +25,6 @@ import android.os.Bundle; import android.view.View; import android.widget.ViewAnimator; import androidx.activity.result.contract.ActivityResultContract; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import de.schildbach.oeffi.MyActionBar; @@ -39,6 +38,7 @@ import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Location; +import javax.annotation.Nullable; import java.util.List; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/oeffi/src/de/schildbach/oeffi/stations/Station.java b/oeffi/src/de/schildbach/oeffi/stations/Station.java index 52b5c07..9853707 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/Station.java +++ b/oeffi/src/de/schildbach/oeffi/stations/Station.java @@ -17,7 +17,6 @@ package de.schildbach.oeffi.stations; -import androidx.annotation.Nullable; import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.LineDestination; @@ -25,6 +24,7 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Product; import de.schildbach.pte.dto.QueryDeparturesResult; +import javax.annotation.Nullable; import java.util.Date; import java.util.EnumSet; import java.util.List; diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index 7bd2bce..c0c30e0 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -38,7 +38,6 @@ 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; import com.google.common.base.Joiner; @@ -65,6 +64,7 @@ import org.osmdroid.util.GeoPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java index d72bae2..2596490 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java @@ -55,7 +55,6 @@ import android.widget.TextView; import android.widget.ViewAnimator; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; @@ -100,6 +99,7 @@ import org.osmdroid.util.GeoPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java b/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java index 45619c1..ece643e 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java +++ b/oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java @@ -24,13 +24,14 @@ 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; import de.schildbach.oeffi.R; import de.schildbach.oeffi.stations.FavoriteStationsProvider; import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Location; +import javax.annotation.Nullable; + public class FavoriteStationsAdapter extends RecyclerView.Adapter { private final Context context; private final ContentResolver contentResolver; diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java b/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java index 3902e63..051aace 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java +++ b/oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java @@ -17,11 +17,11 @@ package de.schildbach.oeffi.stations.list; -import androidx.annotation.Nullable; import de.schildbach.pte.NetworkId; import de.schildbach.pte.dto.Departure; import de.schildbach.pte.dto.Location; +import javax.annotation.Nullable; import java.util.List; public interface StationContextMenuItemListener { diff --git a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java index 015e467..3bfe3ea 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java +++ b/oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java @@ -30,7 +30,6 @@ import android.view.WindowManager; import android.widget.ImageButton; import android.widget.PopupMenu; import android.widget.TextView; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import com.google.common.base.Joiner; import de.schildbach.oeffi.Constants; @@ -50,6 +49,7 @@ import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.Product; import de.schildbach.pte.dto.QueryDeparturesResult; +import javax.annotation.Nullable; import java.util.Date; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/oeffi/src/de/schildbach/oeffi/util/Downloader.java b/oeffi/src/de/schildbach/oeffi/util/Downloader.java index d03b094..b35a6a1 100644 --- a/oeffi/src/de/schildbach/oeffi/util/Downloader.java +++ b/oeffi/src/de/schildbach/oeffi/util/Downloader.java @@ -17,7 +17,6 @@ package de.schildbach.oeffi.util; -import androidx.annotation.Nullable; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.Striped; @@ -33,6 +32,7 @@ import okhttp3.ResponseBody; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream;