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

Fix #3750

Browse source
This commit is contained in:
PavelRatushny 2017-05-23 14:09:06 +03:00
parent 4f22f23a35
commit 3af82c0c47
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
View file

@ -437,15 +437,6 @@ public class DownloadIndexesThread {
} else { } else {
dbHelper.update(entry, DatabaseHelper.DOWNLOAD_ENTRY); dbHelper.update(entry, DatabaseHelper.DOWNLOAD_ENTRY);
} }
} else if (o instanceof String) {
String message = (String) o;
// ctx.getString(R.string.shared_string_io_error) +": Interrupted";
if (!message.toLowerCase().contains("interrupted")) {
if (uiActivity == null ||
!message.equals(app.getString(R.string.shared_string_download_successful))) {
app.showToastMessage(message);
}
}
} }
} }
downloadInProgress(); downloadInProgress();

12
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -677,12 +677,14 @@ public class RoutingHelper {
} }
} }
if (showToast.value) { if (showToast.value) {
String msg = app.getString(R.string.new_route_calculated_dist) + ": " if (OsmandPlugin.isDevelopment()) {
+ OsmAndFormatter.getFormattedDistance(res.getWholeDistance(), app); String msg = app.getString(R.string.new_route_calculated_dist) + ": "
if (OsmandPlugin.isDevelopment() && res.getRoutingTime() != 0f) { + OsmAndFormatter.getFormattedDistance(res.getWholeDistance(), app);
msg += " (" + Algorithms.formatDuration((int) res.getRoutingTime(), app.accessibilityEnabled()) + ")"; if (res.getRoutingTime() != 0f) {
msg += " (" + Algorithms.formatDuration((int) res.getRoutingTime(), app.accessibilityEnabled()) + ")";
}
app.showToastMessage(msg);
} }
app.showToastMessage(msg);
} }
} }
}); });