[android] Fix somes Android warnings

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-06-04 19:34:14 +02:00
committed by Harry Bond
parent 7f9b6f87c6
commit 8e6cdfeafc
20 changed files with 5 additions and 40 deletions

View File

@@ -80,7 +80,6 @@ import app.organicmaps.routing.ManageRouteBottomSheet;
import app.organicmaps.routing.NavigationController; import app.organicmaps.routing.NavigationController;
import app.organicmaps.routing.NavigationService; import app.organicmaps.routing.NavigationService;
import app.organicmaps.sdk.routing.RouteMarkType; import app.organicmaps.sdk.routing.RouteMarkType;
import app.organicmaps.sdk.routing.RoutePointInfo;
import app.organicmaps.routing.RoutingBottomMenuListener; import app.organicmaps.routing.RoutingBottomMenuListener;
import app.organicmaps.routing.RoutingController; import app.organicmaps.routing.RoutingController;
import app.organicmaps.routing.RoutingErrorDialogFragment; import app.organicmaps.routing.RoutingErrorDialogFragment;
@@ -2379,9 +2378,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
.setTitle(R.string.track_recording_alert_title) .setTitle(R.string.track_recording_alert_title)
.setCancelable(false) .setCancelable(false)
// Negative/Positive/Neutral do not have their usual meaning here. // Negative/Positive/Neutral do not have their usual meaning here.
.setNegativeButton(R.string.continue_recording, (dialog, which) -> { .setNegativeButton(R.string.continue_recording, (dialog, which) -> mAlertDialog = null)
mAlertDialog = null;
})
.setNeutralButton(R.string.stop_without_saving, (dialog, which) -> { .setNeutralButton(R.string.stop_without_saving, (dialog, which) -> {
stopTrackRecording(); stopTrackRecording();
mAlertDialog = null; mAlertDialog = null;

View File

@@ -923,7 +923,7 @@ public enum BookmarkManager
public interface BookmarksSortingListener public interface BookmarksSortingListener
{ {
void onBookmarksSortingCompleted(@NonNull SortedBlock[] sortedBlocks, long timestamp); void onBookmarksSortingCompleted(@NonNull SortedBlock[] sortedBlocks, long timestamp);
default void onBookmarksSortingCancelled(long timestamp) {}; default void onBookmarksSortingCancelled(long timestamp) {}
} }
public interface BookmarksSharingListener public interface BookmarksSharingListener

View File

@@ -5,7 +5,6 @@ import android.os.Parcelable;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import com.google.common.base.Objects; import com.google.common.base.Objects;

View File

@@ -10,16 +10,12 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.os.ParcelCompat; import androidx.core.os.ParcelCompat;
import app.organicmaps.Framework;
import app.organicmaps.sdk.routing.RoutePointInfo; import app.organicmaps.sdk.routing.RoutePointInfo;
import app.organicmaps.sdk.search.Popularity; import app.organicmaps.sdk.search.Popularity;
import app.organicmaps.util.Utils;
import app.organicmaps.widget.placepage.PlacePageData; import app.organicmaps.widget.placepage.PlacePageData;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

View File

@@ -380,10 +380,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
else else
processLongClick(); processLongClick();
} }
case CountryItem.STATUS_FAILED -> case CountryItem.STATUS_FAILED -> MapManager.warn3gAndRetry(mActivity, mItem.id, null);
{
MapManager.warn3gAndRetry(mActivity, mItem.id, null);
}
case CountryItem.STATUS_UPDATABLE -> case CountryItem.STATUS_UPDATABLE ->
MapManager.warnOn3gUpdate(mActivity, mItem.id, () -> MapManager.startUpdate(mItem.id)); MapManager.warnOn3gUpdate(mActivity, mItem.id, () -> MapManager.startUpdate(mItem.id));
default -> throw new IllegalArgumentException("Inappropriate item status: " + mItem.status); default -> throw new IllegalArgumentException("Inappropriate item status: " + mItem.status);

View File

@@ -1,6 +1,5 @@
package app.organicmaps.editor; package app.organicmaps.editor;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -25,7 +24,6 @@ import app.organicmaps.editor.data.LocalizedName;
import app.organicmaps.editor.data.LocalizedStreet; import app.organicmaps.editor.data.LocalizedStreet;
import app.organicmaps.editor.data.NamesDataSource; import app.organicmaps.editor.data.NamesDataSource;
import app.organicmaps.editor.data.PhoneFragment; import app.organicmaps.editor.data.PhoneFragment;
import app.organicmaps.util.ConnectionState;
import app.organicmaps.util.UiUtils; import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils; import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;

View File

@@ -56,9 +56,7 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
case TYPE_FOOTER -> { case TYPE_FOOTER -> {
return new FooterViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false)); return new FooterViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false));
} }
default -> { default -> throw new IllegalArgumentException("Unsupported");
throw new IllegalArgumentException("Unsupported");
}
} }
} }

View File

@@ -1,16 +1,13 @@
package app.organicmaps.editor; package app.organicmaps.editor;
import android.os.Bundle; import android.os.Bundle;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.CallSuper; import androidx.annotation.CallSuper;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.widget.NestedScrollView;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment; import app.organicmaps.base.BaseMwmRecyclerFragment;

View File

@@ -9,12 +9,10 @@ import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import app.organicmaps.BuildConfig;
import app.organicmaps.Framework; import app.organicmaps.Framework;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.base.BaseMwmToolbarFragment; import app.organicmaps.base.BaseMwmToolbarFragment;

View File

@@ -10,8 +10,6 @@ import androidx.annotation.Size;
import androidx.annotation.WorkerThread; import androidx.annotation.WorkerThread;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import java.util.Map;
import app.organicmaps.MwmApplication; import app.organicmaps.MwmApplication;
import app.organicmaps.util.NetworkPolicy; import app.organicmaps.util.NetworkPolicy;

View File

@@ -11,7 +11,6 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils; import app.organicmaps.util.Utils;
public class SelfServiceAdapter extends RecyclerView.Adapter<SelfServiceAdapter.ViewHolder> public class SelfServiceAdapter extends RecyclerView.Adapter<SelfServiceAdapter.ViewHolder>

View File

@@ -11,7 +11,6 @@ import androidx.annotation.Nullable;
import app.organicmaps.base.BaseMwmRecyclerFragment; import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.bookmarks.data.Metadata; import app.organicmaps.bookmarks.data.Metadata;
import app.organicmaps.editor.data.LocalizedStreet;
public class SelfServiceFragment extends BaseMwmRecyclerFragment<SelfServiceAdapter> public class SelfServiceFragment extends BaseMwmRecyclerFragment<SelfServiceAdapter>
{ {

View File

@@ -15,8 +15,6 @@ import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.dialog.EditTextDialogFragment; import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.editor.data.LocalizedStreet; import app.organicmaps.editor.data.LocalizedStreet;
import java.util.Optional;
public class StreetFragment extends BaseMwmRecyclerFragment<StreetAdapter> public class StreetFragment extends BaseMwmRecyclerFragment<StreetAdapter>
{ {
private LocalizedStreet mSelectedString; private LocalizedStreet mSelectedString;

View File

@@ -32,7 +32,6 @@ import app.organicmaps.maplayer.subway.SubwayManager;
import app.organicmaps.maplayer.traffic.TrafficManager; import app.organicmaps.maplayer.traffic.TrafficManager;
import app.organicmaps.routing.RoutingController; import app.organicmaps.routing.RoutingController;
import app.organicmaps.util.Config; import app.organicmaps.util.Config;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.UiUtils; import app.organicmaps.util.UiUtils;
import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.util.WindowInsetUtils;
import app.organicmaps.widget.menu.MyPositionButton; import app.organicmaps.widget.menu.MyPositionButton;

View File

@@ -19,7 +19,6 @@ import app.organicmaps.R;
import app.organicmaps.bookmarks.data.MapObject; import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkData;
import app.organicmaps.sdk.routing.RouteMarkType; import app.organicmaps.sdk.routing.RouteMarkType;
import app.organicmaps.sdk.routing.RoutePointInfo;
import app.organicmaps.util.StringUtils; import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils; import app.organicmaps.util.UiUtils;

View File

@@ -34,7 +34,6 @@ import app.organicmaps.bookmarks.data.DistanceAndAzimut;
import app.organicmaps.location.LocationHelper; import app.organicmaps.location.LocationHelper;
import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkData;
import app.organicmaps.sdk.routing.RouteMarkType; import app.organicmaps.sdk.routing.RouteMarkType;
import app.organicmaps.sdk.routing.RoutePointInfo;
import app.organicmaps.sdk.routing.RoutingInfo; import app.organicmaps.sdk.routing.RoutingInfo;
import app.organicmaps.sdk.routing.TransitRouteInfo; import app.organicmaps.sdk.routing.TransitRouteInfo;
import app.organicmaps.sdk.routing.TransitStepInfo; import app.organicmaps.sdk.routing.TransitStepInfo;

View File

@@ -4,7 +4,6 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment; import app.organicmaps.base.BaseMwmRecyclerFragment;

View File

@@ -176,9 +176,7 @@ public class SearchFragment extends BaseMwmFragment
private boolean mInitialSearchOnMap = false; private boolean mInitialSearchOnMap = false;
private final ActivityResultLauncher<Intent> startVoiceRecognitionForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> private final ActivityResultLauncher<Intent> startVoiceRecognitionForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult ->
{ mToolbarController.onVoiceRecognitionResult(activityResult));
mToolbarController.onVoiceRecognitionResult(activityResult);
});
private final LocationListener mLocationListener = new LocationListener() private final LocationListener mLocationListener = new LocationListener()
{ {

View File

@@ -15,9 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.util.ThemeUtils; import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils; import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils;
import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener; import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat

View File

@@ -19,7 +19,6 @@ import android.view.WindowManager;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import androidx.activity.result.ActivityResult;
import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.AnyRes; import androidx.annotation.AnyRes;
import androidx.annotation.AttrRes; import androidx.annotation.AttrRes;