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

Merge pull request #10940 from osmandapp/default_profileName_2

Browse source 
fix empty profile name on main settings screen
This commit is contained in:
Vitaliy 2021-02-21 13:11:17 +02:00 committed by GitHub
commit dd1c4b5311
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/settings/backend/ApplicationMode.java
View file

@ -15,6 +15,8 @@ import net.osmand.plus.profiles.ProfileIconColors;
import net.osmand.plus.routing.RouteProvider.RouteService;
import net.osmand.util.Algorithms;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@ -330,8 +332,12 @@ public class ApplicationMode {
public String toHumanString() {
String userProfileName = getUserProfileName();
if (Algorithms.isEmpty(userProfileName) && keyName != -1) {
return app.getString(keyName);
if (Algorithms.isEmpty(userProfileName)) {
if (keyName != -1) {
return app.getString(keyName);
} else {
return StringUtils.capitalize(getStringKey());
}
} else {
return userProfileName;
}

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

@ -465,7 +465,7 @@ public class ConfigureProfileFragment extends BaseSettingsFragment implements Co
bld.setTitle(R.string.profile_alert_delete_title);
bld.setMessage(String
.format(getString(R.string.profile_alert_delete_msg),
profile.getUserProfileName()));
profile.toHumanString()));
bld.setPositiveButton(R.string.shared_string_delete,
new DialogInterface.OnClickListener() {
@Override