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

fixed nullPointerException and removed current downloading text from contentText

Browse source
This commit is contained in:
Chumva 2018-02-23 18:03:47 +02:00
parent 05b48e899d
commit f29ace4544
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,14 +119,22 @@ public class DownloadIndexesThread {
}
StringBuilder contentText = new StringBuilder();
List<IndexItem> ii = getCurrentDownloadingItems();
for(IndexItem i : ii) {
if(contentText.length() > 0) {
for (IndexItem i : ii) {
if (contentText.length() > 0) {
contentText.append(", ");
}
if (i == currentDownloadingItem) {
continue;
}
contentText.append(i.getVisibleName(app, app.getRegions()));
if (i.getType() != null) {
contentText.append(" ").append(i.getType().getString(app));
}
bld.setContentTitle(msg+" "+currentDownloadingItem.getType().getString(app)).setSmallIcon(android.R.drawable.stat_sys_download)
}
if (currentDownloadingItem != null) {
msg += " " + currentDownloadingItem.getType().getString(app);
}
bld.setContentTitle(msg).setSmallIcon(android.R.drawable.stat_sys_download)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setContentText(contentText.toString())
.setContentIntent(contentPendingIntent).setOngoing(true);