Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Performance: Replace '.equals("")' with '.isEmpty'

Browse source
This commit is contained in:
TacoTheDank 2020-11-19 15:23:35 -05:00
parent 8a7f50f3a6
commit 608d93a8fa
31 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
View file

@ -329,7 +329,7 @@ public class RouteDataObject {
public String getDestinationName(String lang, boolean transliterate, boolean direction){ public String getDestinationName(String lang, boolean transliterate, boolean direction){
//Issue #3289: Treat destination:ref like a destination, not like a ref //Issue #3289: Treat destination:ref like a destination, not like a ref
String destRef = ((getDestinationRef(direction) == null) || getDestinationRef(direction).equals(getRef(lang, transliterate, direction))) ? "" : getDestinationRef(direction); String destRef = ((getDestinationRef(direction) == null) || getDestinationRef(direction).equals(getRef(lang, transliterate, direction))) ? "" : getDestinationRef(direction);
String destRef1 = ("".equals(destRef)) ? "" : destRef + ", "; String destRef1 = (destRef != null && destRef.isEmpty()) ? "" : destRef + ", ";
if(names != null) { if(names != null) {
int[] kt = names.keys(); int[] kt = names.keys();
@ -373,7 +373,7 @@ public class RouteDataObject {
return destRef1 + ((transliterate) ? TransliterationHelper.transliterate(destinationDefault) : destinationDefault); return destRef1 + ((transliterate) ? TransliterationHelper.transliterate(destinationDefault) : destinationDefault);
} }
} }
return "".equals(destRef) ? null : destRef; return destRef != null && destRef.isEmpty() ? null : destRef;
} }
public int getPoint31XTile(int i) { public int getPoint31XTile(int i) {

2
OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesStoragePrinter.java
View file

@ -221,7 +221,7 @@ public class RenderingRulesStoragePrinter {
mp+=", "; mp+=", ";
} }
} }
if(mp.equals("")) { if(mp.isEmpty()) {
mp = "java.util.Collections.EMPTY_MAP"; mp = "java.util.Collections.EMPTY_MAP";
} else { } else {
mp = "createMap(" +mp +")"; mp = "createMap(" +mp +")";

2
OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesTransformer.java
View file

@ -80,7 +80,7 @@ public class RenderingRulesTransformer {
for (int i = 0; i < nl.getLength();) { for (int i = 0; i < nl.getLength();) {
Element app = (Element) nl.item(i); Element app = (Element) nl.item(i);
String pt = app.getAttribute("pattern"); String pt = app.getAttribute("pattern");
if (!pt.equals("")) { if (!pt.isEmpty()) {
if (!patterns.containsKey(pt)) { if (!patterns.containsKey(pt)) {
throw new IllegalStateException("Pattern '" + pt + "' is not defined"); throw new IllegalStateException("Pattern '" + pt + "' is not defined");
} }

2
OsmAnd-java/src/main/java/net/osmand/util/GeoPointParserUtil.java
View file

@ -62,7 +62,7 @@ public class GeoPointParserUtil {
private static Map<String, String> getQueryParameters(String query) { private static Map<String, String> getQueryParameters(String query) {
final LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(); final LinkedHashMap<String, String> map = new LinkedHashMap<String, String>();
if (query != null && !query.equals("")) { if (query != null && !query.isEmpty()) {
String[] params = query.split("[&/]"); String[] params = query.split("[&/]");
for (String p : params) { for (String p : params) {
String[] keyValue = p.split("="); String[] keyValue = p.split("=");

10
OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
View file

@ -361,7 +361,7 @@ public class FavouritesDbHelper {
} }
public boolean addFavourite(FavouritePoint p, boolean saveImmediately) { public boolean addFavourite(FavouritePoint p, boolean saveImmediately) {
if (p.getName().equals("") && flatGroups.containsKey(p.getCategory())) { if (p.getName().isEmpty() && flatGroups.containsKey(p.getCategory())) {
return true; return true;
} }
if (!p.isAddressSpecified()) { if (!p.isAddressSpecified()) {
@ -370,7 +370,7 @@ public class FavouritesDbHelper {
context.getSettings().SHOW_FAVORITES.set(true); context.getSettings().SHOW_FAVORITES.set(true);
FavoriteGroup group = getOrCreateGroup(p, 0); FavoriteGroup group = getOrCreateGroup(p, 0);
if (!p.getName().equals("")) { if (!p.getName().isEmpty()) {
p.setVisible(group.visible); p.setVisible(group.visible);
if (FavouritePoint.SpecialPointType.PARKING.equals(p.getSpecialPointType())) { if (FavouritePoint.SpecialPointType.PARKING.equals(p.getSpecialPointType())) {
p.setColor(ContextCompat.getColor(context, R.color.parking_icon_background)); p.setColor(ContextCompat.getColor(context, R.color.parking_icon_background));
@ -970,7 +970,7 @@ public class FavouritesDbHelper {
p.setName(name); p.setName(name);
p.setCategory(cat); p.setCategory(cat);
FavoriteGroup group = getOrCreateGroup(p, 0); FavoriteGroup group = getOrCreateGroup(p, 0);
if (!name.equals("")) { if (!name.isEmpty()) {
p.setLatitude(query.getDouble(2)); p.setLatitude(query.getDouble(2));
p.setLongitude(query.getDouble(3)); p.setLongitude(query.getDouble(3));
group.points.add(p); group.points.add(p);
@ -1014,7 +1014,7 @@ public class FavouritesDbHelper {
public boolean addFavouriteDB(FavouritePoint p) { public boolean addFavouriteDB(FavouritePoint p) {
if (p.getName().equals("") && flatGroups.containsKey(p.getCategory())) { if (p.getName().isEmpty() && flatGroups.containsKey(p.getCategory())) {
return true; return true;
} }
SQLiteConnection db = openConnection(false); SQLiteConnection db = openConnection(false);
@ -1024,7 +1024,7 @@ public class FavouritesDbHelper {
"INSERT INTO " + FAVOURITE_TABLE_NAME + " (" + FAVOURITE_COL_NAME + ", " + FAVOURITE_COL_CATEGORY + ", " "INSERT INTO " + FAVOURITE_TABLE_NAME + " (" + FAVOURITE_COL_NAME + ", " + FAVOURITE_COL_CATEGORY + ", "
+ FAVOURITE_COL_LAT + ", " + FAVOURITE_COL_LON + ")" + " VALUES (?, ?, ?, ?)", new Object[]{p.getName(), p.getCategory(), p.getLatitude(), p.getLongitude()}); //$NON-NLS-1$ //$NON-NLS-2$ + FAVOURITE_COL_LAT + ", " + FAVOURITE_COL_LON + ")" + " VALUES (?, ?, ?, ?)", new Object[]{p.getName(), p.getCategory(), p.getLatitude(), p.getLongitude()}); //$NON-NLS-1$ //$NON-NLS-2$
FavoriteGroup group = getOrCreateGroup(p, 0); FavoriteGroup group = getOrCreateGroup(p, 0);
if (!p.getName().equals("")) { if (!p.getName().isEmpty()) {
p.setVisible(group.visible); p.setVisible(group.visible);
p.setColor(group.color); p.setColor(group.color);
group.points.add(p); group.points.add(p);

12
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -412,8 +412,8 @@ public class OsmandApplication extends MultiDexApplication {
if (defaultLocale == null) { if (defaultLocale == null) {
defaultLocale = Locale.getDefault(); defaultLocale = Locale.getDefault();
} }
if (!"".equals(lang)) { if (lang != null && !lang.isEmpty()) {
if (!"".equals(country)) { if (country != null && !country.isEmpty()) {
preferredLocale = new Locale(lang, country); preferredLocale = new Locale(lang, country);
} else { } else {
preferredLocale = new Locale(lang); preferredLocale = new Locale(lang);
@ -421,9 +421,9 @@ public class OsmandApplication extends MultiDexApplication {
} }
Locale selectedLocale = null; Locale selectedLocale = null;
if (!"".equals(lang) && !config.locale.equals(preferredLocale)) { if (lang != null && !lang.isEmpty() && !config.locale.equals(preferredLocale)) {
selectedLocale = preferredLocale; selectedLocale = preferredLocale;
} else if ("".equals(lang) && defaultLocale != null && Locale.getDefault() != defaultLocale) { } else if (lang != null && lang.isEmpty() && defaultLocale != null && Locale.getDefault() != defaultLocale) {
selectedLocale = defaultLocale; selectedLocale = defaultLocale;
preferredLocale = null; preferredLocale = null;
} }
@ -812,12 +812,12 @@ public class OsmandApplication extends MultiDexApplication {
if (preferredLocale != null) { if (preferredLocale != null) {
Configuration config = context.getResources().getConfiguration(); Configuration config = context.getResources().getConfiguration();
String lang = preferredLocale.getLanguage(); String lang = preferredLocale.getLanguage();
if (!"".equals(lang) && !config.locale.getLanguage().equals(lang)) { if (!lang.isEmpty() && !config.locale.getLanguage().equals(lang)) {
preferredLocale = new Locale(lang); preferredLocale = new Locale(lang);
Locale.setDefault(preferredLocale); Locale.setDefault(preferredLocale);
config.locale = preferredLocale; config.locale = preferredLocale;
context.getResources().updateConfiguration(config, context.getResources().getDisplayMetrics()); context.getResources().updateConfiguration(config, context.getResources().getDisplayMetrics());
} else if("".equals(lang) && defaultLocale != null && Locale.getDefault() != defaultLocale) { } else if(lang.isEmpty() && defaultLocale != null && Locale.getDefault() != defaultLocale) {
Locale.setDefault(defaultLocale); Locale.setDefault(defaultLocale);
config.locale = defaultLocale; config.locale = defaultLocale;
getBaseContext().getResources().updateConfiguration(config, getBaseContext().getResources().getDisplayMetrics()); getBaseContext().getResources().updateConfiguration(config, getBaseContext().getResources().getDisplayMetrics());

2
OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
View file

@ -176,7 +176,7 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
"feature_articles/osmand-3-8-released.html")); "feature_articles/osmand-3-8-released.html"));
String releasedate = ""; String releasedate = "";
if (!this.getString(R.string.app_edition).equals("")) { if (!this.getString(R.string.app_edition).isEmpty()) {
releasedate = ", " + this.getString(R.string.shared_string_release).toLowerCase() + ": " + this.getString(R.string.app_edition); releasedate = ", " + this.getString(R.string.shared_string_release).toLowerCase() + ": " + this.getString(R.string.app_edition);
} }
String version = Version.getFullVersion(getMyApplication()) + releasedate; String version = Version.getFullVersion(getMyApplication()) + releasedate;

2
OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java
View file

@ -165,7 +165,7 @@ public class StartGPSStatus extends OsmAndAction {
// if (g.activity.length() == 0) { // if (g.activity.length() == 0) {
PackageManager pm = mapActivity.getPackageManager(); PackageManager pm = mapActivity.getPackageManager();
try { try {
String appName = !g.paidAppName.equals("") && String appName = !g.paidAppName.isEmpty() &&
g.installed(mapActivity, g.paidAppName) ? g.paidAppName : g.appName; g.installed(mapActivity, g.paidAppName) ? g.paidAppName : g.appName;
intent = pm.getLaunchIntentForPackage(appName); intent = pm.getLaunchIntentForPackage(appName);
} catch (RuntimeException e) { } catch (RuntimeException e) {

4
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -481,7 +481,7 @@ public class ConfigureMapMenu {
.createItem()); .createItem());
String localeDescr = activity.getMyApplication().getSettings().MAP_PREFERRED_LOCALE.get(); String localeDescr = activity.getMyApplication().getSettings().MAP_PREFERRED_LOCALE.get();
localeDescr = localeDescr == null || localeDescr.equals("") ? activity.getString(R.string.local_map_names) localeDescr = localeDescr == null || localeDescr.isEmpty() ? activity.getString(R.string.local_map_names)
: localeDescr; : localeDescr;
adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_locale, activity) adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_locale, activity)
.setId(MAP_LANGUAGE_ID) .setId(MAP_LANGUAGE_ID)
@ -570,7 +570,7 @@ public class ConfigureMapMenu {
txtIds[index]); txtIds[index]);
refreshMapComplete(activity); refreshMapComplete(activity);
String localeDescr = txtIds[index]; String localeDescr = txtIds[index];
localeDescr = localeDescr == null || localeDescr.equals("") ? activity localeDescr = localeDescr == null || localeDescr.isEmpty() ? activity
.getString(R.string.local_map_names) : localeDescr; .getString(R.string.local_map_names) : localeDescr;
adapter.getItem(pos).setDescription(localeDescr); adapter.getItem(pos).setDescription(localeDescr);
ad.notifyDataSetInvalidated(); ad.notifyDataSetInvalidated();

2
OsmAnd/src/net/osmand/plus/helpers/MapMarkerDialogHelper.java
View file

@ -101,7 +101,7 @@ public class MapMarkerDialogHelper {
String desc = OsmAndFormatter.getFormattedDate(app, marker.creationDate); String desc = OsmAndFormatter.getFormattedDate(app, marker.creationDate);
String markerGroupName = marker.groupName; String markerGroupName = marker.groupName;
if (markerGroupName != null) { if (markerGroupName != null) {
if (markerGroupName.equals("")) { if (markerGroupName.isEmpty()) {
markerGroupName = app.getString(R.string.shared_string_favorites); markerGroupName = app.getString(R.string.shared_string_favorites);
} }
desc += " • " + markerGroupName; desc += " • " + markerGroupName;

2
OsmAnd/src/net/osmand/plus/importfiles/ImportHelper.java
View file

@ -513,7 +513,7 @@ public class ImportHelper {
private File getFileToSave(final String fileName, final File importDir, final WptPt pt) { private File getFileToSave(final String fileName, final File importDir, final WptPt pt) {
final StringBuilder builder = new StringBuilder(fileName); final StringBuilder builder = new StringBuilder(fileName);
if ("".equals(fileName)) { if (fileName != null && fileName.isEmpty()) {
builder.append("import_").append(new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time))).append(GPX_FILE_EXT); //$NON-NLS-1$ builder.append("import_").append(new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time))).append(GPX_FILE_EXT); //$NON-NLS-1$
} }
if (fileName.endsWith(KML_SUFFIX)) { if (fileName.endsWith(KML_SUFFIX)) {

10
OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java
View file

@ -123,7 +123,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
final DelayAutoCompleteTextView textView = (DelayAutoCompleteTextView) view.findViewById(R.id.auto_complete_text_view); final DelayAutoCompleteTextView textView = (DelayAutoCompleteTextView) view.findViewById(R.id.auto_complete_text_view);
textView.setAdapter(new MapillaryAutoCompleteAdapter(getContext(), R.layout.auto_complete_suggestion, getMyApplication())); textView.setAdapter(new MapillaryAutoCompleteAdapter(getContext(), R.layout.auto_complete_suggestion, getMyApplication()));
String selectedUsername = settings.MAPILLARY_FILTER_USERNAME.get(); String selectedUsername = settings.MAPILLARY_FILTER_USERNAME.get();
if (!selectedUsername.equals("") && settings.USE_MAPILLARY_FILTER.get()) { if (!selectedUsername.isEmpty() && settings.USE_MAPILLARY_FILTER.get()) {
textView.setText(selectedUsername); textView.setText(selectedUsername);
textView.setSelection(selectedUsername.length()); textView.setSelection(selectedUsername.length());
} }
@ -261,16 +261,16 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
String dateFrom = dateFromEt.getText().toString(); String dateFrom = dateFromEt.getText().toString();
String dateTo = dateToEt.getText().toString(); String dateTo = dateToEt.getText().toString();
if (!settings.MAPILLARY_FILTER_USERNAME.get().equals("") || !dateFrom.equals("") || !dateTo.equals("") || settings.MAPILLARY_FILTER_PANO.get()) { if (!settings.MAPILLARY_FILTER_USERNAME.get().isEmpty() || !dateFrom.isEmpty() || !dateTo.isEmpty() || settings.MAPILLARY_FILTER_PANO.get()) {
settings.USE_MAPILLARY_FILTER.set(true); settings.USE_MAPILLARY_FILTER.set(true);
} }
if (dateFrom.equals("")) { if (dateFrom.isEmpty()) {
settings.MAPILLARY_FILTER_FROM_DATE.set(0L); settings.MAPILLARY_FILTER_FROM_DATE.set(0L);
} }
if (dateTo.equals("")) { if (dateTo.isEmpty()) {
settings.MAPILLARY_FILTER_TO_DATE.set(0L); settings.MAPILLARY_FILTER_TO_DATE.set(0L);
} }
if (!username.equals("") && settings.MAPILLARY_FILTER_USERNAME.get().equals("")) { if (!username.isEmpty() && settings.MAPILLARY_FILTER_USERNAME.get().isEmpty()) {
view.findViewById(R.id.warning_linear_layout).setVisibility(View.VISIBLE); view.findViewById(R.id.warning_linear_layout).setVisibility(View.VISIBLE);
} else { } else {
mapActivity.getDashboard().hideDashboard(); mapActivity.getDashboard().hideDashboard();

2
OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java
View file

@ -205,7 +205,7 @@ class MapillaryVectorLayer extends MapTileLayer implements MapillaryLayer, ICont
long to = settings.MAPILLARY_FILTER_TO_DATE.get(); long to = settings.MAPILLARY_FILTER_TO_DATE.get();
boolean pano = settings.MAPILLARY_FILTER_PANO.get(); boolean pano = settings.MAPILLARY_FILTER_PANO.get();
if (!userKey.equals("")) { if (!userKey.isEmpty()) {
String key = (String) userData.get("userkey"); String key = (String) userData.get("userkey");
if (!userKey.equals(key)) { if (!userKey.equals(key)) {
return true; return true;

2
OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
View file

@ -99,7 +99,7 @@ public class SelectWptCategoriesBottomSheetDialogFragment extends MenuBottomShee
.setCompoundButtonColorId(activeColorResId) .setCompoundButtonColorId(activeColorResId)
.setDescription(String.valueOf(entry.getValue().size())) .setDescription(String.valueOf(entry.getValue().size()))
.setIcon(getContentIcon(R.drawable.ic_action_folder)) .setIcon(getContentIcon(R.drawable.ic_action_folder))
.setTitle(category.equals("") ? getString(R.string.shared_string_waypoints) : category) .setTitle(category.isEmpty() ? getString(R.string.shared_string_waypoints) : category)
.setLayoutId(R.layout.bottom_sheet_item_with_descr_and_checkbox_56dp) .setLayoutId(R.layout.bottom_sheet_item_with_descr_and_checkbox_56dp)
.setTag(category) .setTag(category)
.setOnClickListener(new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {

2
OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
View file

@ -131,7 +131,7 @@ public class MapMarkersActiveAdapter extends RecyclerView.Adapter<MapMarkerItemV
String descr; String descr;
if ((descr = marker.groupName) != null) { if ((descr = marker.groupName) != null) {
if (descr.equals("")) { if (descr.isEmpty()) {
descr = mapActivity.getString(R.string.shared_string_favorites); descr = mapActivity.getString(R.string.shared_string_favorites);
} }
} else { } else {

4
OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
View file

@ -403,7 +403,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
final GroupHeader groupHeader = (GroupHeader) header; final GroupHeader groupHeader = (GroupHeader) header;
final MapMarkersGroup group = groupHeader.getGroup(); final MapMarkersGroup group = groupHeader.getGroup();
String groupName = group.getName(); String groupName = group.getName();
if (groupName.equals("")) { if (groupName.isEmpty()) {
groupName = app.getString(R.string.shared_string_favorites); groupName = app.getString(R.string.shared_string_favorites);
} else if (group.getType() == MapMarkersGroup.GPX_TYPE) { } else if (group.getType() == MapMarkersGroup.GPX_TYPE) {
groupName = groupName.replace(IndexConstants.GPX_FILE_EXT, "").replace("/", " ").replace("_", " "); groupName = groupName.replace(IndexConstants.GPX_FILE_EXT, "").replace("/", " ").replace("_", " ");
@ -579,7 +579,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
Iterator<String> it = categories.iterator(); Iterator<String> it = categories.iterator();
while (it.hasNext()) { while (it.hasNext()) {
String category = it.next(); String category = it.next();
if (category.equals("")) { if (category.isEmpty()) {
category = app.getResources().getString(R.string.shared_string_waypoints); category = app.getResources().getString(R.string.shared_string_waypoints);
} }
sb.append(category); sb.append(category);

2
OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java
View file

@ -145,7 +145,7 @@ public class MapMarkersHistoryAdapter extends RecyclerView.Adapter<RecyclerView.
String desc = app.getString(R.string.passed, OsmAndFormatter.getFormattedDate(app, marker.visitedDate)); String desc = app.getString(R.string.passed, OsmAndFormatter.getFormattedDate(app, marker.visitedDate));
String markerGroupName = marker.groupName; String markerGroupName = marker.groupName;
if (markerGroupName != null) { if (markerGroupName != null) {
if (markerGroupName.equals("")) { if (markerGroupName.isEmpty()) {
markerGroupName = app.getString(R.string.shared_string_favorites); markerGroupName = app.getString(R.string.shared_string_favorites);
} }
desc += " • " + markerGroupName; desc += " • " + markerGroupName;

2
OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
View file

@ -197,7 +197,7 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemVie
String descr; String descr;
if ((descr = marker.groupName) != null) { if ((descr = marker.groupName) != null) {
if (descr.equals("")) { if (descr.isEmpty()) {
descr = mapActivity.getString(R.string.shared_string_favorites); descr = mapActivity.getString(R.string.shared_string_favorites);
} }
} else { } else {

2
OsmAnd/src/net/osmand/plus/mapmarkers/adapters/TracksGroupsAdapter.java
View file

@ -57,7 +57,7 @@ public class TracksGroupsAdapter extends GroupsAdapter {
Iterator<String> it = categories.iterator(); Iterator<String> it = categories.iterator();
while (it.hasNext()) { while (it.hasNext()) {
String category = it.next(); String category = it.next();
if (!category.equals("")) { if (!category.isEmpty()) {
sb.append(category); sb.append(category);
if (it.hasNext()) { if (it.hasNext()) {
sb.append(", "); sb.append(", ");

2
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java
View file

@ -234,7 +234,7 @@ public class SendPoiBottomSheetFragment extends MenuBottomSheetDialogFragment {
if (modifiedItemsOutOfLimit != 0) { if (modifiedItemsOutOfLimit != 0) {
comment = comment.concat("; ").concat(modifiedItemsOutOfLimit + " ") comment = comment.concat("; ").concat(modifiedItemsOutOfLimit + " ")
.concat(getString(R.string.items_modified)).concat("."); .concat(getString(R.string.items_modified)).concat(".");
} else if (!comment.equals("")) { } else if (!comment.isEmpty()) {
comment = comment.concat("."); comment = comment.concat(".");
} }
return comment; return comment;

4
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java
View file

@ -84,7 +84,7 @@ public class SendPoiDialogFragment extends DialogFragment {
messageLabel.setVisibility(hasPOI ? View.VISIBLE : View.GONE); messageLabel.setVisibility(hasPOI ? View.VISIBLE : View.GONE);
messageEditText.setVisibility(hasPOI ? View.VISIBLE : View.GONE); messageEditText.setVisibility(hasPOI ? View.VISIBLE : View.GONE);
closeChangeSetCheckBox.setVisibility(hasPOI ? View.VISIBLE : View.GONE); closeChangeSetCheckBox.setVisibility(hasPOI ? View.VISIBLE : View.GONE);
closeChangeSetCheckBox.setChecked(hasPOI && !defaultChangeSet.equals("")); closeChangeSetCheckBox.setChecked(hasPOI && !defaultChangeSet.isEmpty());
view.findViewById(R.id.osm_note_header).setVisibility(hasPOI ? View.GONE : View.VISIBLE); view.findViewById(R.id.osm_note_header).setVisibility(hasPOI ? View.GONE : View.VISIBLE);
uploadAnonymously.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { uploadAnonymously.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
@ -233,7 +233,7 @@ public class SendPoiDialogFragment extends DialogFragment {
} }
if (modifiedItemsOutOfLimit != 0) { if (modifiedItemsOutOfLimit != 0) {
comment = comment.concat("; ").concat(modifiedItemsOutOfLimit + " ").concat(getString(R.string.items_modified)).concat("."); comment = comment.concat("; ").concat(modifiedItemsOutOfLimit + " ").concat(getString(R.string.items_modified)).concat(".");
} else if (!comment.equals("")){ } else if (!comment.isEmpty()){
comment = comment.concat("."); comment = comment.concat(".");
} }
return comment; return comment;

2
OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
View file

@ -728,7 +728,7 @@ public class MapRenderRepositories {
currentRenderingContext.height = requestedBox.getPixHeight(); currentRenderingContext.height = requestedBox.getPixHeight();
currentRenderingContext.nightMode = nightMode; currentRenderingContext.nightMode = nightMode;
if(requestedBox.getZoom() <= zoomToOverviewLocalNames && if(requestedBox.getZoom() <= zoomToOverviewLocalNames &&
"".equals(prefs.MAP_PREFERRED_LOCALE.get())) { prefs.MAP_PREFERRED_LOCALE.get() != null && prefs.MAP_PREFERRED_LOCALE.get().isEmpty()) {
currentRenderingContext.preferredLocale = app.getLanguage(); currentRenderingContext.preferredLocale = app.getLanguage();
currentRenderingContext.transliterate = currentRenderingContext.transliterate =
!languagesNotTransliterateOnBasemap.contains(app.getLanguage()); !languagesNotTransliterateOnBasemap.contains(app.getLanguage());

2
OsmAnd/src/net/osmand/plus/render/TextRenderer.java
View file

@ -438,7 +438,7 @@ public class TextRenderer {
String nameTag = isName ? "" : obj.getMapIndex().decodeType(tag).tag; String nameTag = isName ? "" : obj.getMapIndex().decodeType(tag).tag;
boolean skip = false; boolean skip = false;
// not completely correct we should check "name"+rc.preferredLocale // not completely correct we should check "name"+rc.preferredLocale
if (isName && !rc.preferredLocale.equals("") && if (isName && !rc.preferredLocale.isEmpty() &&
map.containsKey(obj.getMapIndex().nameEnEncodingType)) { map.containsKey(obj.getMapIndex().nameEnEncodingType)) {
skip = true; skip = true;
} }

2
OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
View file

@ -486,7 +486,7 @@ public class ResourceManager {
try { try {
progress.startTask(context.getString(R.string.installing_new_resources), -1); progress.startTask(context.getString(R.string.installing_new_resources), -1);
AssetManager assetManager = context.getAssets(); AssetManager assetManager = context.getAssets();
boolean isFirstInstall = context.getSettings().PREVIOUS_INSTALLED_VERSION.get().equals(""); boolean isFirstInstall = context.getSettings().PREVIOUS_INSTALLED_VERSION.get().isEmpty();
unpackBundledAssets(assetManager, applicationDataDir, progress, isFirstInstall || forceUpdate); unpackBundledAssets(assetManager, applicationDataDir, progress, isFirstInstall || forceUpdate);
context.getSettings().PREVIOUS_INSTALLED_VERSION.set(fv); context.getSettings().PREVIOUS_INSTALLED_VERSION.set(fv);
copyRegionsBoundaries(); copyRegionsBoundaries();

2
OsmAnd/src/net/osmand/plus/routepreparationmenu/AddPointBottomSheetDialog.java
View file

@ -651,7 +651,7 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
((FavouritePoint) item).getSpecialPointType().getIconId(app), iconColor)); ((FavouritePoint) item).getSpecialPointType().getIconId(app), iconColor));
favoriteViewHolder.description.setText(point.getDescription()); favoriteViewHolder.description.setText(point.getDescription());
} else { } else {
if (point.getCategory().equals("")) { if (point.getCategory().isEmpty()) {
favoriteViewHolder.description.setText(R.string.shared_string_favorites); favoriteViewHolder.description.setText(R.string.shared_string_favorites);
} else { } else {
favoriteViewHolder.description.setText(point.getCategory()); favoriteViewHolder.description.setText(point.getCategory());

4
OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
View file

@ -59,9 +59,9 @@ public class BooleanPreferenceBottomSheet extends BasePreferenceBottomSheet {
final BooleanPreference pref = (BooleanPreference) preference; final BooleanPreference pref = (BooleanPreference) preference;
CharSequence summaryOn = switchPreference.getSummaryOn(); CharSequence summaryOn = switchPreference.getSummaryOn();
CharSequence summaryOff = switchPreference.getSummaryOff(); CharSequence summaryOff = switchPreference.getSummaryOff();
final String on = summaryOn == null || summaryOn.toString().equals("") final String on = summaryOn == null || summaryOn.toString().isEmpty()
? getString(R.string.shared_string_enabled) : summaryOn.toString(); ? getString(R.string.shared_string_enabled) : summaryOn.toString();
final String off = summaryOff == null || summaryOff.toString().equals("") final String off = summaryOff == null || summaryOff.toString().isEmpty()
? getString(R.string.shared_string_disabled) : summaryOff.toString(); ? getString(R.string.shared_string_disabled) : summaryOff.toString();
final int activeColor = AndroidUtils.resolveAttribute(themedCtx, R.attr.active_color_basic); final int activeColor = AndroidUtils.resolveAttribute(themedCtx, R.attr.active_color_basic);
final int disabledColor = AndroidUtils.resolveAttribute(themedCtx, android.R.attr.textColorSecondary); final int disabledColor = AndroidUtils.resolveAttribute(themedCtx, android.R.attr.textColorSecondary);

2
OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java
View file

@ -158,7 +158,7 @@ public class SelectFolderBottomSheet extends BasePreferenceBottomSheet {
Fragment fragment = getTargetFragment(); Fragment fragment = getTargetFragment();
if (fragment instanceof BaseSettingsFragment) { if (fragment instanceof BaseSettingsFragment) {
String newPath = editText.getText().toString().trim(); String newPath = editText.getText().toString().trim();
if (!newPath.equals("")) { if (!newPath.isEmpty()) {
boolean pathChanged = !newPath.equals(currentPath); boolean pathChanged = !newPath.equals(currentPath);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putBoolean(TAG, true); bundle.putBoolean(TAG, true);

2
OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java
View file

@ -241,7 +241,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
divider.setVisibility(View.VISIBLE); divider.setVisibility(View.VISIBLE);
secondPart.setVisibility(View.VISIBLE); secondPart.setVisibility(View.VISIBLE);
String space = getSpaceDescription(item.getDirectory()); String space = getSpaceDescription(item.getDirectory());
if (!space.equals("")) { if (!space.isEmpty()) {
space = space.replaceAll(" • ", " • "); space = space.replaceAll(" • ", " • ");
tvSummary.setText(space); tvSummary.setText(space);
tvSummary.setVisibility(View.VISIBLE); tvSummary.setVisibility(View.VISIBLE);

2
OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
View file

@ -897,7 +897,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
} }
private boolean nameIsEmpty() { private boolean nameIsEmpty() {
return changedProfile.name.trim().equals(""); return changedProfile.name.trim().isEmpty();
} }
private void disableSaveButtonWithErrorMessage(String errorMessage) { private void disableSaveButtonWithErrorMessage(String errorMessage) {

4
OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
View file

@ -137,9 +137,9 @@ public class SRTMPlugin extends OsmandPlugin {
public boolean init(@NonNull final OsmandApplication app, Activity activity) { public boolean init(@NonNull final OsmandApplication app, Activity activity) {
OsmandSettings settings = app.getSettings(); OsmandSettings settings = app.getSettings();
CommonPreference<String> pref = settings.getCustomRenderProperty("contourLines"); CommonPreference<String> pref = settings.getCustomRenderProperty("contourLines");
if (pref.get().equals("")) { if (pref.get().isEmpty()) {
for (ApplicationMode m : ApplicationMode.allPossibleValues()) { for (ApplicationMode m : ApplicationMode.allPossibleValues()) {
if (pref.getModeValue(m).equals("")) { if (pref.getModeValue(m).isEmpty()) {
pref.setModeValue(m, "13"); pref.setModeValue(m, "13");
} }
} }

2
OsmAnd/src/net/osmand/plus/views/AddGpxPointBottomSheetHelper.java
View file

@ -86,7 +86,7 @@ public class AddGpxPointBottomSheetHelper implements OnDismissListener {
} }
public void setTitle(String title) { public void setTitle(String title) {
if (title.equals("")) { if (title.isEmpty()) {
if (pointDescription.isWpt()) { if (pointDescription.isWpt()) {
title = mapActivity.getString(R.string.waypoint_one); title = mapActivity.getString(R.string.waypoint_one);
} else if (pointDescription.isRte()) { } else if (pointDescription.isRte()) {