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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-01-02 00:26:55 +01:00
commit 03d4173131
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java
View file

@ -37,7 +37,11 @@ public abstract class MenuTitleController {
public abstract MenuController getMenuController(); public abstract MenuController getMenuController();
public String getTitleStr() { public String getTitleStr() {
return nameStr; if (Algorithms.isEmpty(nameStr) && searchingAddress) {
return addressNotKnownStr;
} else {
return nameStr;
}
} }
public int getLeftIconId() { public int getLeftIconId() {
@ -85,8 +89,6 @@ public abstract class MenuTitleController {
acquireNameAndType(); acquireNameAndType();
if (needStreetName()) { if (needStreetName()) {
acquireStreetName(); acquireStreetName();
} else if (nameStr.equals(addressNotKnownStr)) {
nameStr = "";
} }
} }
@ -127,13 +129,8 @@ public abstract class MenuTitleController {
} }
if (Algorithms.isEmpty(nameStr)) { if (Algorithms.isEmpty(nameStr)) {
if (!Algorithms.isEmpty(typeStr)) { nameStr = typeStr;
nameStr = typeStr; typeStr = commonTypeStr;
typeStr = commonTypeStr;
} else {
nameStr = addressNotKnownStr;
typeStr = commonTypeStr;
}
} else if (Algorithms.isEmpty(typeStr)) { } else if (Algorithms.isEmpty(typeStr)) {
typeStr = commonTypeStr; typeStr = commonTypeStr;
} }