From 99e8409e3739dfb7bb4b23f70ce516e268e77623 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Wed, 19 Nov 2014 13:28:11 +0200
Subject: [PATCH] Added region name in Updates tab in DownloadActivity

---
 .../osmand/plus/download/DownloadActivity.java  | 17 +++++++++++++++++
 .../plus/download/LocalIndexesFragment.java     |  5 +++--
 .../plus/download/UpdatesIndexFragment.java     |  3 ++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 3f0e10aada..7c2cfda727 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -18,6 +18,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Window;
 import net.osmand.IndexConstants;
 import net.osmand.access.AccessibleAlertBuilder;
+import net.osmand.map.OsmandRegions;
 import net.osmand.plus.*;
 import net.osmand.plus.activities.FavouritesActivity;
 import net.osmand.plus.activities.LocalIndexInfo;
@@ -596,4 +597,20 @@ public class DownloadActivity extends SherlockFragmentActivity {
 		}
 	}
 
+	public static String getFullName(IndexItem e, OsmandApplication app, OsmandRegions osmandRegions) {
+		String eName;
+		List<IndexItem> forCat = new ArrayList<IndexItem>();
+		forCat.add(e);
+		List<IndexItemCategory> category = IndexItemCategory.categorizeIndexItems(app, forCat);
+		if (category.size() != 0){
+			eName = e.getVisibleDescription(app) + "\n"
+					+ category.get(0).name + " "
+					+ e.getVisibleName(app, osmandRegions);
+		} else {
+			eName = e.getVisibleDescription(app) + "\n"
+					+ e.getVisibleName(app, osmandRegions);
+		}
+		return eName;
+	}
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
index 19ebdb4e53..3c2577d861 100644
--- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
@@ -961,8 +961,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 
 		private String getNameToDisplay(LocalIndexInfo child) {
 			String mapDescr = getMapDescription(child.getFileName());
-			String mapName = FileNameTranslationHelper.getFileName(ctx, ((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(), child.getFileName());
-
+			String mapName = FileNameTranslationHelper.getFileName(ctx,
+					((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(),
+					child.getFileName());
 			if (mapDescr.length() > 0){
 				 return mapDescr + " - " + mapName;
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
index 3a123d86af..02d35716fc 100644
--- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
@@ -202,7 +202,8 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 			TextView name = (TextView) v.findViewById(R.id.download_item);
 			TextView description = (TextView) v.findViewById(R.id.download_descr);
 			IndexItem e = items.get(position);
-			String eName = e.getVisibleDescription(getMyApplication()) + "\n" + e.getVisibleName(getMyApplication(), osmandRegions);
+			String eName = DownloadActivity.getFullName(e, getMyApplication(), osmandRegions);
+
 			name.setText(eName.trim()); //$NON-NLS-1$
 			String d = e.getDate(format) + "\n" + e.getSizeDescription(getMyApplication());
 			description.setText(d);