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

Fix formatting

Browse source
This commit is contained in:
Nazar 2020-02-10 15:00:32 +02:00
parent 101589e853
commit 896603a565
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
View file

@ -733,8 +733,7 @@ public class ImportHelper {
} }
} }
private void handleOsmAndSettingsImport(Uri intentUri, String fileName, Bundle extras, boolean askBeforeImport, private void handleOsmAndSettingsImport(Uri intentUri, String fileName, Bundle extras, boolean askBeforeImport, CallbackWithObject<List<SettingsHelper.SettingsItem>> callback) {
CallbackWithObject<List<SettingsHelper.SettingsItem>> callback) {
if (extras != null && extras.containsKey(SettingsHelper.SETTINGS_VERSION_KEY) && extras.containsKey(SettingsHelper.SETTINGS_LATEST_CHANGES_KEY)) { if (extras != null && extras.containsKey(SettingsHelper.SETTINGS_VERSION_KEY) && extras.containsKey(SettingsHelper.SETTINGS_LATEST_CHANGES_KEY)) {
int version = extras.getInt(SettingsHelper.SETTINGS_VERSION_KEY, -1); int version = extras.getInt(SettingsHelper.SETTINGS_VERSION_KEY, -1);
String latestChanges = extras.getString(SettingsHelper.SETTINGS_LATEST_CHANGES_KEY); String latestChanges = extras.getString(SettingsHelper.SETTINGS_LATEST_CHANGES_KEY);

20
OsmAnd/src/net/osmand/plus/profiles/SelectProfileBottomSheetDialogFragment.java
View file

@ -139,16 +139,16 @@ public class SelectProfileBottomSheetDialogFragment extends MenuBottomSheetDialo
items.add(new LongDescriptionItem(getString(R.string.select_nav_profile_dialog_message))); items.add(new LongDescriptionItem(getString(R.string.select_nav_profile_dialog_message)));
for (int i = 0; i < profiles.size(); i++) { for (int i = 0; i < profiles.size(); i++) {
final RoutingProfileDataObject profile = (RoutingProfileDataObject) profiles.get(i); final RoutingProfileDataObject profile = (RoutingProfileDataObject) profiles.get(i);
boolean showBottomDivider = false; boolean showBottomDivider = false;
if (i < profiles.size() - 1) { if (i < profiles.size() - 1) {
RoutingProfileDataObject nextProfile = (RoutingProfileDataObject) profiles.get(i + 1); RoutingProfileDataObject nextProfile = (RoutingProfileDataObject) profiles.get(i + 1);
if (profile.getFileName() == null) { if (profile.getFileName() == null) {
showBottomDivider = nextProfile.getFileName() != null; showBottomDivider = nextProfile.getFileName() != null;
} else { } else {
showBottomDivider = !profile.getFileName().equals(nextProfile.getFileName()); showBottomDivider = !profile.getFileName().equals(nextProfile.getFileName());
} }
} }
addProfileItem(profile, showBottomDivider); addProfileItem(profile, showBottomDivider);
} }
items.add(new DividerItem(app)); items.add(new DividerItem(app));
items.add(new LongDescriptionItem(app.getString(R.string.osmand_routing_promo))); items.add(new LongDescriptionItem(app.getString(R.string.osmand_routing_promo)));