mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-06 17:38:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nullable: use annotation from javax.annotation

Browse source
This commit is contained in:
Andreas Schildbach 2023-03-25 16:06:40 +01:00
parent 75e279bb20
commit 1ec70d1886
25 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/directions/LocationView.java
View file

@ -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 {

2
oeffi/src/de/schildbach/oeffi/directions/TripsGalleryAdapter.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java
View file

@ -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;

3
oeffi/src/de/schildbach/oeffi/directions/list/QueryHistoryContextMenuItemListener.java
View file

@ -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);

2
oeffi/src/de/schildbach/oeffi/network/NetworkResources.java
View file

@ -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;

3
oeffi/src/de/schildbach/oeffi/network/list/NetworkViewHolder.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/plans/PlanContentProvider.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/plans/PlansPickerActivity.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/plans/list/PlanViewHolder.java
View file

@ -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 {

2
oeffi/src/de/schildbach/oeffi/plans/list/PlansAdapter.java
View file

@ -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;

3
oeffi/src/de/schildbach/oeffi/preference/AboutFragment.java
View file

@ -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";

3
oeffi/src/de/schildbach/oeffi/preference/CommonFragment.java
View file

@ -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";

3
oeffi/src/de/schildbach/oeffi/preference/DirectionsFragment.java
View file

@ -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) {

3
oeffi/src/de/schildbach/oeffi/preference/DonateFragment.java
View file

@ -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";

2
oeffi/src/de/schildbach/oeffi/stations/FavoriteStationsActivity.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/stations/Station.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
View file

@ -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;

3
oeffi/src/de/schildbach/oeffi/stations/list/FavoriteStationsAdapter.java
View file

@ -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<FavoriteStationViewHolder> {
private final Context context;
private final ContentResolver contentResolver;

2
oeffi/src/de/schildbach/oeffi/stations/list/StationContextMenuItemListener.java
View file

@ -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 {

2
oeffi/src/de/schildbach/oeffi/stations/list/StationViewHolder.java
View file

@ -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;

2
oeffi/src/de/schildbach/oeffi/util/Downloader.java
View file

@ -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;