pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Cleanup code with linter

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2021-03-23 22:16:34 +01:00 • committed by Roman Tsisyk
parent b87ee95bae
commit 53167676b7
61 changed files with 120 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
jcenter()
}
ext.googleServiceEnabled = file('google-services.json').exists();
ext.googleServiceEnabled = file('google-services.json').exists()
if (googleServiceEnabled) {
println("Building with Google Services")
} else {
@ -154,7 +154,7 @@ configurations.all {
force "androidx.versionedparcelable:versionedparcelable:1.1.0"
force "androidx.recyclerview:recyclerview:1.2.0-alpha02"
failOnVersionConflict();
failOnVersionConflict()
}
}
@ -240,8 +240,8 @@ android {
flavorDimensions "default"
productFlavors {
final int HUAWEI_VERSION_CODE_BASE = 20000;
final int TENCENT_VERSION_CODE_BASE = 10000;
final int HUAWEI_VERSION_CODE_BASE = 20000
final int TENCENT_VERSION_CODE_BASE = 10000
google {
dimension "default"
@ -384,7 +384,7 @@ android {
}
splits.abi {
boolean enabled = project.hasProperty('splitApk');
boolean enabled = project.hasProperty('splitApk')
println ("Create separate apks: " + enabled)
enable enabled
reset()
@ -570,7 +570,7 @@ def createObbGenerateTask(type, data, name) {
def createObbAlignTask(type, rawObb, alignedObb) {
def sdkDir = "${android.getSdkDirectory().getAbsolutePath()}"
def zipalignPath = sdkDir + File.separator + "build-tools" + File.separator +
propBuildToolsVersion + File.separator + "zipalign";
propBuildToolsVersion + File.separator + "zipalign"
return tasks.create(name: "obb${type}Align", dependsOn: "obb${type}Generate", type: Exec, description: 'Align obb files') {
commandLine zipalignPath, '-v', '8', rawObb, alignedObb
@ -591,7 +591,7 @@ task obbPush(dependsOn: ['obbGenerate', 'obbPushMain', 'obbPushPatch']) {
}
android.buildTypes.all { buildType ->
def suffix = applicationIdSuffix != null ? applicationIdSuffix : "";
def suffix = applicationIdSuffix != null ? applicationIdSuffix : ""
def authorityValue = android.defaultConfig.applicationId + suffix + ".provider"
def authority = "\"" + authorityValue + "\""
buildConfigField 'String', 'FILE_PROVIDER_AUTHORITY', authority

8
android/gradle.properties
View file

@ -9,17 +9,17 @@ propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
propMultiDexVersion=2.0.1
# list of files for obb-s
propObbFonts ../data/01_dejavusans.ttf \
propObbFonts=../data/01_dejavusans.ttf \
../data/02_droidsans-fallback.ttf \
../data/03_jomolhari-id-a3d.ttf \
../data/04_padauk.ttf \
../data/05_khmeros.ttf \
../data/06_code2000.ttf \
../data/07_roboto_medium.ttf
propObbWorlds ../data/World.mwm \
propObbWorlds=../data/World.mwm \
../data/WorldCoasts.mwm
propObbWorldsOutput build/worlds.obb
propObbFontsOutput build/fonts.obb
propObbWorldsOutput=build/worlds.obb
propObbFontsOutput=build/fonts.obb
org.gradle.parallel=true
org.gradle.caching=true

2
android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java
View file

@ -34,7 +34,7 @@ class NavigationButtonsAnimationController
private float mTopLimit;
private float mBottomLimit;
private float mCompassHeight;
private final float mCompassHeight;
NavigationButtonsAnimationController(@NonNull View zoomIn, @NonNull View zoomOut,
@NonNull View myPosition, @NonNull final View contentView,

2
android/src/com/mapswithme/maps/SplashActivity.java
View file

@ -64,7 +64,7 @@ public class SplashActivity extends AppCompatActivity
};
@NonNull
private Runnable mOnboardingStepsTask = new Runnable()
private final Runnable mOnboardingStepsTask = new Runnable()
{
@Override
public void run()

2
android/src/com/mapswithme/maps/VideoTimer.java
View file

@ -6,7 +6,7 @@ import java.util.TimerTask;
public class VideoTimer
{
private static String TAG = "VideoTimer";
private static final String TAG = "VideoTimer";
Timer m_timer;

2
android/src/com/mapswithme/maps/background/NotificationService.java
View file

@ -89,7 +89,7 @@ public class NotificationService extends JobIntentService
return;
}
final NotificationExecutor notifyOrder[] =
final NotificationExecutor[] notifyOrder =
{
this::notifyIsNotAuthenticated,
this::notifySmart

2
android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java
View file

@ -393,7 +393,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
@IdRes
private final int mId;
@NonNull
private MenuClickProcessorBase mInternalProcessor;
private final MenuClickProcessorBase mInternalProcessor;
MenuItemClickProcessorWrapper(@IdRes int id, @NonNull MenuClickProcessorBase processorBase)
{

2
android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java
View file

@ -226,7 +226,7 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
private static class SortedSectionsDataSource extends SectionsDataSource
{
@NonNull
private List<SortedBlock> mSortedBlocks;
private final List<SortedBlock> mSortedBlocks;
SortedSectionsDataSource(@NonNull DataSource<BookmarkCategory> dataSource,
@NonNull List<SortedBlock> sortedBlocks)

4
android/src/com/mapswithme/maps/bookmarks/CatalogListenerDecorator.java
View file

@ -13,9 +13,9 @@ import com.mapswithme.maps.dialog.DialogUtils;
class CatalogListenerDecorator extends BookmarkManager.DefaultBookmarksCatalogListener
{
@NonNull
private Fragment mFragment;
private final Fragment mFragment;
@Nullable
private BookmarkManager.BookmarksCatalogListener mWrapped;
private final BookmarkManager.BookmarksCatalogListener mWrapped;
CatalogListenerDecorator(@NonNull Fragment fragment)
{

6
android/src/com/mapswithme/maps/bookmarks/Holders.java
View file

@ -61,9 +61,9 @@ public class Holders
public static class HeaderViewHolder extends RecyclerView.ViewHolder
{
@NonNull
private TextView mButton;
private final TextView mButton;
@NonNull
private TextView mText;
private final TextView mText;
HeaderViewHolder(@NonNull View itemView)
@ -374,7 +374,7 @@ public class Holders
@NonNull
private final TextView mDistance;
@NonNull
private View mMore;
private final View mMore;
BookmarkViewHolder(@NonNull View itemView)
{

6
android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java
View file

@ -22,9 +22,9 @@ public class Bookmark extends MapObject
{
private Icon mIcon;
private long mCategoryId;
private long mBookmarkId;
private double mMerX;
private double mMerY;
private final long mBookmarkId;
private final double mMerX;
private final double mMerY;
public Bookmark(@NonNull FeatureId featureId, @IntRange(from = 0) long categoryId,
@IntRange(from = 0) long bookmarkId, String title, @Nullable String secondaryTitle,

2
android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
View file

@ -1468,7 +1468,7 @@ public enum BookmarkManager
UPLOAD_RESULT_MALFORMED_DATA_ERROR,
/* Edit on web */
UPLOAD_RESULT_ACCESS_ERROR,
UPLOAD_RESULT_INVALID_CALL;
UPLOAD_RESULT_INVALID_CALL
}
static class BookmarkCategoriesCache extends Observable<DataChangedListener>

4
android/src/com/mapswithme/maps/bookmarks/data/DistanceAndAzimut.java
View file

@ -2,8 +2,8 @@ package com.mapswithme.maps.bookmarks.data;
public class DistanceAndAzimut
{
private String mDistance;
private double mAzimuth;
private final String mDistance;
private final double mAzimuth;
public String getDistance()
{

2
android/src/com/mapswithme/maps/bookmarks/data/FeatureId.java
View file

@ -36,7 +36,7 @@ public class FeatureId implements Parcelable
if (TextUtils.isEmpty(id))
throw new AssertionError("Feature id string is empty");
String parts[] = id.split(":");
String[] parts = id.split(":");
if (parts.length != 3)
throw new AssertionError("Wrong feature id string format");

20
android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
View file

@ -45,7 +45,7 @@ public class MapObject implements PopularityProvider, ShareableInfoProvider,
Wikipedia,
Flats,
BuildingLevels,
Level;
Level
}
@Retention(RetentionPolicy.SOURCE)
@ -76,23 +76,23 @@ public class MapObject implements PopularityProvider, ShareableInfoProvider,
private String mTitle;
@Nullable
private String mSecondaryTitle;
private final String mSecondaryTitle;
private String mSubtitle;
private double mLat;
private double mLon;
private String mAddress;
private Metadata mMetadata;
private String mApiId;
private final String mAddress;
private final Metadata mMetadata;
private final String mApiId;
@Nullable
private List<Banner> mBanners;
@Nullable
private List<TaxiType> mReachableByTaxiTypes;
@Nullable
private String mBookingSearchUrl;
private final String mBookingSearchUrl;
@Nullable
private LocalAdInfo mLocalAdInfo;
private final LocalAdInfo mLocalAdInfo;
@Nullable
private RoutePointInfo mRoutePointInfo;
private final RoutePointInfo mRoutePointInfo;
@OpeningMode
private final int mOpeningMode;
private final boolean mShouldShowUGC;
@ -107,12 +107,12 @@ public class MapObject implements PopularityProvider, ShareableInfoProvider,
@Nullable
private ArrayList<UGC.Rating> mRatings;
@Nullable
private HotelsFilter.HotelType mHotelType;
private final HotelsFilter.HotelType mHotelType;
@PriceFilterView.PriceDef
private final int mPriceRate;
@Nullable
private List<String> mRawTypes;
private boolean mIsTopChoice;
private final boolean mIsTopChoice;
public MapObject(@NonNull FeatureId featureId, @MapObjectType int mapObjectType, String title,
@Nullable String secondaryTitle, String subtitle, String address,

2
android/src/com/mapswithme/maps/bookmarks/data/ParcelablePoint.java
View file

@ -6,7 +6,7 @@ import android.os.Parcelable;
public class ParcelablePoint implements Parcelable
{
private Point mInternalPoint;
private final Point mInternalPoint;
public Point getPoint()
{

2
android/src/com/mapswithme/maps/bookmarks/data/RoadWarningMarkType.java
View file

@ -5,5 +5,5 @@ public enum RoadWarningMarkType
TOLL,
FERRY,
DIRTY,
UNKNOWN;
UNKNOWN
}

4
android/src/com/mapswithme/maps/bookmarks/data/SortedBlock.java
View file

@ -11,9 +11,9 @@ public class SortedBlock
@NonNull
private final String mName;
@NonNull
private List<Long> mBookmarkIds;
private final List<Long> mBookmarkIds;
@NonNull
private List<Long> mTrackIds;
private final List<Long> mTrackIds;
public SortedBlock(@NonNull String name, @NonNull Long[] bookmarkIds,
@NonNull Long[] trackIds)

2
android/src/com/mapswithme/maps/downloader/ChunkTask.java
View file

@ -240,7 +240,7 @@ class ChunkTask extends AsyncTask<Void, byte[], Integer>
{
// Because of timeouts in InputStream.read (for bad connection),
// try to introduce dynamic buffer size to read in one query.
final int arrSize[] = {64, 32, 1};
final int[] arrSize = {64, 32, 1};
int ret = IO_EXCEPTION;
for (int size : arrSize)

4
android/src/com/mapswithme/maps/editor/CuisineAdapter.java
View file

@ -38,8 +38,8 @@ public class CuisineAdapter extends RecyclerView.Adapter<CuisineAdapter.ViewHold
}
}
private List<Item> mItems = new ArrayList<>();
private Set<String> mSelectedKeys = new HashSet<>();
private final List<Item> mItems = new ArrayList<>();
private final Set<String> mSelectedKeys = new HashSet<>();
private String mFilter;
public CuisineAdapter()

2
android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java
View file

@ -16,7 +16,7 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<FeatureCategory
{
private FeatureCategory[] mCategories;
private final FeatureCategoryFragment mFragment;
private FeatureCategory mSelectedCategory;
private final FeatureCategory mSelectedCategory;
public FeatureCategoryAdapter(@NonNull FeatureCategoryFragment host, @NonNull FeatureCategory[] categories, @Nullable FeatureCategory category)
{

2
android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java
View file

@ -19,7 +19,7 @@ import com.mapswithme.util.Utils;
public class MultilanguageAdapter extends RecyclerView.Adapter<MultilanguageAdapter.Holder>
{
private final List<LocalizedName> mNames;
private int mMandatoryNamesCount;
private final int mMandatoryNamesCount;
private boolean mAdditionalLanguagesShown;
MultilanguageAdapter(EditorHostFragment hostFragment)

6
android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java
View file

@ -149,7 +149,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
private void addWorkingDay(int day, int position)
{
final Timetable tts[] = mItems.toArray(new Timetable[mItems.size()]);
final Timetable[] tts = mItems.toArray(new Timetable[mItems.size()]);
mItems = new ArrayList<>(Arrays.asList(OpeningHours.nativeAddWorkingDay(tts, position, day)));
refreshComplement();
notifyDataSetChanged();
@ -157,7 +157,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
private void removeWorkingDay(int day, int position)
{
final Timetable tts[] = mItems.toArray(new Timetable[mItems.size()]);
final Timetable[] tts = mItems.toArray(new Timetable[mItems.size()]);
mItems = new ArrayList<>(Arrays.asList(OpeningHours.nativeRemoveWorkingDay(tts, position, day)));
refreshComplement();
notifyDataSetChanged();
@ -193,7 +193,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
View close;
TextView tvOpen;
TextView tvClose;
View closedHours[] = new View[MAX_CLOSED_SPANS];
View[] closedHours = new View[MAX_CLOSED_SPANS];
View addClosed;
View deleteTimetable;

2
android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java
View file

@ -66,7 +66,7 @@ public class TimetableContainerFragment extends BaseMwmFragment implements OnBac
@NonNull
private Mode mMode = Mode.ADVANCED;
@NonNull
private Fragment[] mFragments = new Fragment[Mode.values().length];
private final Fragment[] mFragments = new Fragment[Mode.values().length];
@Nullable
private TimetableProvider mTimetableProvider;

2
android/src/com/mapswithme/maps/gallery/ImageAdapter.java
View file

@ -48,7 +48,7 @@ class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
{
private ImageView mImage;
private final ImageView mImage;
private final RecyclerClickListener mListener;
private int mPosition;

2
android/src/com/mapswithme/maps/intent/Factory.java
View file

@ -619,7 +619,7 @@ public class Factory
output = new FileOutputStream(tmpFile);
input = resolver.openInputStream(mData);
final byte buffer[] = new byte[Constants.MB / 2];
final byte[] buffer = new byte[Constants.MB / 2];
int read;
while ((read = input.read(buffer)) != -1)
output.write(buffer, 0, read);

2
android/src/com/mapswithme/maps/location/SensorHelper.java
View file

@ -18,7 +18,7 @@ class SensorHelper implements SensorEventListener
private Sensor mRotation;
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private MwmApplication mMwmApplication;
private final MwmApplication mMwmApplication;
@Override
public void onSensorChanged(SensorEvent event)

2
android/src/com/mapswithme/maps/onboarding/NewsFragment.java
View file

@ -163,7 +163,7 @@ public class NewsFragment extends BaseNewsFragment implements AlertDialogCallbac
if (length == 0)
return "";
StringBuilder sb = new StringBuilder("");
StringBuilder sb = new StringBuilder();
for (String key : keys)
sb.append(key);

4
android/src/com/mapswithme/maps/onboarding/OnboardingTip.java
View file

@ -36,9 +36,9 @@ public class OnboardingTip implements Parcelable
@interface ScreenType {}
@ScreenType
private int mType;
private final int mType;
@NonNull
private String mUrl;
private final String mUrl;
@SuppressWarnings("unused")
OnboardingTip(@ScreenType int type, @NonNull String url)

4
android/src/com/mapswithme/maps/promo/CatalogPromoController.java
View file

@ -34,9 +34,9 @@ public class CatalogPromoController implements Promo.Listener, Detachable<Activi
@Nullable
private Activity mActivity;
@NonNull
private RecyclerView mRecycler;
private final RecyclerView mRecycler;
@NonNull
private TextView mTitle;
private final TextView mTitle;
@NonNull
private final PlacePageView mPlacePageView;
@Nullable

6
android/src/com/mapswithme/maps/promo/PromoAfterBooking.java
View file

@ -5,11 +5,11 @@ import androidx.annotation.NonNull;
public class PromoAfterBooking
{
@NonNull
private String mId;
private final String mId;
@NonNull
private String mGuidesUrl;
private final String mGuidesUrl;
@NonNull
private String mImageUrl;
private final String mImageUrl;
// Called from JNI.
@SuppressWarnings("unused")

8
android/src/com/mapswithme/maps/promo/PromoCityGallery.java
View file

@ -134,10 +134,10 @@ public final class PromoCityGallery
public static final class Place
{
@NonNull
private String mName;
private final String mName;
@NonNull
private String mDescription;
private final String mDescription;
Place(@NonNull String name, @NonNull String description)
{
@ -161,10 +161,10 @@ public final class PromoCityGallery
public static final class Author
{
@NonNull
private String mId;
private final String mId;
@NonNull
private String mName;
private final String mName;
Author(@NonNull String id, @NonNull String name)
{

4
android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java
View file

@ -49,9 +49,9 @@ public class AdsRemovalPurchaseDialog extends BaseMwmDialogFragment
@Nullable
private AdsRemovalPurchaseControllerProvider mControllerProvider;
@NonNull
private AdsRemovalPurchaseCallback mPurchaseCallback = new AdsRemovalPurchaseCallback();
private final AdsRemovalPurchaseCallback mPurchaseCallback = new AdsRemovalPurchaseCallback();
@NonNull
private List<AdsRemovalActivationCallback> mActivationCallbacks = new ArrayList<>();
private final List<AdsRemovalActivationCallback> mActivationCallbacks = new ArrayList<>();
@SuppressWarnings("NullableProblems")
@NonNull
private View mYearlyButton;

2
android/src/com/mapswithme/maps/purchase/BookmarkPaymentState.java
View file

@ -124,7 +124,7 @@ enum BookmarkPaymentState
UiUtils.hide(fragment.getViewOrThrow(), R.id.subs_progress);
fragment.updateSubsProductDetails();
}
};;
};
private static void showProgress(@NonNull BookmarkPaymentFragment fragment)
{

2
android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java
View file

@ -89,7 +89,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
private TaxiInfo.Product mTaxiProduct;
@Nullable
private RoutingBottomMenuListener mListener;
private final RoutingBottomMenuListener mListener;
@NonNull
static RoutingBottomMenuController newInstance(@NonNull Activity activity, @NonNull View frame,

10
android/src/com/mapswithme/maps/routing/SearchWheel.java
View file

@ -37,7 +37,7 @@ class SearchWheel implements View.OnClickListener
private SearchOption mCurrentOption;
private static final long CLOSE_DELAY_MILLIS = 5000L;
private Runnable mCloseRunnable = new Runnable() {
private final Runnable mCloseRunnable = new Runnable() {
@Override
public void run()
{
@ -58,13 +58,13 @@ class SearchWheel implements View.OnClickListener
ATM(R.id.search_atm, R.drawable.ic_routing_atm_off, R.drawable.ic_routing_atm_on, R.string.atm);
@IdRes
private int mResId;
private final int mResId;
@DrawableRes
private int mDrawableOff;
private final int mDrawableOff;
@DrawableRes
private int mDrawableOn;
private final int mDrawableOn;
@StringRes
private int mQueryId;
private final int mQueryId;
SearchOption(@IdRes int resId, @DrawableRes int drawableOff, @DrawableRes int drawableOn,
@StringRes int queryId)

4
android/src/com/mapswithme/maps/routing/TransitStepAdapter.java
View file

@ -14,7 +14,7 @@ import java.util.List;
public class TransitStepAdapter extends RecyclerView.Adapter<TransitStepAdapter.TransitStepViewHolder>
{
@NonNull
private List<TransitStepInfo> mItems = new ArrayList<>();
private final List<TransitStepInfo> mItems = new ArrayList<>();
@Override
public TransitStepViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
@ -45,7 +45,7 @@ public class TransitStepAdapter extends RecyclerView.Adapter<TransitStepAdapter.
static class TransitStepViewHolder extends RecyclerView.ViewHolder
{
@NonNull
private TransitStepView mView;
private final TransitStepView mView;
TransitStepViewHolder(@NonNull View itemView)
{

4
android/src/com/mapswithme/maps/search/BookingFilterParams.java
View file

@ -133,8 +133,8 @@ public class BookingFilterParams implements Parcelable
}
}
private long mCheckinMillisec;
private long mCheckoutMillisec;
private final long mCheckinMillisec;
private final long mCheckoutMillisec;
@NonNull
private final Room[] mRooms;

4
android/src/com/mapswithme/maps/search/CategoriesAdapter.java
View file

@ -29,9 +29,9 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
private static final int TYPE_CATEGORY = 0;
@StringRes
private int mCategoryResIds[];
private int[] mCategoryResIds;
@DrawableRes
private int mIconResIds[];
private int[] mIconResIds;
private final LayoutInflater mInflater;
private final Resources mResources;

2
android/src/com/mapswithme/maps/search/FilterFragment.java
View file

@ -95,7 +95,7 @@ public class FilterFragment extends BaseMwmToolbarFragment
mRating = root.findViewById(R.id.rating);
// Explicit casting is needed in this case, otherwise the crash is obtained in runtime,
// seems like a bug in current compiler (Java 8)
mPrice = root.<PriceFilterView>findViewById(R.id.price);
mPrice = root.findViewById(R.id.price);
View content = root.findViewById(R.id.content);
RecyclerView type = content.findViewById(R.id.type);
type.setLayoutManager(new TagLayoutManager());

2
android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java
View file

@ -13,7 +13,7 @@ public class FloatingSearchToolbarController extends SearchToolbarController
@Nullable
private VisibilityListener mVisibilityListener;
@Nullable
private SearchToolbarListener mListener;
private final SearchToolbarListener mListener;
public interface VisibilityListener
{

2
android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java
View file

@ -80,7 +80,7 @@ class HotelsTypeAdapter extends RecyclerView.Adapter<HotelsTypeAdapter.HotelsTyp
@NonNull
private final List<Item> mItems;
@Nullable
private OnTypeSelectedListener mListener;
private final OnTypeSelectedListener mListener;
HotelsTypeViewHolder(@NonNull View itemView, @NonNull List<Item> items,
@Nullable OnTypeSelectedListener listener)

33
android/src/com/mapswithme/maps/search/SearchEngine.java
View file

@ -16,6 +16,7 @@ import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
public enum SearchEngine implements NativeSearchListener,
NativeMapSearchListener,
@ -157,13 +158,8 @@ public enum SearchEngine implements NativeSearchListener,
double lat, double lon, @Nullable HotelsFilter hotelsFilter,
@Nullable BookingFilterParams bookingParams)
{
try
{
return nativeRunSearch(query.getBytes("utf-8"), Language.getKeyboardLocale(context),
timestamp, hasLocation, lat, lon, hotelsFilter, bookingParams);
} catch (UnsupportedEncodingException ignored) { }
return false;
return nativeRunSearch(query.getBytes(StandardCharsets.UTF_8), Language.getKeyboardLocale(context),
timestamp, hasLocation, lat, lon, hotelsFilter, bookingParams);
}
@MainThread
@ -171,11 +167,8 @@ public enum SearchEngine implements NativeSearchListener,
boolean isMapAndTable, @Nullable HotelsFilter hotelsFilter,
@Nullable BookingFilterParams bookingParams)
{
try
{
nativeRunInteractiveSearch(query.getBytes("utf-8"), locale, timestamp, isMapAndTable,
hotelsFilter, bookingParams);
} catch (UnsupportedEncodingException ignored) { }
nativeRunInteractiveSearch(query.getBytes(StandardCharsets.UTF_8), locale, timestamp, isMapAndTable,
hotelsFilter, bookingParams);
}
@MainThread
@ -189,24 +182,14 @@ public enum SearchEngine implements NativeSearchListener,
@MainThread
public static void searchMaps(@NonNull Context context, String query, long timestamp)
{
try
{
nativeRunSearchMaps(query.getBytes("utf-8"), Language.getKeyboardLocale(context),
timestamp);
} catch (UnsupportedEncodingException ignored) { }
nativeRunSearchMaps(query.getBytes(StandardCharsets.UTF_8), Language.getKeyboardLocale(context),
timestamp);
}
@MainThread
public boolean searchInBookmarks(@NonNull String query, long categoryId, long timestamp)
{
try
{
return nativeRunSearchInBookmarks(query.getBytes("utf-8"), categoryId, timestamp);
} catch (UnsupportedEncodingException ex)
{
LOGGER.w(TAG, "Unsupported encoding in bookmarks search.", ex);
}
return false;
return nativeRunSearchInBookmarks(query.getBytes(StandardCharsets.UTF_8), categoryId, timestamp);
}
public void setQuery(@Nullable String query)

6
android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
View file

@ -221,7 +221,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
return;
}
boolean enabled = TtsPlayer.INSTANCE.isEnabled();
boolean enabled = TtsPlayer.isEnabled();
mPrefEnabled.setChecked(enabled);
mPrefEnabled.setSummary(null);
mPrefEnabled.setTitle(enabled ? R.string.on : R.string.off);
@ -251,10 +251,10 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
mCurrentLanguage = TtsPlayer.getSelectedLanguage(languages);
boolean available = (mCurrentLanguage != null && mCurrentLanguage.downloaded);
mPrefLanguages.setEnabled(available && TtsPlayer.INSTANCE.isEnabled());
mPrefLanguages.setEnabled(available && TtsPlayer.isEnabled());
mPrefLanguages.setSummary(available ? mCurrentLanguage.name : null);
mPrefLanguages.setValue(available ? mCurrentLanguage.internalCode : null);
mPrefEnabled.setChecked(available && TtsPlayer.INSTANCE.isEnabled());
mPrefEnabled.setChecked(available && TtsPlayer.isEnabled());
enableListeners(true);
}

2
android/src/com/mapswithme/maps/settings/StoragePathFragment.java
View file

@ -114,7 +114,7 @@ public class StoragePathFragment extends BaseSettingsFragment
static String getSizeString(long size)
{
final String units[] = { "Kb", "Mb", "Gb" };
final String[] units = { "Kb", "Mb", "Gb" };
long current = Constants.KB;
int i = 0;

2
android/src/com/mapswithme/maps/settings/UnitLocale.java
View file

@ -13,7 +13,7 @@ public class UnitLocale
{
final String code = Locale.getDefault().getCountry();
// USA, UK, Liberia, Burma
String arr[] = {"US", "GB", "LR", "MM"};
String[] arr = {"US", "GB", "LR", "MM"};
for (String s : arr)
if (s.equalsIgnoreCase(code))
return UNITS_FOOT;

6
android/src/com/mapswithme/maps/ugc/EditParams.java
View file

@ -23,10 +23,10 @@ public class EditParams
private final boolean mFromNotification;
// TODO: mLat, mLon, mAddress are added just for debugging null feature id for ugc object.
// Remove they after problem is fixed.
private double mLat;
private double mLon;
private final double mLat;
private final double mLon;
@Nullable
private String mAddress;
private final String mAddress;
private EditParams(@NonNull Builder builder)
{

2
android/src/com/mapswithme/maps/ugc/UGCRatingAdapter.java
View file

@ -18,7 +18,7 @@ import java.util.List;
class UGCRatingAdapter extends RecyclerView.Adapter<UGCRatingAdapter.ViewHolder>
{
@NonNull
private ArrayList<UGC.Rating> mItems = new ArrayList<>();
private final ArrayList<UGC.Rating> mItems = new ArrayList<>();
@Override
public UGCRatingAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)

2
android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java
View file

@ -18,7 +18,7 @@ import java.util.List;
class UGCRatingRecordsAdapter extends RecyclerView.Adapter<UGCRatingRecordsAdapter.ViewHolder>
{
@NonNull
private ArrayList<UGC.Rating> mItems = new ArrayList<>();
private final ArrayList<UGC.Rating> mItems = new ArrayList<>();
@Override
public UGCRatingRecordsAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)

2
android/src/com/mapswithme/maps/ugc/UGCReviewAdapter.java
View file

@ -20,7 +20,7 @@ class UGCReviewAdapter extends Adapter<UGCReviewAdapter.ViewHolder>
{
static final int MAX_COUNT = 3;
@NonNull
private ArrayList<UGC.Review> mItems = new ArrayList<>();
private final ArrayList<UGC.Review> mItems = new ArrayList<>();
@Override
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)

2
android/src/com/mapswithme/maps/ugc/UGCUpdate.java
View file

@ -13,7 +13,7 @@ class UGCUpdate
private final UGC.Rating[] mRatings;
@Nullable
private String mText;
private long mTimeMillis;
private final long mTimeMillis;
@NonNull
private final String mDeviceLocale;
@NonNull

4
android/src/com/mapswithme/maps/widget/SearchToolbarController.java
View file

@ -511,8 +511,8 @@ public class SearchToolbarController extends ToolbarController
}
}
public static interface RoomsGuestsMenuStateCallback
public interface RoomsGuestsMenuStateCallback
{
public void onRoomsGuestsMenuStateChange(boolean isOpen);
void onRoomsGuestsMenuStateChange(boolean isOpen);
}
}

2
android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuController.java
View file

@ -25,7 +25,7 @@ public class BottomSheetMenuController implements MenuController
@NonNull
private final MenuRenderer mMenuRenderer;
@Nullable
private MenuStateObserver mStateObserver;
private final MenuStateObserver mStateObserver;
private final BottomSheetBehavior.BottomSheetCallback mSheetCallback
= new BottomSheetBehavior.BottomSheetCallback()
{

2
android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
View file

@ -24,7 +24,7 @@ public class MyPositionButton
private static final SparseArray<Drawable> mIcons = new SparseArray<>(); // Location mode -> Button icon
private int mMode;
private boolean mVisible;
private final boolean mVisible;
private final int mFollowPaddingShift;

2
android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java
View file

@ -48,7 +48,7 @@ public class DirectionFragment extends BaseMwmDialogFragment
});
initViews(root);
if (savedInstanceState != null)
setMapObject(savedInstanceState.<MapObject>getParcelable(EXTRA_MAP_OBJECT));
setMapObject(savedInstanceState.getParcelable(EXTRA_MAP_OBJECT));
return root;
}

4
android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java
View file

@ -126,9 +126,9 @@ class GalleryAdapter extends RecyclerView.Adapter<GalleryAdapter.ViewHolder>
static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
{
@NonNull
private ImageView mImage;
private final ImageView mImage;
@NonNull
private View mMore;
private final View mMore;
@Nullable
private final RecyclerClickListener mListener;
private int mPosition;

4
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -290,7 +290,7 @@ public class PlacePageView extends NestedScrollViewClickFixed
private final EditBookmarkClickListener mEditBookmarkClickListener = new EditBookmarkClickListener();
@NonNull
private OnClickListener mDownloadClickListener = new OnClickListener()
private final OnClickListener mDownloadClickListener = new OnClickListener()
{
@Override
public void onClick(View v)
@ -300,7 +300,7 @@ public class PlacePageView extends NestedScrollViewClickFixed
};
@NonNull
private OnClickListener mCancelDownloadListener = new OnClickListener()
private final OnClickListener mCancelDownloadListener = new OnClickListener()
{
@Override
public void onClick(View v)

2
android/src/com/mapswithme/util/Constants.java
View file

@ -66,7 +66,7 @@ public final class Constants
{
public static final float RATING_INCORRECT_VALUE = 0.0f;
private Rating() {};
private Rating() {}
}

2
android/src/com/mapswithme/util/Utils.java
View file

@ -771,7 +771,7 @@ public class Utils
public enum PartnerAppOpenMode
{
None, Direct, Indirect;
None, Direct, Indirect
}
public interface Proc<T>

2
android/src/com/mapswithme/util/ViewServer.java
View file

@ -547,7 +547,7 @@ public class ViewServer implements Runnable {
}
private class ViewServerWorker implements Runnable, WindowListener {
private Socket mClient;
private final Socket mClient;
private boolean mNeedWindowListUpdate;
private boolean mNeedFocusedWindowUpdate;

6
android/src/com/mapswithme/util/log/ZipLogsTask.java
View file

@ -65,11 +65,11 @@ class ZipLogsTask implements Runnable
else
{
try(FileInputStream fi = new FileInputStream(sourcePath);
BufferedInputStream origin = new BufferedInputStream(fi, BUFFER_SIZE);)
BufferedInputStream origin = new BufferedInputStream(fi, BUFFER_SIZE))
{
ZipEntry entry = new ZipEntry(getLastPathComponent(sourcePath));
out.putNextEntry(entry);
byte data[] = new byte[BUFFER_SIZE];
byte[] data = new byte[BUFFER_SIZE];
int count;
while ((count = origin.read(data, 0, BUFFER_SIZE)) != -1) {
out.write(data, 0, count);
@ -103,7 +103,7 @@ class ZipLogsTask implements Runnable
}
else
{
byte data[] = new byte[BUFFER_SIZE];
byte[] data = new byte[BUFFER_SIZE];
String unmodifiedFilePath = file.getPath();
String relativePath = unmodifiedFilePath
.substring(basePathLength);