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

Refactor substring and fix NPE

Browse source 
(cherry picked from commit 46f6b79)
This commit is contained in:
PavelRatushny 2017-07-25 12:24:37 +03:00
parent 746f5b89dd
commit 4e1825a994
1 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,6 +137,9 @@ public class SendPoiDialogFragment extends DialogFragment {
private String createDefaultChangeSet() { private String createDefaultChangeSet() {
Map<String, PoiType> allTranslatedSubTypes = getMyApplication().getPoiTypes().getAllTranslatedNames(true); Map<String, PoiType> allTranslatedSubTypes = getMyApplication().getPoiTypes().getAllTranslatedNames(true);
if (allTranslatedSubTypes == null) {
return "";
}
Map<String, Integer> addGroup = new HashMap<>(); Map<String, Integer> addGroup = new HashMap<>();
Map<String, Integer> editGroup = new HashMap<>(); Map<String, Integer> editGroup = new HashMap<>();
Map<String, Integer> deleteGroup = new HashMap<>(); Map<String, Integer> deleteGroup = new HashMap<>();
@ -178,7 +181,6 @@ public class SendPoiDialogFragment extends DialogFragment {
} }
} }
int modifiedItemsOutOfLimit = 0; int modifiedItemsOutOfLimit = 0;
boolean stringModifiedIfExceeded = false;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
String action; String action;
Map<String, Integer> group; Map<String, Integer> group;
@ -205,41 +207,27 @@ public class SendPoiDialogFragment extends DialogFragment {
} }
if (!group.isEmpty()) { if (!group.isEmpty()) {
if (modifiedItemsOutOfLimit == 0) {
comment = comment.concat(action).concat(" ");
}
int pos = 0; int pos = 0;
for (Map.Entry<String, Integer> entry : group.entrySet()) { for (Map.Entry<String, Integer> entry : group.entrySet()) {
String type = entry.getKey(); String type = entry.getKey();
int quantity = entry.getValue(); int quantity = entry.getValue();
if (comment.length() > 200) { if (comment.length() > 200) {
modifiedItemsOutOfLimit += quantity; modifiedItemsOutOfLimit += quantity;
if (!stringModifiedIfExceeded) {
if (pos == 0) {
if (comment.length() - action.length() - 3 >= 0) {
comment = comment.substring(0, comment.length() - action.length() - 3).concat("; ");
} else {
comment = comment.substring(0, comment.length() - action.length() - 1).concat("; ");
}
} else {
comment = comment.substring(0, comment.length() - 2).concat("; ");
}
stringModifiedIfExceeded = true;
}
} else { } else {
comment = comment.concat(quantity == 1 ? "" : quantity + " ").concat(type + ", "); if (pos == 0) {
comment = comment.concat(comment.length() == 0 ? "" : "; ").concat(action).concat(" ").concat(quantity == 1 ? "" : quantity + "").concat(type);
} else {
comment = comment.concat(", ").concat(quantity == 1 ? "" : quantity + "").concat(type);
}
} }
pos++; pos++;
} }
if (modifiedItemsOutOfLimit == 0) {
comment = comment.substring(0, comment.length() - 2).concat("; ");
}
} }
} }
if (modifiedItemsOutOfLimit != 0) { if (modifiedItemsOutOfLimit != 0) {
comment = comment.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.equals("")){
comment = comment.substring(0, comment.length() - 2).concat("."); comment = comment.concat(".");
} }
return comment; return comment;
} }