[android] Fix warnings

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-09-10 21:19:46 +02:00
committed by x7z4w
parent 99163b485d
commit bc8cc7bb41
17 changed files with 11 additions and 30 deletions

View File

@@ -4,7 +4,6 @@ import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
@@ -22,14 +21,12 @@ import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsCompat;
import app.organicmaps.downloader.DownloaderActivity; import app.organicmaps.downloader.DownloaderActivity;
import app.organicmaps.intent.Factory; import app.organicmaps.intent.Factory;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.location.LocationHelper; import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.util.Config; import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.LocationUtils; import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.concurrency.UiThread; import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger; import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.util.SharingUtils; import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.Utils; import app.organicmaps.util.Utils;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.io.IOException; import java.io.IOException;

View File

@@ -17,7 +17,7 @@ import androidx.annotation.NonNull;
import androidx.documentfile.provider.DocumentFile; import androidx.documentfile.provider.DocumentFile;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.sdk.util.log.Logger; import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.util.UiUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;

View File

@@ -8,7 +8,6 @@ import androidx.car.app.CarContext;
import androidx.car.app.model.CarIcon; import androidx.car.app.model.CarIcon;
import androidx.car.app.navigation.model.Destination; import androidx.car.app.navigation.model.Destination;
import androidx.car.app.navigation.model.Lane; import androidx.car.app.navigation.model.Lane;
import androidx.car.app.navigation.model.LaneDirection;
import androidx.car.app.navigation.model.Step; import androidx.car.app.navigation.model.Step;
import androidx.car.app.navigation.model.TravelEstimate; import androidx.car.app.navigation.model.TravelEstimate;
import androidx.car.app.navigation.model.Trip; import androidx.car.app.navigation.model.Trip;

View File

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

View File

@@ -66,12 +66,9 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
case TYPE_FOOTER -> case TYPE_FOOTER ->
{ {
return new FooterViewHolder(inflater.inflate(R.layout.item_feature_category_footer, parent, false), return new FooterViewHolder(inflater.inflate(R.layout.item_feature_category_footer, parent, false),
(FooterListener) mFragment); mFragment);
}
default ->
{
throw new IllegalArgumentException("Unsupported viewType: " + viewType);
} }
default -> throw new IllegalArgumentException("Unsupported viewType: " + viewType);
} }
} }

View File

@@ -4,7 +4,6 @@ import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -15,7 +14,6 @@ import androidx.annotation.Nullable;
import app.organicmaps.MwmApplication; import app.organicmaps.MwmApplication;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment; import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.sdk.Framework; import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.editor.Editor; import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.OsmOAuth; import app.organicmaps.sdk.editor.OsmOAuth;

View File

@@ -17,7 +17,6 @@ import app.organicmaps.BuildConfig;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragment; import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.sdk.Framework; import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.Constants; import app.organicmaps.sdk.util.Constants;
import app.organicmaps.sdk.util.DateUtils; import app.organicmaps.sdk.util.DateUtils;
import app.organicmaps.util.Graphics; import app.organicmaps.util.Graphics;

View File

@@ -38,7 +38,6 @@ import app.organicmaps.sdk.routing.RoutingController;
import app.organicmaps.sdk.util.Config; import app.organicmaps.sdk.util.Config;
import app.organicmaps.util.ThemeUtils; import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.UiUtils; import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.util.WindowInsetUtils;
import app.organicmaps.widget.menu.MyPositionButton; import app.organicmaps.widget.menu.MyPositionButton;
import app.organicmaps.widget.placepage.PlacePageViewModel; import app.organicmaps.widget.placepage.PlacePageViewModel;

View File

@@ -31,7 +31,6 @@ import app.organicmaps.widget.LanesView;
import app.organicmaps.widget.SpeedLimitView; import app.organicmaps.widget.SpeedLimitView;
import app.organicmaps.widget.menu.NavMenu; import app.organicmaps.widget.menu.NavMenu;
import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.textview.MaterialTextView; import com.google.android.material.textview.MaterialTextView;
public class NavigationController implements TrafficManager.TrafficCallback, NavMenu.NavMenuListener public class NavigationController implements TrafficManager.TrafficCallback, NavMenu.NavMenuListener

View File

@@ -16,7 +16,6 @@ import androidx.fragment.app.FragmentManager;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.downloader.MapManagerHelper; import app.organicmaps.downloader.MapManagerHelper;
import app.organicmaps.sdk.downloader.CountryItem; import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.util.UiUtils; import app.organicmaps.util.UiUtils;
import com.google.android.material.textview.MaterialTextView; import com.google.android.material.textview.MaterialTextView;

View File

@@ -150,7 +150,7 @@ class TabAdapter extends FragmentPagerAdapter
ViewPager.OnPageChangeListener listener = new PageChangedListener(tabs); ViewPager.OnPageChangeListener listener = new PageChangedListener(tabs);
mPager.addOnPageChangeListener(listener); mPager.addOnPageChangeListener(listener);
tabs.setOnTabSelectedListener(new OnTabSelectedListenerForViewPager(mPager)); tabs.addOnTabSelectedListener(new OnTabSelectedListenerForViewPager(mPager));
SharedPreferences preferences = MwmApplication.prefs(mPager.getContext()); SharedPreferences preferences = MwmApplication.prefs(mPager.getContext());
int lastSelectedTabPosition = preferences.getInt(Config.KEY_PREF_LAST_SEARCHED_TAB, 0); int lastSelectedTabPosition = preferences.getInt(Config.KEY_PREF_LAST_SEARCHED_TAB, 0);
listener.onPageSelected(lastSelectedTabPosition); listener.onPageSelected(lastSelectedTabPosition);

View File

@@ -3,10 +3,9 @@ package app.organicmaps.widget.placepage;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;
import app.organicmaps.sdk.bookmarks.data.Bookmark;
import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.Track;
import java.util.List; import java.util.List;
public class PlacePageViewModel extends ViewModel public class PlacePageViewModel extends ViewModel

View File

@@ -3,7 +3,7 @@ package app.organicmaps.sdk.editor;
import androidx.annotation.IntRange; import androidx.annotation.IntRange;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import app.organicmaps.sdk.editor.OhState;
import app.organicmaps.sdk.editor.data.Timespan; import app.organicmaps.sdk.editor.data.Timespan;
import app.organicmaps.sdk.editor.data.Timetable; import app.organicmaps.sdk.editor.data.Timetable;

View File

@@ -3,7 +3,6 @@ package app.organicmaps.sdk.maplayer;
import android.content.Context; import android.content.Context;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import app.organicmaps.sdk.Framework; import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.R;
import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
import app.organicmaps.sdk.maplayer.subway.SubwayManager; import app.organicmaps.sdk.maplayer.subway.SubwayManager;
import app.organicmaps.sdk.maplayer.traffic.TrafficManager; import app.organicmaps.sdk.maplayer.traffic.TrafficManager;

View File

@@ -5,5 +5,5 @@ public enum IsolinesState
DISABLED, DISABLED,
ENABLED, ENABLED,
EXPIREDDATA, EXPIREDDATA,
NODATA; NODATA
} }

View File

@@ -4,7 +4,6 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Build; import android.os.Build;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import app.organicmaps.sdk.R;
public final class Config public final class Config
{ {

View File

@@ -131,12 +131,12 @@ public final class Logger
final String threadName = "(" + Thread.currentThread().getName() + ") "; final String threadName = "(" + Thread.currentThread().getName() + ") ";
if (logsFolder == null || BuildConfig.DEBUG) if (logsFolder == null || BuildConfig.DEBUG)
Log.println(level, tag, threadName + sb.toString()); Log.println(level, tag, threadName + sb);
if (logsFolder != null) if (logsFolder != null)
{ {
sb.insert(0, String.valueOf(getLevelChar(level)) + '/' + tag + ": "); sb.insert(0, String.valueOf(getLevelChar(level)) + '/' + tag + ": ");
LogsManager.EXECUTOR.execute(new WriteTask(logsFolder + File.separator + FILENAME, threadName + sb.toString())); LogsManager.EXECUTOR.execute(new WriteTask(logsFolder + File.separator + FILENAME, threadName + sb));
} }
} }
} }