From 1b2640dd539e01ffd0541d31ded99bc51ad6164b Mon Sep 17 00:00:00 2001
From: Victor <osmand.app@gmail.com>
Date: Sat, 7 May 2011 13:12:58 +0200
Subject: [PATCH 1/9] Initial

---
 OsmAnd/res/layout/local_index.xml             |  20 ++
 OsmAnd/res/layout/local_index_list_item.xml   |  15 +
 .../plus/activities/LocalIndexesActivity.java | 329 ++++++++++++++++++
 .../plus/activities/SettingsActivity.java     |   5 +-
 4 files changed, 368 insertions(+), 1 deletion(-)
 create mode 100644 OsmAnd/res/layout/local_index.xml
 create mode 100644 OsmAnd/res/layout/local_index_list_item.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java

diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
new file mode 100644
index 0000000000..b19bc6194c
--- /dev/null
+++ b/OsmAnd/res/layout/local_index.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent" android:orientation="vertical">
+  
+<TextView android:id="@+id/Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/select_index_file_to_download"></TextView>
+
+<EditText android:id="@+id/search_box" 
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/download_type_to_filter"
+        android:inputType="text"
+        android:layout_marginLeft="3dp" android:layout_marginRight="3dp"
+        android:maxLines="1"/>
+<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" 
+		android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" ></ListView>
+<Button android:id="@+id/DownloadButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/download_files"
+		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
+</LinearLayout>
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
new file mode 100644
index 0000000000..88f720b40c
--- /dev/null
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
+	android:layout_height="wrap_content">
+
+	<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent">
+		<CheckBox android:id="@+id/check_download_item" android:layout_width="wrap_content" android:layout_height="wrap_content"
+			android:gravity="center_vertical" android:focusable="false" />
+	</LinearLayout>
+	<TextView android:id="@+id/download_item" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+		android:maxLines="7" android:layout_weight="1" android:textSize="16sp"></TextView>
+
+	<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="105dp"
+		android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
+
+</LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
new file mode 100644
index 0000000000..b22f73a2b2
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
@@ -0,0 +1,329 @@
+package net.osmand.plus.activities;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.MessageFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import android.app.AlertDialog;
+import android.app.ListActivity;
+import android.app.ProgressDialog;
+import android.app.AlertDialog.Builder;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.ArrayAdapter;
+import android.widget.Filterable;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class LocalIndexesActivity extends ListActivity {
+
+	private static ContributionVersionActivityThread thread = new ContributionVersionActivityThread();
+	private static final int DOWNLOAD_BUILDS_LIST = 1;
+	private static final int INSTALL_BUILD = 2;
+	private static final int ACTIVITY_TO_INSTALL = 23;
+	
+	private static final String URL_TO_RETRIEVE_BUILDS = "http://download.osmand.net/builds.php";
+	private static final String URL_GET_BUILD = "http://download.osmand.net/";
+	private static final String CONTRIBUTION_INSTALL_APP_DATE = "CONTRIBUTION_INSTALL_APP_DATE";
+	
+	private ProgressDialog progressDlg;
+	private Date currentInstalledDate;
+	
+	private List<OsmAndBuild> downloadedBuilds = new ArrayList<OsmAndBuild>();
+	private SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy");
+	private File pathToDownload = new File(Environment.getExternalStorageDirectory(), ResourceManager.APP_DIR + "osmandToInstall.apk");
+	private OsmAndBuild currentSelectedBuild = null;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		setContentView(R.layout.download_builds);
+		
+		String installDate = OsmandSettings.getPrefs(this).getString(CONTRIBUTION_INSTALL_APP_DATE, null);
+		if(installDate != null){
+			try {
+				currentInstalledDate = dateFormat.parse(installDate);
+			} catch (ParseException e) {
+			}
+		}
+		
+		downloadedBuilds.clear();
+		startThreadOperation(DOWNLOAD_BUILDS_LIST, getString(R.string.loading_builds), -1);
+	}
+
+	private void startThreadOperation(int operationId, String message, int total) {
+		
+		progressDlg = new ProgressDialog(this);
+		progressDlg.setTitle(getString(R.string.loading));
+		progressDlg.setMessage(message);
+		if(total != -1){
+			progressDlg.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+			progressDlg.setMax(total);
+			progressDlg.setProgress(0);
+		} else {
+			progressDlg.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+		}
+		progressDlg.show();
+//		progressFileDlg.setCancelable(false);
+		if(thread.getState() == Thread.State.TERMINATED || thread.getOperationId() != operationId){
+			thread = new ContributionVersionActivityThread();
+			thread.setOperationId(operationId);
+		}
+		thread.setActivity(this);
+		if(thread.getState() == Thread.State.NEW){
+			thread.start();
+		}
+	}
+	
+	protected void endThreadOperation(int operationId, Exception e){
+		if(progressDlg != null){
+			progressDlg.dismiss();
+			progressDlg = null;
+		}
+		if(operationId == DOWNLOAD_BUILDS_LIST){
+			if(e != null){
+				Toast.makeText(this, getString(R.string.loading_builds_failed) + " : " + e.getMessage(), Toast.LENGTH_LONG).show();
+				finish();
+			} else {
+				setListAdapter(new OsmandBuildsAdapter(downloadedBuilds));
+			}
+		} else if(operationId == INSTALL_BUILD){
+			if(currentSelectedBuild != null){
+				Intent intent = new Intent(Intent.ACTION_VIEW);
+	            intent.setDataAndType(Uri.fromFile(pathToDownload), "application/vnd.android.package-archive");
+	            startActivityForResult(intent, ACTIVITY_TO_INSTALL);
+	            updateInstalledApp(false, currentSelectedBuild.date);
+			}
+		}
+	}
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if(ACTIVITY_TO_INSTALL == requestCode && resultCode != RESULT_OK){
+			updateInstalledApp(false, currentInstalledDate);
+		}
+	}
+
+	private void updateInstalledApp(boolean showMessage, Date d) {
+		if (showMessage) {
+			Toast.makeText(
+					this,
+					MessageFormat.format(getString(R.string.build_installed), currentSelectedBuild.tag, dateFormat
+							.format(currentSelectedBuild.date)), Toast.LENGTH_LONG).show();
+		}
+		OsmandSettings.getPrefs(this).edit().putString(CONTRIBUTION_INSTALL_APP_DATE, dateFormat.format(d))
+				.commit();
+	}
+	
+	protected void executeThreadOperation(int operationId) throws Exception {
+		if(operationId == DOWNLOAD_BUILDS_LIST){
+			URLConnection connection = new URL(URL_TO_RETRIEVE_BUILDS).openConnection();
+			XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
+			parser.setInput(connection.getInputStream(), "UTF-8");
+			int next;
+			while((next = parser.next()) != XmlPullParser.END_DOCUMENT) {
+				if(next == XmlPullParser.START_TAG && parser.getName().equals("build")) { //$NON-NLS-1$
+					if ("osmand".equalsIgnoreCase(parser.getAttributeValue(null, "type"))) {
+
+						String path = parser.getAttributeValue(null, "path"); //$NON-NLS-1$
+						String size = parser.getAttributeValue(null, "size"); //$NON-NLS-1$
+						String date = parser.getAttributeValue(null, "date"); //$NON-NLS-1$
+						String tag = parser.getAttributeValue(null, "tag"); //$NON-NLS-1$
+						Date d = null;
+						if (date != null) {
+							try {
+								d = dateFormat.parse(date);
+							} catch (ParseException e) {
+							}
+						}
+						OsmAndBuild build = new OsmAndBuild(path, size, d, tag);
+						downloadedBuilds.add(build);
+					}
+				}
+			}
+		} else if(operationId == INSTALL_BUILD){
+			URLConnection connection = new URL(URL_GET_BUILD + currentSelectedBuild.path).openConnection();
+			if(pathToDownload.exists()){
+				pathToDownload.delete();
+			}
+			byte[] buffer = new byte[1024];
+			InputStream is = connection.getInputStream();
+			FileOutputStream fout = new FileOutputStream(pathToDownload);
+			try {
+				int totalRead = 0;
+				int read;
+				while((read = is.read(buffer, 0, 1024)) != -1){
+					fout.write(buffer, 0, read);
+					totalRead += read;
+					if(totalRead > 1024){
+						progressDlg.incrementProgressBy(totalRead / 1024);
+						totalRead %= 1024;
+					}
+				}
+			} finally {
+				fout.close();
+				is.close();
+			}
+		}
+		
+	}
+	
+	@Override
+	protected void onListItemClick(ListView l, View v, int position, long id) {
+		super.onListItemClick(l, v, position, id);
+		final OsmAndBuild item = (OsmAndBuild) getListAdapter().getItem(position);
+		Builder builder = new AlertDialog.Builder(this);
+		builder.setMessage(MessageFormat.format(getString(R.string.install_selected_build), item.tag, dateFormat.format(item.date), item.size));
+		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+			
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				currentSelectedBuild = item;
+				int kb = (int) (Double.parseDouble(item.size) * 1024);
+				startThreadOperation(INSTALL_BUILD, getString(R.string.downloading_build), kb);
+			}
+		});
+		
+		builder.setNegativeButton(R.string.default_buttons_no, null);
+		builder.show();
+		
+	}
+	
+	@Override
+	public OsmandBuildsAdapter getListAdapter() {
+		return (OsmandBuildsAdapter) super.getListAdapter();
+	}
+	
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		thread.setActivity(null);
+		if(progressDlg != null){
+			progressDlg.dismiss();
+			progressDlg = null;
+		}
+	}
+	
+	
+	protected class OsmandBuildsAdapter extends ArrayAdapter<OsmAndBuild> implements Filterable {
+		
+
+		public OsmandBuildsAdapter(List<OsmAndBuild> builds) {
+			super(LocalIndexesActivity.this, R.layout.download_build_list_item, builds);
+		}
+
+		@Override
+		public View getView(final int position, View convertView, ViewGroup parent) {
+			View v = convertView;
+			if (v == null) {
+				LayoutInflater inflater = getLayoutInflater();
+				v = inflater.inflate(net.osmand.plus.R.layout.download_build_list_item, parent, false);
+			}
+			final View row = v;
+			OsmAndBuild build = getItem(position);
+			TextView tagView = (TextView) row.findViewById(R.id.download_tag);
+			tagView.setText(build.tag);
+			
+			TextView description = (TextView) row.findViewById(R.id.download_descr);
+			StringBuilder format = new StringBuilder();
+			format.append(dateFormat.format(build.date))/*.append(" : ").append(build.size).append(" MB")*/;
+			description.setText(format.toString());
+
+			if(currentInstalledDate != null){
+				if(currentInstalledDate.before(build.date)){
+					tagView.setTextColor(Color.GREEN);
+				} else {
+					tagView.setTextColor(Color.BLUE);
+				}
+			} else {
+				tagView.setTextColor(Color.WHITE);
+			}
+			return row;
+		}
+		
+	}
+	
+	
+	private static class ContributionVersionActivityThread extends Thread {
+		private LocalIndexesActivity activity;
+		private int operationId;
+		
+		public void setActivity(LocalIndexesActivity activity) {
+			this.activity = activity;
+		}
+		
+		public int getOperationId() {
+			return operationId;
+		}
+		
+		public void setOperationId(int operationId) {
+			this.operationId = operationId;
+		}
+
+		@Override
+		public void run() {
+			Exception ex= null;
+			try {
+				if(this.activity != null){
+					this.activity.executeThreadOperation(operationId);
+				}
+			} catch (Exception e) {
+				ex = e;
+			}
+			final Exception e = ex;
+			if(this.activity != null){
+				this.activity.runOnUiThread(new Runnable() {
+					@Override
+					public void run() {
+						activity.endThreadOperation(operationId, e);
+					}
+				});
+			}
+		}
+	}
+	
+	private static class OsmAndBuild {
+		public String path;
+		public String size;
+		public Date date;
+		public String tag;
+		
+		public OsmAndBuild(String path, String size, Date date, String tag) {
+			super();
+			this.path = path;
+			this.size = size;
+			this.date = date;
+			this.tag = tag;
+		}
+		
+		
+	}
+
+}
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index 188fa86254..50a9c3247e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -641,7 +641,10 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 			startActivity(new Intent(this, DownloadIndexActivity.class));
 			return true;
 		} else if(preference == reloadIndexes){
-			reloadIndexes();
+			// TODO refactor
+			Intent intent = new Intent(this, LocalIndexesActivity.class);
+			startActivity(intent);
+			// reloadIndexes();
 			return true;
 		} else if(preference == saveCurrentTrack){
 			SavingTrackHelper helper = new SavingTrackHelper(this);

From a6e10bdc9bf1f41c0e814e951eb59aa301e09fa0 Mon Sep 17 00:00:00 2001
From: Victor <osmand.app@gmail.com>
Date: Sun, 8 May 2011 10:27:10 +0200
Subject: [PATCH 2/9] Draft implementation of local indexes view

---
 OsmAnd/AndroidManifest.xml                    |   1 +
 OsmAnd/res/layout/local_index.xml             |  17 +-
 OsmAnd/res/layout/local_index_list_item.xml   |   6 +-
 OsmAnd/res/values/strings.xml                 |   3 +-
 OsmAnd/res/xml/settings_pref.xml              |   1 +
 .../src/net/osmand/plus/OsmandSettings.java   |   1 +
 .../src/net/osmand/plus/ResourceManager.java  |   1 +
 .../plus/activities/LocalIndexHelper.java     | 130 ++++++++
 .../plus/activities/LocalIndexesActivity.java | 289 +++---------------
 .../plus/activities/SettingsActivity.java     |  20 +-
 .../plus/voice/TTSCommandPlayerImpl.java      |   2 +-
 11 files changed, 194 insertions(+), 277 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java

diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 5350b6a8db..0db446109b 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -48,6 +48,7 @@
 			<data android:scheme="geo"></data>
 			</intent-filter>
 		</activity>
+		<activity android:name=".activities.LocalIndexesActivity"></activity>
 		<service android:process="net.osmand.plus" android:label="@string/process_navigation_service" android:name=".NavigationService">
 			<intent-filter><action android:name="net.osmand.plus.NavigationService"></action></intent-filter>
 		</service>
diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index b19bc6194c..b7d53fb2e2 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -4,17 +4,12 @@
   android:layout_width="fill_parent"
   android:layout_height="fill_parent" android:orientation="vertical">
   
-<TextView android:id="@+id/Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/select_index_file_to_download"></TextView>
-
-<EditText android:id="@+id/search_box" 
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/download_type_to_filter"
-        android:inputType="text"
-        android:layout_marginLeft="3dp" android:layout_marginRight="3dp"
-        android:maxLines="1"/>
-<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" 
-		android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" ></ListView>
+<TextView android:id="@+id/Label" android:layout_width="fill_parent" android:layout_height="wrap_content" 
+	android:gravity="center" android:text="@string/select_index_file_to_download"></TextView>
 <Button android:id="@+id/DownloadButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/download_files"
 		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
+
+<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" 
+		android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" ></ListView>
+
 </LinearLayout>
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 88f720b40c..23c3448f94 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -3,13 +3,13 @@
 	android:layout_height="wrap_content">
 
 	<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent">
-		<CheckBox android:id="@+id/check_download_item" android:layout_width="wrap_content" android:layout_height="wrap_content"
+		<CheckBox android:id="@+id/check_local_index" android:layout_width="wrap_content" android:layout_height="wrap_content"
 			android:gravity="center_vertical" android:focusable="false" />
 	</LinearLayout>
-	<TextView android:id="@+id/download_item" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+	<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
 		android:maxLines="7" android:layout_weight="1" android:textSize="16sp"></TextView>
 
-	<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="105dp"
+	<TextView android:id="@+id/local_index_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="105dp"
 		android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
 
 </LinearLayout>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index a231da1c4b..ded9c48256 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+	<string name="local_indexes_view">View data</string>
+	<string name="local_indexes_view_descr">View currently installed offline data</string>
 	<string name="ttsvoice">TTS Voice</string>
-	
 	<string name="search_offline_clear_search">New Search</string>
 	<string name="map_text_size_descr">Select text size for names on the map</string>
 	<string name="map_text_size">Text size</string>
diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml
index 6d44529d50..7a8e2fad63 100644
--- a/OsmAnd/res/xml/settings_pref.xml
+++ b/OsmAnd/res/xml/settings_pref.xml
@@ -33,6 +33,7 @@
 	<PreferenceScreen android:key="index_settings" android:title="@string/index_settings" android:summary="@string/index_settings_descr">
 		<Preference android:title="@string/reload_indexes" android:key="reload_indexes" android:summary="@string/reload_indexes_descr"></Preference>
 		<Preference android:title="@string/download_indexes" android:key="download_indexes" android:summary="@string/download_indexes_descr"></Preference>
+		<Preference android:title="@string/local_indexes_view" android:key="local_indexes" android:summary="@string/local_indexes_view_descr"></Preference>
 	</PreferenceScreen>
 
 
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index dd99bb6b4d..5342271fee 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -453,6 +453,7 @@ public class OsmandSettings {
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SAVE_CURRENT_TRACK = "save_current_track"; //$NON-NLS-1$
 	public static final String RELOAD_INDEXES = "reload_indexes"; //$NON-NLS-1$
+	public static final String LOCAL_INDEXES = "local_indexes"; //$NON-NLS-1$
 	public static final String DOWNLOAD_INDEXES = "download_indexes"; //$NON-NLS-1$
 
 	// this value string is synchronized with settings_pref.xml preference name
diff --git a/OsmAnd/src/net/osmand/plus/ResourceManager.java b/OsmAnd/src/net/osmand/plus/ResourceManager.java
index dbd4833a38..ae2ec11d5a 100644
--- a/OsmAnd/src/net/osmand/plus/ResourceManager.java
+++ b/OsmAnd/src/net/osmand/plus/ResourceManager.java
@@ -61,6 +61,7 @@ public class ResourceManager {
 	public static final String POI_PATH = APP_DIR + IndexConstants.POI_INDEX_DIR; 
 	public static final String VOICE_PATH = APP_DIR + IndexConstants.VOICE_INDEX_DIR;
 	public static final String MAPS_PATH = APP_DIR;
+	public static final String BACKUP_PATH = APP_DIR + "backup/";
 	public static final String TILES_PATH = APP_DIR+"tiles/"; //$NON-NLS-1$
 	public static final String TEMP_SOURCE_TO_LOAD = "temp"; //$NON-NLS-1$
 	public static final String VECTOR_MAP = "#vector_map"; //$NON-NLS-1$
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
new file mode 100644
index 0000000000..61ca187bca
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
@@ -0,0 +1,130 @@
+package net.osmand.plus.activities;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import android.os.Build;
+
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.ResourceManager;
+import net.osmand.plus.voice.MediaCommandPlayerImpl;
+import net.osmand.plus.voice.TTSCommandPlayerImpl;
+
+public class LocalIndexHelper {
+		
+	private final OsmandApplication app;
+
+	public LocalIndexHelper(OsmandApplication app){
+		this.app = app;
+	}
+	
+	public List<LocalIndexInfo> getAllLocalIndexData(){
+		return getLocalIndexData(null);
+	}
+	
+	public List<LocalIndexInfo> getLocalIndexData(LocalIndexType type){
+		OsmandSettings settings = OsmandSettings.getOsmandSettings(app.getApplicationContext());
+		List<LocalIndexInfo> result = new ArrayList<LocalIndexInfo>();
+		
+		loadVoiceData(settings.extendOsmandPath(ResourceManager.VOICE_PATH), result, false);
+		loadVoiceData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true);
+		
+		return result;
+	}
+	
+	
+	private void loadVoiceData(File voiceDir, List<LocalIndexInfo> result, boolean backup) {
+		if (voiceDir.canRead()) {
+			for (File voiceF : voiceDir.listFiles()) {
+				if (voiceF.isDirectory()) {
+					LocalIndexInfo info = null;
+					if (MediaCommandPlayerImpl.isMyData(voiceF)) {
+						info = new LocalIndexInfo(LocalIndexType.VOICE_DATA, voiceF, backup);
+					} else if (Integer.parseInt(Build.VERSION.SDK) >= 4) {
+						if (TTSCommandPlayerImpl.isMyData(voiceF)) {
+							info = new LocalIndexInfo(LocalIndexType.TTS_VOICE_DATA, voiceF, backup);
+						}
+					}
+					if(info != null){
+						result.add(info);
+					}
+				}
+			}
+		}
+	}
+
+
+	public enum LocalIndexType {
+		VOICE_DATA,
+		TTS_VOICE_DATA,
+		TILES_DATA,
+		GPX_DATA,
+		MAP_DATA,
+		;
+	}
+	
+	public static class LocalIndexInfo {
+		
+		private LocalIndexType type;
+		private String description;
+		private String name;
+		
+		private boolean backupedData;
+		private boolean corrupted = false;
+		private boolean loaded;
+		private String pathToData;
+		private boolean singleFile;
+		
+		private LocalIndexInfo(LocalIndexType type, File f, boolean backuped){
+			pathToData = f.getAbsolutePath();
+			name = f.getName();
+			this.type = type;
+			singleFile = !f.isDirectory();
+			this.loaded = backuped;
+		}
+		
+		public void setCorrupted(boolean corrupted) {
+			this.corrupted = corrupted;
+			if(corrupted){
+				this.loaded = false;
+			}
+		}
+		
+		
+		public String getName() {
+			return name;
+		}
+		
+		public LocalIndexType getType() {
+			return type;
+		}
+
+		public boolean isSingleFile() {
+			return singleFile;
+		}
+		
+		public boolean isLoaded() {
+			return loaded;
+		}
+		
+		public boolean isCorrupted() {
+			return corrupted;
+		}
+		
+		public boolean isBackupedData() {
+			return backupedData;
+		}
+		
+		public String getPathToData() {
+			return pathToData;
+		}
+		
+		public String getDescription() {
+			return description;
+		}
+		
+	}
+
+
+}
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
index b22f73a2b2..5a45366df4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
@@ -1,34 +1,14 @@
 package net.osmand.plus.activities;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.text.MessageFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
-import net.osmand.plus.ResourceManager;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserFactory;
-
-import android.app.AlertDialog;
+import net.osmand.plus.activities.LocalIndexHelper.LocalIndexInfo;
+import android.app.Activity;
 import android.app.ListActivity;
 import android.app.ProgressDialog;
-import android.app.AlertDialog.Builder;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.Color;
-import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Environment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -37,206 +17,70 @@ import android.widget.ArrayAdapter;
 import android.widget.Filterable;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 public class LocalIndexesActivity extends ListActivity {
 
-	private static ContributionVersionActivityThread thread = new ContributionVersionActivityThread();
-	private static final int DOWNLOAD_BUILDS_LIST = 1;
-	private static final int INSTALL_BUILD = 2;
-	private static final int ACTIVITY_TO_INSTALL = 23;
-	
-	private static final String URL_TO_RETRIEVE_BUILDS = "http://download.osmand.net/builds.php";
-	private static final String URL_GET_BUILD = "http://download.osmand.net/";
-	private static final String CONTRIBUTION_INSTALL_APP_DATE = "CONTRIBUTION_INSTALL_APP_DATE";
-	
 	private ProgressDialog progressDlg;
-	private Date currentInstalledDate;
-	
-	private List<OsmAndBuild> downloadedBuilds = new ArrayList<OsmAndBuild>();
-	private SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy");
-	private File pathToDownload = new File(Environment.getExternalStorageDirectory(), ResourceManager.APP_DIR + "osmandToInstall.apk");
-	private OsmAndBuild currentSelectedBuild = null;
+	private AsyncTask<Activity, ProgressDialog, List<LocalIndexInfo>> asyncLoader;
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		setContentView(R.layout.download_builds);
-		
-		String installDate = OsmandSettings.getPrefs(this).getString(CONTRIBUTION_INSTALL_APP_DATE, null);
-		if(installDate != null){
-			try {
-				currentInstalledDate = dateFormat.parse(installDate);
-			} catch (ParseException e) {
-			}
-		}
-		
-		downloadedBuilds.clear();
-		startThreadOperation(DOWNLOAD_BUILDS_LIST, getString(R.string.loading_builds), -1);
-	}
+		setContentView(R.layout.local_index);
 
-	private void startThreadOperation(int operationId, String message, int total) {
-		
 		progressDlg = new ProgressDialog(this);
 		progressDlg.setTitle(getString(R.string.loading));
-		progressDlg.setMessage(message);
-		if(total != -1){
-			progressDlg.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-			progressDlg.setMax(total);
-			progressDlg.setProgress(0);
-		} else {
-			progressDlg.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-		}
-		progressDlg.show();
-//		progressFileDlg.setCancelable(false);
-		if(thread.getState() == Thread.State.TERMINATED || thread.getOperationId() != operationId){
-			thread = new ContributionVersionActivityThread();
-			thread.setOperationId(operationId);
-		}
-		thread.setActivity(this);
-		if(thread.getState() == Thread.State.NEW){
-			thread.start();
-		}
+		progressDlg.setMessage(getString(R.string.loading));
+		LoadLocalIndexTask task = new LoadLocalIndexTask();
+		asyncLoader = task.execute(this);
 	}
 	
-	protected void endThreadOperation(int operationId, Exception e){
-		if(progressDlg != null){
-			progressDlg.dismiss();
-			progressDlg = null;
-		}
-		if(operationId == DOWNLOAD_BUILDS_LIST){
-			if(e != null){
-				Toast.makeText(this, getString(R.string.loading_builds_failed) + " : " + e.getMessage(), Toast.LENGTH_LONG).show();
-				finish();
-			} else {
-				setListAdapter(new OsmandBuildsAdapter(downloadedBuilds));
-			}
-		} else if(operationId == INSTALL_BUILD){
-			if(currentSelectedBuild != null){
-				Intent intent = new Intent(Intent.ACTION_VIEW);
-	            intent.setDataAndType(Uri.fromFile(pathToDownload), "application/vnd.android.package-archive");
-	            startActivityForResult(intent, ACTIVITY_TO_INSTALL);
-	            updateInstalledApp(false, currentSelectedBuild.date);
-			}
-		}
-	}
-	
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if(ACTIVITY_TO_INSTALL == requestCode && resultCode != RESULT_OK){
-			updateInstalledApp(false, currentInstalledDate);
-		}
-	}
+	private class LoadLocalIndexTask extends AsyncTask<Activity, ProgressDialog, List<LocalIndexInfo>> {
 
-	private void updateInstalledApp(boolean showMessage, Date d) {
-		if (showMessage) {
-			Toast.makeText(
-					this,
-					MessageFormat.format(getString(R.string.build_installed), currentSelectedBuild.tag, dateFormat
-							.format(currentSelectedBuild.date)), Toast.LENGTH_LONG).show();
+		@Override
+		protected List<LocalIndexInfo> doInBackground(Activity... params) {
+			LocalIndexHelper helper = new LocalIndexHelper((OsmandApplication) params[0].getApplication());
+			return helper.getAllLocalIndexData();
 		}
-		OsmandSettings.getPrefs(this).edit().putString(CONTRIBUTION_INSTALL_APP_DATE, dateFormat.format(d))
-				.commit();
-	}
-	
-	protected void executeThreadOperation(int operationId) throws Exception {
-		if(operationId == DOWNLOAD_BUILDS_LIST){
-			URLConnection connection = new URL(URL_TO_RETRIEVE_BUILDS).openConnection();
-			XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-			parser.setInput(connection.getInputStream(), "UTF-8");
-			int next;
-			while((next = parser.next()) != XmlPullParser.END_DOCUMENT) {
-				if(next == XmlPullParser.START_TAG && parser.getName().equals("build")) { //$NON-NLS-1$
-					if ("osmand".equalsIgnoreCase(parser.getAttributeValue(null, "type"))) {
-
-						String path = parser.getAttributeValue(null, "path"); //$NON-NLS-1$
-						String size = parser.getAttributeValue(null, "size"); //$NON-NLS-1$
-						String date = parser.getAttributeValue(null, "date"); //$NON-NLS-1$
-						String tag = parser.getAttributeValue(null, "tag"); //$NON-NLS-1$
-						Date d = null;
-						if (date != null) {
-							try {
-								d = dateFormat.parse(date);
-							} catch (ParseException e) {
-							}
-						}
-						OsmAndBuild build = new OsmAndBuild(path, size, d, tag);
-						downloadedBuilds.add(build);
-					}
-				}
-			}
-		} else if(operationId == INSTALL_BUILD){
-			URLConnection connection = new URL(URL_GET_BUILD + currentSelectedBuild.path).openConnection();
-			if(pathToDownload.exists()){
-				pathToDownload.delete();
-			}
-			byte[] buffer = new byte[1024];
-			InputStream is = connection.getInputStream();
-			FileOutputStream fout = new FileOutputStream(pathToDownload);
-			try {
-				int totalRead = 0;
-				int read;
-				while((read = is.read(buffer, 0, 1024)) != -1){
-					fout.write(buffer, 0, read);
-					totalRead += read;
-					if(totalRead > 1024){
-						progressDlg.incrementProgressBy(totalRead / 1024);
-						totalRead %= 1024;
-					}
-				}
-			} finally {
-				fout.close();
-				is.close();
-			}
+		
+		@Override
+		protected void onPostExecute(List<LocalIndexInfo> result) {
+			setListAdapter(new LocalIndexesAdapter(result));
 		}
 		
 	}
 	
+	
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
-		final OsmAndBuild item = (OsmAndBuild) getListAdapter().getItem(position);
-		Builder builder = new AlertDialog.Builder(this);
-		builder.setMessage(MessageFormat.format(getString(R.string.install_selected_build), item.tag, dateFormat.format(item.date), item.size));
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
-			
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				currentSelectedBuild = item;
-				int kb = (int) (Double.parseDouble(item.size) * 1024);
-				startThreadOperation(INSTALL_BUILD, getString(R.string.downloading_build), kb);
-			}
-		});
-		
-		builder.setNegativeButton(R.string.default_buttons_no, null);
-		builder.show();
+		final LocalIndexInfo item = (LocalIndexInfo) getListAdapter().getItem(position);
 		
 	}
 	
 	@Override
-	public OsmandBuildsAdapter getListAdapter() {
-		return (OsmandBuildsAdapter) super.getListAdapter();
+	public LocalIndexesAdapter getListAdapter() {
+		return (LocalIndexesAdapter) super.getListAdapter();
 	}
 	
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		thread.setActivity(null);
 		if(progressDlg != null){
 			progressDlg.dismiss();
 			progressDlg = null;
+			asyncLoader.cancel(true);
 		}
 	}
 	
 	
-	protected class OsmandBuildsAdapter extends ArrayAdapter<OsmAndBuild> implements Filterable {
+	protected class LocalIndexesAdapter extends ArrayAdapter<LocalIndexInfo> implements Filterable {
 		
 
-		public OsmandBuildsAdapter(List<OsmAndBuild> builds) {
-			super(LocalIndexesActivity.this, R.layout.download_build_list_item, builds);
+		public LocalIndexesAdapter(List<LocalIndexInfo> builds) {
+			super(LocalIndexesActivity.this, R.layout.local_index_list_item, builds);
 		}
 
 		@Override
@@ -244,86 +88,29 @@ public class LocalIndexesActivity extends ListActivity {
 			View v = convertView;
 			if (v == null) {
 				LayoutInflater inflater = getLayoutInflater();
-				v = inflater.inflate(net.osmand.plus.R.layout.download_build_list_item, parent, false);
+				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item, parent, false);
 			}
 			final View row = v;
-			OsmAndBuild build = getItem(position);
-			TextView tagView = (TextView) row.findViewById(R.id.download_tag);
-			tagView.setText(build.tag);
+			LocalIndexInfo item = getItem(position);
 			
-			TextView description = (TextView) row.findViewById(R.id.download_descr);
-			StringBuilder format = new StringBuilder();
-			format.append(dateFormat.format(build.date))/*.append(" : ").append(build.size).append(" MB")*/;
-			description.setText(format.toString());
+			((TextView) v.findViewById(R.id.local_index_name)).setText(item.getName());
 
-			if(currentInstalledDate != null){
-				if(currentInstalledDate.before(build.date)){
-					tagView.setTextColor(Color.GREEN);
-				} else {
-					tagView.setTextColor(Color.BLUE);
-				}
-			} else {
-				tagView.setTextColor(Color.WHITE);
-			}
+//			if(currentInstalledDate != null){
+//				if(currentInstalledDate.before(build.date)){
+//					tagView.setTextColor(Color.GREEN);
+//				} else {
+//					tagView.setTextColor(Color.BLUE);
+//				}
+//			} else {
+//				tagView.setTextColor(Color.WHITE);
+//			}
 			return row;
 		}
 		
 	}
 	
 	
-	private static class ContributionVersionActivityThread extends Thread {
-		private LocalIndexesActivity activity;
-		private int operationId;
-		
-		public void setActivity(LocalIndexesActivity activity) {
-			this.activity = activity;
-		}
-		
-		public int getOperationId() {
-			return operationId;
-		}
-		
-		public void setOperationId(int operationId) {
-			this.operationId = operationId;
-		}
-
-		@Override
-		public void run() {
-			Exception ex= null;
-			try {
-				if(this.activity != null){
-					this.activity.executeThreadOperation(operationId);
-				}
-			} catch (Exception e) {
-				ex = e;
-			}
-			final Exception e = ex;
-			if(this.activity != null){
-				this.activity.runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-						activity.endThreadOperation(operationId, e);
-					}
-				});
-			}
-		}
-	}
 	
-	private static class OsmAndBuild {
-		public String path;
-		public String size;
-		public Date date;
-		public String tag;
-		
-		public OsmAndBuild(String path, String size, Date date, String tag) {
-			super();
-			this.path = path;
-			this.size = size;
-			this.date = date;
-			this.tag = tag;
-		}
-		
-		
-	}
+	
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index 50a9c3247e..ade68f2d51 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -58,8 +58,6 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 	private static final String MORE_VALUE = "MORE_VALUE";
 	
 	private Preference saveCurrentTrack;
-	private Preference reloadIndexes;
-	private Preference downloadIndexes;
 
 	private EditTextPreference applicationDir;
 	private ListPreference tileSourcePreference;
@@ -278,9 +276,11 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 		underlayPreference.setOnPreferenceChangeListener(this);
 		
 
-		reloadIndexes =(Preference) screen.findPreference(OsmandSettings.RELOAD_INDEXES);
+		Preference reloadIndexes =(Preference) screen.findPreference(OsmandSettings.RELOAD_INDEXES);
 		reloadIndexes.setOnPreferenceClickListener(this);
-		downloadIndexes =(Preference) screen.findPreference(OsmandSettings.DOWNLOAD_INDEXES);
+		Preference localIndexes =(Preference) screen.findPreference(OsmandSettings.LOCAL_INDEXES);
+		localIndexes.setOnPreferenceClickListener(this);
+		Preference downloadIndexes =(Preference) screen.findPreference(OsmandSettings.DOWNLOAD_INDEXES);
 		downloadIndexes.setOnPreferenceClickListener(this);
 		saveCurrentTrack =(Preference) screen.findPreference(OsmandSettings.SAVE_CURRENT_TRACK);
 		saveCurrentTrack.setOnPreferenceClickListener(this);
@@ -637,14 +637,14 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 
 	@Override
 	public boolean onPreferenceClick(Preference preference) {
-		if(preference == downloadIndexes){
+		if(preference.getKey().equals(OsmandSettings.DOWNLOAD_INDEXES)){
 			startActivity(new Intent(this, DownloadIndexActivity.class));
 			return true;
-		} else if(preference == reloadIndexes){
-			// TODO refactor
-			Intent intent = new Intent(this, LocalIndexesActivity.class);
-			startActivity(intent);
-			// reloadIndexes();
+		} else if(preference.getKey().equals(OsmandSettings.LOCAL_INDEXES)){
+			startActivity(new Intent(this, LocalIndexesActivity.class));
+			return true;
+		} else if(preference.getKey().equals(OsmandSettings.RELOAD_INDEXES)){
+			reloadIndexes();
 			return true;
 		} else if(preference == saveCurrentTrack){
 			SavingTrackHelper helper = new SavingTrackHelper(this);
diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
index 6f897cbbd0..2df42b8f47 100644
--- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
+++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
@@ -161,7 +161,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
 		internalClear();
 	}
 	
-	public static boolean isMyData(File voiceDir) throws CommandPlayerException {
+	public static boolean isMyData(File voiceDir) {
 		return new File(voiceDir, CONFIG_FILE).exists();
 	}
 

From b914b75196ea78bf9a173445da2a103721bb5c7b Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 18 Aug 2011 23:30:28 +0200
Subject: [PATCH 3/9] Draft version

---
 .../osmand/binary/BinaryMapIndexReader.java   |   2 +-
 OsmAnd/res/layout/local_index.xml             |  12 +-
 OsmAnd/res/layout/local_index_list_item.xml   |  10 +-
 .../layout/local_index_list_item_category.xml |   8 +
 OsmAnd/res/values/strings.xml                 |  10 +
 .../plus/activities/LocalIndexHelper.java     | 146 ++++++++++++--
 .../plus/activities/LocalIndexesActivity.java | 180 +++++++++++++-----
 7 files changed, 295 insertions(+), 73 deletions(-)
 create mode 100644 OsmAnd/res/layout/local_index_list_item_category.xml

diff --git a/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java b/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java
index f9896d0f27..0f52483af5 100644
--- a/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java
+++ b/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java
@@ -67,7 +67,7 @@ public class BinaryMapIndexReader {
 		}
 		init();
 	}
-
+	
 	private void init() throws IOException {
 		boolean initCorrectly = false;
 		while(true){
diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index b7d53fb2e2..7891589774 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -4,12 +4,16 @@
   android:layout_width="fill_parent"
   android:layout_height="fill_parent" android:orientation="vertical">
   
-<TextView android:id="@+id/Label" android:layout_width="fill_parent" android:layout_height="wrap_content" 
-	android:gravity="center" android:text="@string/select_index_file_to_download"></TextView>
+<LinearLayout android:id="@+id/LoadingPanel" android:layout_width="fill_parent" android:layout_height="wrap_content">
+   <ProgressBar android:paddingLeft="5dp" android:indeterminate="true" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+   <TextView  android:paddingLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content" 
+	android:text="@string/loading_data" android:textSize="20sp" android:layout_gravity="center_vertical"></TextView>
+</LinearLayout>  
+
 <Button android:id="@+id/DownloadButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/download_files"
 		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
 
-<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" 
-		android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" ></ListView>
+<ExpandableListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" 
+		android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" ></ExpandableListView>
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 23c3448f94..0fdb608734 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content" android:paddingLeft="30dp">
 
-	<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent">
+	<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
 		<CheckBox android:id="@+id/check_local_index" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:gravity="center_vertical" android:focusable="false" />
+			android:gravity="center_vertical" android:focusable="false" android:visibility="gone"/>
 	</LinearLayout>
 	<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:maxLines="7" android:layout_weight="1" android:textSize="16sp"></TextView>
+		android:layout_weight="1" android:textSize="20sp"></TextView>
 
-	<TextView android:id="@+id/local_index_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="105dp"
+	<TextView android:id="@+id/local_index_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="75dp"
 		android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/local_index_list_item_category.xml b/OsmAnd/res/layout/local_index_list_item_category.xml
new file mode 100644
index 0000000000..337036fb16
--- /dev/null
+++ b/OsmAnd/res/layout/local_index_list_item_category.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
+	android:layout_height="wrap_content">
+
+	<TextView android:id="@+id/local_index_category_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+		android:textSize="21sp" android:textStyle="italic" android:paddingLeft="45dp"></TextView>
+
+</LinearLayout>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index ded9c48256..0d6d502e2a 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+	<string name="local_index_items">items</string>
+	<string name="local_indexes_cat_backup">Backup</string>
+	<string name="local_indexes_cat_tts">TTS voice data</string>
+	<string name="local_indexes_cat_voice">Voice data</string>
+	<string name="local_indexes_cat_gpx">GPX data</string>
+	<string name="local_indexes_cat_tile">Tile data</string>
+	<string name="local_indexes_cat_map">Map files</string>
+	<string name="local_indexes_cat_poi">POI files</string>
+	
 	<string name="local_indexes_view">View data</string>
 	<string name="local_indexes_view_descr">View currently installed offline data</string>
+	
 	<string name="ttsvoice">TTS Voice</string>
 	<string name="search_offline_clear_search">New Search</string>
 	<string name="map_text_size_descr">Select text size for names on the map</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
index 61ca187bca..7152582665 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
@@ -1,13 +1,21 @@
 package net.osmand.plus.activities;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.List;
 
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
 import android.os.Build;
 
+import net.osmand.binary.BinaryMapIndexReader;
+import net.osmand.data.IndexConstants;
 import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.R;
 import net.osmand.plus.ResourceManager;
+import net.osmand.plus.activities.LocalIndexesActivity.LoadLocalIndexTask;
 import net.osmand.plus.voice.MediaCommandPlayerImpl;
 import net.osmand.plus.voice.TTSCommandPlayerImpl;
 
@@ -19,22 +27,27 @@ public class LocalIndexHelper {
 		this.app = app;
 	}
 	
-	public List<LocalIndexInfo> getAllLocalIndexData(){
-		return getLocalIndexData(null);
+	public List<LocalIndexInfo> getAllLocalIndexData(LoadLocalIndexTask loadTask){
+		return getLocalIndexData(null, loadTask);
 	}
 	
-	public List<LocalIndexInfo> getLocalIndexData(LocalIndexType type){
+	public List<LocalIndexInfo> getLocalIndexData(LocalIndexType type, LoadLocalIndexTask loadTask){
 		OsmandSettings settings = OsmandSettings.getOsmandSettings(app.getApplicationContext());
 		List<LocalIndexInfo> result = new ArrayList<LocalIndexInfo>();
 		
-		loadVoiceData(settings.extendOsmandPath(ResourceManager.VOICE_PATH), result, false);
-		loadVoiceData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true);
+		loadVoiceData(settings.extendOsmandPath(ResourceManager.VOICE_PATH), result, false, loadTask);
+		loadObfData(settings.extendOsmandPath(ResourceManager.MAPS_PATH), result, false, loadTask);
+		loadPoiData(settings.extendOsmandPath(ResourceManager.POI_PATH), result, false, loadTask);
+		
+		loadVoiceData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true, loadTask);
+		loadObfData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true, loadTask);
+		loadPoiData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true, loadTask);
 		
 		return result;
 	}
 	
 	
-	private void loadVoiceData(File voiceDir, List<LocalIndexInfo> result, boolean backup) {
+	private void loadVoiceData(File voiceDir, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
 		if (voiceDir.canRead()) {
 			for (File voiceF : voiceDir.listFiles()) {
 				if (voiceF.isDirectory()) {
@@ -48,20 +61,86 @@ public class LocalIndexHelper {
 					}
 					if(info != null){
 						result.add(info);
+						loadTask.loadFile(info);
 					}
 				}
 			}
 		}
 	}
+	
+	private void loadObfData(File mapPath, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
+		if (mapPath.canRead()) {
+			for (File mapFile : mapPath.listFiles()) {
+				if (mapFile.isFile() && mapFile.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
+					LocalIndexInfo info = new LocalIndexInfo(LocalIndexType.MAP_DATA, mapFile, backup);
+					if (!backup) {
+						checkObfFileVersion(info, mapFile);
+					}
+					result.add(info);
+					loadTask.loadFile(info);
+				}
+			}
+		}
+	}
+	
+	private void loadPoiData(File mapPath, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
+		if (mapPath.canRead()) {
+			for (File poiFile : mapPath.listFiles()) {
+				if (poiFile.isFile() && poiFile.getName().endsWith(IndexConstants.POI_INDEX_EXT)) {
+					LocalIndexInfo info = new LocalIndexInfo(LocalIndexType.POI_DATA, poiFile, backup);
+					if (!backup) {
+						checkPoiFileVersion(info, poiFile);
+					}
+					result.add(info);
+					loadTask.loadFile(info);
+				}
+			}
+		}
+	}
+	
+
+
+	private void checkPoiFileVersion(LocalIndexInfo info, File poiFile) {
+		try {
+			SQLiteDatabase db = SQLiteDatabase.openDatabase(poiFile.getPath(), null, SQLiteDatabase.OPEN_READONLY);
+			int version = db.getVersion();
+			info.setNotSupported(version != IndexConstants.POI_TABLE_VERSION);
+		} catch(RuntimeException e){
+			info.setCorrupted(true);
+		}
+		
+	}
+
+	private void checkObfFileVersion(LocalIndexInfo info, File mapFile) {
+		try {
+			RandomAccessFile mf = new RandomAccessFile(mapFile, "r");
+			BinaryMapIndexReader reader = new BinaryMapIndexReader(mf, true);
+			info.setNotSupported(reader.getVersion() != IndexConstants.BINARY_MAP_VERSION);
+		} catch (IOException e) {
+			info.setCorrupted(true);
+		}
+		
+	}
+
 
 
 	public enum LocalIndexType {
-		VOICE_DATA,
-		TTS_VOICE_DATA,
-		TILES_DATA,
-		GPX_DATA,
-		MAP_DATA,
-		;
+		VOICE_DATA(R.string.local_indexes_cat_voice),
+		TTS_VOICE_DATA(R.string.local_indexes_cat_tts),
+		TILES_DATA(R.string.local_indexes_cat_tile),
+		GPX_DATA(R.string.local_indexes_cat_gpx),
+		MAP_DATA(R.string.local_indexes_cat_map),
+		POI_DATA(R.string.local_indexes_cat_poi);
+		
+		private final int resId;
+
+		private LocalIndexType(int resId){
+			this.resId = resId;
+			
+		}
+		public String getHumanString(Context ctx){
+			return ctx.getString(resId);
+		}
 	}
 	
 	public static class LocalIndexInfo {
@@ -72,18 +151,37 @@ public class LocalIndexHelper {
 		
 		private boolean backupedData;
 		private boolean corrupted = false;
+		private boolean notSupported = false;
 		private boolean loaded;
 		private String pathToData;
 		private boolean singleFile;
+		private int kbSize;
 		
-		private LocalIndexInfo(LocalIndexType type, File f, boolean backuped){
+		public LocalIndexInfo(LocalIndexType type, File f, boolean backuped){
 			pathToData = f.getAbsolutePath();
-			name = f.getName();
+			name = formatName(f.getName());
 			this.type = type;
 			singleFile = !f.isDirectory();
+			if(singleFile){
+				kbSize = (int) (f.length() >> 10);
+			}
 			this.loaded = backuped;
 		}
 		
+		private String formatName(String name) {
+			int ext = name.indexOf('.');
+			if(ext != -1){
+				name = name.substring(0, ext);
+			}
+			return name.replace('_', ' ');
+		}
+
+		// Special domain object represents category
+		public LocalIndexInfo(LocalIndexType type, boolean backup){
+			this.type = type;
+			backupedData = backup;
+		}
+		
 		public void setCorrupted(boolean corrupted) {
 			this.corrupted = corrupted;
 			if(corrupted){
@@ -91,6 +189,26 @@ public class LocalIndexHelper {
 			}
 		}
 		
+		public void setSize(int size) {
+			this.kbSize = size;
+		}
+		
+		
+		public void setNotSupported(boolean notSupported) {
+			this.notSupported = notSupported;
+			if(notSupported){
+				this.loaded = false;
+			}
+		}
+		
+		public int getSize() {
+			return kbSize;
+		}
+		
+		public boolean isNotSupported() {
+			return notSupported;
+		}
+		
 		
 		public String getName() {
 			return name;
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
index 5a45366df4..ce7a8cbadd 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
@@ -1,27 +1,28 @@
 package net.osmand.plus.activities;
 
+import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 import net.osmand.plus.R;
 import net.osmand.plus.activities.LocalIndexHelper.LocalIndexInfo;
 import android.app.Activity;
-import android.app.ListActivity;
-import android.app.ProgressDialog;
+import android.app.ExpandableListActivity;
+import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.ArrayAdapter;
-import android.widget.Filterable;
-import android.widget.ListView;
+import android.widget.BaseExpandableListAdapter;
 import android.widget.TextView;
 
-public class LocalIndexesActivity extends ListActivity {
+public class LocalIndexesActivity extends ExpandableListActivity {
 
-	private ProgressDialog progressDlg;
-	private AsyncTask<Activity, ProgressDialog, List<LocalIndexInfo>> asyncLoader;
+	private AsyncTask<Activity, LocalIndexInfo, List<LocalIndexInfo>> asyncLoader;
+	private LocalIndexesAdapter listAdapter;
+	private View loadingPanel;
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -30,81 +31,162 @@ public class LocalIndexesActivity extends ListActivity {
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.local_index);
 
-		progressDlg = new ProgressDialog(this);
-		progressDlg.setTitle(getString(R.string.loading));
-		progressDlg.setMessage(getString(R.string.loading));
+		loadingPanel = findViewById(R.id.LoadingPanel);
 		LoadLocalIndexTask task = new LoadLocalIndexTask();
 		asyncLoader = task.execute(this);
+		listAdapter = new LocalIndexesAdapter();
+		setListAdapter(listAdapter);
 	}
 	
-	private class LoadLocalIndexTask extends AsyncTask<Activity, ProgressDialog, List<LocalIndexInfo>> {
-
+	public class LoadLocalIndexTask extends AsyncTask<Activity, LocalIndexInfo, List<LocalIndexInfo>> {
+		List<LocalIndexInfo> progress = new ArrayList<LocalIndexInfo>();
+		
 		@Override
 		protected List<LocalIndexInfo> doInBackground(Activity... params) {
 			LocalIndexHelper helper = new LocalIndexHelper((OsmandApplication) params[0].getApplication());
-			return helper.getAllLocalIndexData();
+			progress.clear();
+			return helper.getAllLocalIndexData(this);
+		}
+		
+		public void loadFile(LocalIndexInfo loaded){
+			publishProgress(loaded);
+		}
+		
+		@Override
+		protected void onProgressUpdate(LocalIndexInfo... values) {
+			for(LocalIndexInfo v : values){
+				listAdapter.addLocalIndexInfo(v);
+			}
+			listAdapter.notifyDataSetChanged();
 		}
 		
 		@Override
 		protected void onPostExecute(List<LocalIndexInfo> result) {
-			setListAdapter(new LocalIndexesAdapter(result));
+			loadingPanel.setVisibility(View.INVISIBLE);
 		}
 		
 	}
 	
 	
-	@Override
-	protected void onListItemClick(ListView l, View v, int position, long id) {
-		super.onListItemClick(l, v, position, id);
-		final LocalIndexInfo item = (LocalIndexInfo) getListAdapter().getItem(position);
-		
-	}
-	
-	@Override
-	public LocalIndexesAdapter getListAdapter() {
-		return (LocalIndexesAdapter) super.getListAdapter();
-	}
 	
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		if(progressDlg != null){
-			progressDlg.dismiss();
-			progressDlg = null;
-			asyncLoader.cancel(true);
-		}
+		asyncLoader.cancel(true);
 	}
 	
 	
-	protected class LocalIndexesAdapter extends ArrayAdapter<LocalIndexInfo> implements Filterable {
-		
+	protected class LocalIndexesAdapter extends BaseExpandableListAdapter  {
+		List<List<LocalIndexInfo>> data = new ArrayList<List<LocalIndexInfo>>();
+		List<LocalIndexInfo> category = new ArrayList<LocalIndexInfo>();
+		private MessageFormat format;
 
-		public LocalIndexesAdapter(List<LocalIndexInfo> builds) {
-			super(LocalIndexesActivity.this, R.layout.local_index_list_item, builds);
+		public LocalIndexesAdapter() {
+			format = new MessageFormat("{0, number,##.#} MB");
+		}
+		
+		public void addLocalIndexInfo(LocalIndexInfo info){
+			int found = -1;
+			// search from end
+			for (int i = category.size() - 1; i >= 0; i--) {
+				LocalIndexInfo cat = category.get(i);
+				if (cat.getType() == info.getType() && info.isBackupedData() == cat.isBackupedData()) {
+					found = i;
+					break;
+				}
+			}
+			if(found == -1){
+				found = category.size();
+				category.add(new LocalIndexInfo(info.getType(), info.isBackupedData()));
+			}
+			if(found >= data.size()) {
+				data.add(new ArrayList<LocalIndexInfo>());
+			}
+			data.get(found).add(info);
 		}
 
 		@Override
-		public View getView(final int position, View convertView, ViewGroup parent) {
+		public LocalIndexInfo getChild(int groupPosition, int childPosition) {
+			return data.get(groupPosition).get(childPosition);
+		}
+
+		@Override
+		public long getChildId(int groupPosition, int childPosition) {
+			// it would be unusable to have 10000 local indexes
+			return groupPosition * 10000 + childPosition;
+		}
+
+		@Override
+		public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
 			View v = convertView;
+			LocalIndexInfo child = (LocalIndexInfo) getChild(groupPosition, childPosition);
 			if (v == null) {
 				LayoutInflater inflater = getLayoutInflater();
 				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item, parent, false);
 			}
-			final View row = v;
-			LocalIndexInfo item = getItem(position);
+			((TextView) v.findViewById(R.id.local_index_name)).setText(child.getName());
+			if(child.getSize() != 0){
+				String size = format.format(new Object[] { (float) child.getSize() / (1 << 10) });
+				((TextView) v.findViewById(R.id.local_index_descr)).setText(size);
+			} else {
+				((TextView) v.findViewById(R.id.local_index_descr)).setText("");
+			}
 			
-			((TextView) v.findViewById(R.id.local_index_name)).setText(item.getName());
+			return v;
+		}
+		
+		@Override
+		public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
+			View v = convertView;
+			LocalIndexInfo group = getGroup(groupPosition);
+			if (v == null) {
+				LayoutInflater inflater = getLayoutInflater();
+				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item_category, parent, false);
+			}
+			StringBuilder t = new StringBuilder(group.getType().getHumanString(LocalIndexesActivity.this));
+			if(group.isBackupedData()){
+				t.append(" ").append(getString(R.string.local_indexes_cat_backup));
+			}
+			TextView nameView = ((TextView) v.findViewById(R.id.local_index_category_name));
+			t.append(" [").append(getChildrenCount(groupPosition)).append(" ").append(getString(R.string.local_index_items)).append("]");
+			nameView.setText(t.toString());
+			if(!group.isBackupedData()){
+				nameView.setTypeface(Typeface.DEFAULT_BOLD);
+			} else {
+				nameView.setTypeface(Typeface.DEFAULT);
+			}
+			
+			return v;
+		}
 
-//			if(currentInstalledDate != null){
-//				if(currentInstalledDate.before(build.date)){
-//					tagView.setTextColor(Color.GREEN);
-//				} else {
-//					tagView.setTextColor(Color.BLUE);
-//				}
-//			} else {
-//				tagView.setTextColor(Color.WHITE);
-//			}
-			return row;
+		@Override
+		public int getChildrenCount(int groupPosition) {
+			return data.get(groupPosition).size();
+		}
+
+		@Override
+		public LocalIndexInfo getGroup(int groupPosition) {
+			return category.get(groupPosition);
+		}
+
+		@Override
+		public int getGroupCount() {
+			return category.size();
+		}
+
+		@Override
+		public long getGroupId(int groupPosition) {
+			return groupPosition;
+		}
+
+		@Override
+		public boolean hasStableIds() {
+			return false;
+		}
+
+		@Override
+		public boolean isChildSelectable(int groupPosition, int childPosition) {
+			return false;
 		}
 		
 	}

From bcff20e9a322e23ff0b2a917d84d1a0505fb7488 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Fri, 19 Aug 2011 01:23:44 +0200
Subject: [PATCH 4/9] Update local indexes activity

---
 OsmAnd/res/layout/local_index.xml             |  12 +-
 OsmAnd/res/layout/local_index_list_item.xml   |  15 +-
 .../layout/local_index_list_item_category.xml |   2 +-
 OsmAnd/res/values/strings.xml                 |  14 +-
 .../src/net/osmand/plus/ResourceManager.java  |   2 +
 .../plus/activities/LocalIndexHelper.java     | 131 +++++++++--
 .../plus/activities/LocalIndexesActivity.java | 204 ++++++++++++++----
 .../plus/activities/MapActivityLayers.java    |   2 +-
 .../plus/activities/SavingTrackHelper.java    |   3 +-
 .../plus/render/MapRenderRepositories.java    |   3 +
 10 files changed, 315 insertions(+), 73 deletions(-)

diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index 7891589774..c57ed26213 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -5,13 +5,13 @@
   android:layout_height="fill_parent" android:orientation="vertical">
   
 <LinearLayout android:id="@+id/LoadingPanel" android:layout_width="fill_parent" android:layout_height="wrap_content">
-   <ProgressBar android:paddingLeft="5dp" android:indeterminate="true" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-   <TextView  android:paddingLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content" 
-	android:text="@string/loading_data" android:textSize="20sp" android:layout_gravity="center_vertical"></TextView>
-</LinearLayout>  
-
-<Button android:id="@+id/DownloadButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/download_files"
+   <ProgressBar android:id="@+id/ProgressBar" android:paddingLeft="5dp" android:indeterminate="true" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+   <Button android:id="@+id/ReloadIndexes" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/local_index_reload"
 		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
+   <Button android:id="@+id/DownloadButton" android:layout_width="wrap_content" android:layout_gravity="right" android:layout_height="wrap_content" android:text="@string/local_index_download"
+		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp"/>
+</LinearLayout>
+
 
 <ExpandableListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" 
 		android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" ></ExpandableListView>
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 0fdb608734..245bc5e5c2 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent"
-	android:layout_height="wrap_content" android:paddingLeft="30dp">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"   android:layout_width="fill_parent"	android:layout_height="wrap_content" 
+android:orientation="vertical">
 
+  <LinearLayout android:layout_width="fill_parent"	android:layout_height="wrap_content" android:layout_marginLeft="15dp">
 	<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
 		<CheckBox android:id="@+id/check_local_index" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:gravity="center_vertical" android:focusable="false" android:visibility="gone"/>
+			android:gravity="center_vertical" android:focusable="false" android:visibility="visible"/>
 	</LinearLayout>
 	<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
 		android:layout_weight="1" android:textSize="20sp"></TextView>
 
-	<TextView android:id="@+id/local_index_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="75dp"
+	<TextView android:id="@+id/local_index_size" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="75dp"
+		android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
+  </LinearLayout>
+  
+  	<TextView android:id="@+id/local_index_descr" android:layout_marginLeft="25dp" android:layout_marginTop="5dp"
+  			android:layout_marginRight="10dp" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
-
 </LinearLayout>
diff --git a/OsmAnd/res/layout/local_index_list_item_category.xml b/OsmAnd/res/layout/local_index_list_item_category.xml
index 337036fb16..2cb1120acf 100644
--- a/OsmAnd/res/layout/local_index_list_item_category.xml
+++ b/OsmAnd/res/layout/local_index_list_item_category.xml
@@ -3,6 +3,6 @@
 	android:layout_height="wrap_content">
 
 	<TextView android:id="@+id/local_index_category_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:textSize="21sp" android:textStyle="italic" android:paddingLeft="45dp"></TextView>
+		android:textSize="21sp" android:layout_marginLeft="40dp"></TextView>
 
 </LinearLayout>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 0d6d502e2a..84e0664160 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+	
+	<string name="local_index_reload">Refresh locally</string>
+	<string name="local_index_download">Download New</string>
+	<string name="local_index_tile_data">Tile data %1$s - minimum zoom %2$d, maximum zoom %3$d</string>
+	<string name="local_index_poi_data">POI data</string>
+	<string name="local_index_address_data">Address data</string>
+	<string name="local_index_transport_data">Transport data</string>
+	<string name="local_index_map_data">Map data</string>
 	<string name="local_index_items">items</string>
 	<string name="local_indexes_cat_backup">Backup</string>
-	<string name="local_indexes_cat_tts">TTS voice data</string>
+	<string name="local_indexes_cat_tts">TTS data</string>
 	<string name="local_indexes_cat_voice">Voice data</string>
 	<string name="local_indexes_cat_gpx">GPX data</string>
 	<string name="local_indexes_cat_tile">Tile data</string>
-	<string name="local_indexes_cat_map">Map files</string>
-	<string name="local_indexes_cat_poi">POI files</string>
+	<string name="local_indexes_cat_map">Map data</string>
+	<string name="local_indexes_cat_poi">POI data</string>
 	
 	<string name="local_indexes_view">View data</string>
 	<string name="local_indexes_view_descr">View currently installed offline data</string>
diff --git a/OsmAnd/src/net/osmand/plus/ResourceManager.java b/OsmAnd/src/net/osmand/plus/ResourceManager.java
index ae2ec11d5a..57a7fbc403 100644
--- a/OsmAnd/src/net/osmand/plus/ResourceManager.java
+++ b/OsmAnd/src/net/osmand/plus/ResourceManager.java
@@ -60,6 +60,7 @@ public class ResourceManager {
 	public static final String APP_DIR = "osmand/"; //$NON-NLS-1$
 	public static final String POI_PATH = APP_DIR + IndexConstants.POI_INDEX_DIR; 
 	public static final String VOICE_PATH = APP_DIR + IndexConstants.VOICE_INDEX_DIR;
+	public static final String GPX_PATH = APP_DIR + "tracks";
 	public static final String MAPS_PATH = APP_DIR;
 	public static final String BACKUP_PATH = APP_DIR + "backup/";
 	public static final String TILES_PATH = APP_DIR+"tiles/"; //$NON-NLS-1$
@@ -70,6 +71,7 @@ public class ResourceManager {
 	
 	private static final Log log = LogUtil.getLog(ResourceManager.class);
 	
+	
 	protected static ResourceManager manager = null;
 	
 	// it is not good investigated but no more than 64 (satellite images)
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
index 7152582665..ffb97b99e0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
@@ -5,19 +5,26 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
-
+import net.osmand.binary.BinaryIndexPart;
 import net.osmand.binary.BinaryMapIndexReader;
+import net.osmand.binary.BinaryMapAddressReaderAdapter.AddressRegion;
+import net.osmand.binary.BinaryMapIndexReader.MapIndex;
+import net.osmand.binary.BinaryMapTransportReaderAdapter.TransportIndex;
 import net.osmand.data.IndexConstants;
+import net.osmand.map.TileSourceManager;
+import net.osmand.map.TileSourceManager.TileSourceTemplate;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.ResourceManager;
+import net.osmand.plus.SQLiteTileSource;
 import net.osmand.plus.activities.LocalIndexesActivity.LoadLocalIndexTask;
 import net.osmand.plus.voice.MediaCommandPlayerImpl;
 import net.osmand.plus.voice.TTSCommandPlayerImpl;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Build;
 
 public class LocalIndexHelper {
 		
@@ -31,22 +38,43 @@ public class LocalIndexHelper {
 		return getLocalIndexData(null, loadTask);
 	}
 	
+	
+	public void updateDescription(LocalIndexInfo info){
+		if(info.getType() == LocalIndexType.MAP_DATA){
+			updateObfFileInformation(info, new File(info.getPathToData()));
+		} else if(info.getType() == LocalIndexType.TILES_DATA){
+			File f = new File(info.getPathToData());
+			if(f.isDirectory() && TileSourceManager.isTileSourceMetaInfoExist(f)){
+				TileSourceTemplate template = TileSourceManager.createTileSourceTemplate(new File(info.getPathToData()));
+				String descr = app.getString(R.string.local_index_tile_data, 
+					template.getName(), template.getMinimumZoomSupported(), template.getMaximumZoomSupported());
+				info.setDescription(descr);
+			}
+		}
+	}
+	
 	public List<LocalIndexInfo> getLocalIndexData(LocalIndexType type, LoadLocalIndexTask loadTask){
 		OsmandSettings settings = OsmandSettings.getOsmandSettings(app.getApplicationContext());
+		Map<String, String> loadedMaps = app.getResourceManager().getIndexFileNames();
 		List<LocalIndexInfo> result = new ArrayList<LocalIndexInfo>();
 		
 		loadVoiceData(settings.extendOsmandPath(ResourceManager.VOICE_PATH), result, false, loadTask);
-		loadObfData(settings.extendOsmandPath(ResourceManager.MAPS_PATH), result, false, loadTask);
+		loadObfData(settings.extendOsmandPath(ResourceManager.MAPS_PATH), result, false, loadTask, loadedMaps);
 		loadPoiData(settings.extendOsmandPath(ResourceManager.POI_PATH), result, false, loadTask);
+		loadGPXData(settings.extendOsmandPath(ResourceManager.GPX_PATH), result, false, loadTask);
+		loadTilesData(settings.extendOsmandPath(ResourceManager.TILES_PATH), result, false, loadTask);
 		
 		loadVoiceData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true, loadTask);
-		loadObfData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true, loadTask);
+		loadObfData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true, loadTask, loadedMaps);
 		loadPoiData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true, loadTask);
+		loadGPXData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, true, loadTask);
+		loadTilesData(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), result, false, loadTask);
 		
 		return result;
 	}
 	
 	
+
 	private void loadVoiceData(File voiceDir, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
 		if (voiceDir.canRead()) {
 			for (File voiceF : voiceDir.listFiles()) {
@@ -68,13 +96,37 @@ public class LocalIndexHelper {
 		}
 	}
 	
-	private void loadObfData(File mapPath, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
+	private void loadTilesData(File tilesPath, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
+		if (tilesPath.canRead()) {
+			for (File tileFile : tilesPath.listFiles()) {
+				if (tileFile.isFile() && tileFile.getName().endsWith(SQLiteTileSource.EXT)) {
+					LocalIndexInfo info = new LocalIndexInfo(LocalIndexType.TILES_DATA, tileFile, backup);
+					result.add(info);
+					loadTask.loadFile(info);
+				} else if (tileFile.isDirectory()) {
+					LocalIndexInfo info = new LocalIndexInfo(LocalIndexType.TILES_DATA, tileFile, backup);
+					
+					if(!TileSourceManager.isTileSourceMetaInfoExist(tileFile)){
+						info.setCorrupted(true);
+					} else {
+						// updateTileSourceInfo(tileFile, info);
+					}
+					result.add(info);
+					loadTask.loadFile(info);
+					
+				}
+			}
+		}
+	}
+
+	
+	private void loadObfData(File mapPath, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask, Map<String, String> loadedMaps) {
 		if (mapPath.canRead()) {
 			for (File mapFile : mapPath.listFiles()) {
 				if (mapFile.isFile() && mapFile.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
 					LocalIndexInfo info = new LocalIndexInfo(LocalIndexType.MAP_DATA, mapFile, backup);
-					if (!backup) {
-						checkObfFileVersion(info, mapFile);
+					if(loadedMaps.containsKey(mapFile.getName()) && !backup){
+						info.setLoaded(true);
 					}
 					result.add(info);
 					loadTask.loadFile(info);
@@ -83,6 +135,18 @@ public class LocalIndexHelper {
 		}
 	}
 	
+	private void loadGPXData(File mapPath, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
+		if (mapPath.canRead()) {
+			for (File gpxFile : mapPath.listFiles()) {
+				if (gpxFile.isFile() && gpxFile.getName().endsWith(".gpx")) {
+					LocalIndexInfo info = new LocalIndexInfo(LocalIndexType.GPX_DATA, gpxFile, backup);
+					result.add(info);
+					loadTask.loadFile(info);
+				}
+			}
+		}
+	}
+	
 	private void loadPoiData(File mapPath, List<LocalIndexInfo> result, boolean backup, LoadLocalIndexTask loadTask) {
 		if (mapPath.canRead()) {
 			for (File poiFile : mapPath.listFiles()) {
@@ -105,17 +169,38 @@ public class LocalIndexHelper {
 			SQLiteDatabase db = SQLiteDatabase.openDatabase(poiFile.getPath(), null, SQLiteDatabase.OPEN_READONLY);
 			int version = db.getVersion();
 			info.setNotSupported(version != IndexConstants.POI_TABLE_VERSION);
+			db.close();
 		} catch(RuntimeException e){
 			info.setCorrupted(true);
 		}
 		
 	}
 
-	private void checkObfFileVersion(LocalIndexInfo info, File mapFile) {
+	private void updateObfFileInformation(LocalIndexInfo info, File mapFile) {
 		try {
 			RandomAccessFile mf = new RandomAccessFile(mapFile, "r");
-			BinaryMapIndexReader reader = new BinaryMapIndexReader(mf, true);
+			BinaryMapIndexReader reader = new BinaryMapIndexReader(mf, false);
+			
 			info.setNotSupported(reader.getVersion() != IndexConstants.BINARY_MAP_VERSION);
+			List<BinaryIndexPart> indexes = reader.getIndexes();
+			StringBuilder builder = new StringBuilder();
+			for(BinaryIndexPart part : indexes){
+				if(part instanceof MapIndex){
+					MapIndex mi = ((MapIndex) part);
+					builder.append(app.getString(R.string.local_index_map_data)).append(": ").
+						append(mi.getName()).append("\n");
+				} else if(part instanceof TransportIndex){
+					TransportIndex mi = ((TransportIndex) part);
+					builder.append(app.getString(R.string.local_index_transport_data)).append(": ").
+						append(mi.getName()).append("\n");
+				} else if(part instanceof AddressRegion){
+					AddressRegion mi = ((AddressRegion) part);
+					builder.append(app.getString(R.string.local_index_address_data)).append(": ").
+						append(mi.getName()).append("\n");
+				}
+			}
+			info.setDescription(builder.toString());
+			reader.close();
 		} catch (IOException e) {
 			info.setCorrupted(true);
 		}
@@ -146,7 +231,7 @@ public class LocalIndexHelper {
 	public static class LocalIndexInfo {
 		
 		private LocalIndexType type;
-		private String description;
+		private String description = "";
 		private String name;
 		
 		private boolean backupedData;
@@ -155,7 +240,10 @@ public class LocalIndexHelper {
 		private boolean loaded;
 		private String pathToData;
 		private boolean singleFile;
-		private int kbSize;
+		private int kbSize = -1;
+		
+		// UI state expanded
+		private boolean expanded;
 		
 		public LocalIndexInfo(LocalIndexType type, File f, boolean backuped){
 			pathToData = f.getAbsolutePath();
@@ -165,7 +253,7 @@ public class LocalIndexHelper {
 			if(singleFile){
 				kbSize = (int) (f.length() >> 10);
 			}
-			this.loaded = backuped;
+			this.backupedData = backuped;
 		}
 		
 		private String formatName(String name) {
@@ -193,6 +281,21 @@ public class LocalIndexHelper {
 			this.kbSize = size;
 		}
 		
+		public boolean isExpanded() {
+			return expanded;
+		}
+		
+		public void setExpanded(boolean expanded) {
+			this.expanded = expanded;
+		}
+		
+		public void setDescription(String description) {
+			this.description = description;
+		}
+		
+		public void setLoaded(boolean loaded) {
+			this.loaded = loaded;
+		}
 		
 		public void setNotSupported(boolean notSupported) {
 			this.notSupported = notSupported;
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
index ce7a8cbadd..02f90ea5a0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
@@ -4,10 +4,14 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.osmand.plus.ProgressDialogImplementation;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.LocalIndexHelper.LocalIndexInfo;
 import android.app.Activity;
 import android.app.ExpandableListActivity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -16,14 +20,17 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.BaseExpandableListAdapter;
+import android.widget.ExpandableListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 public class LocalIndexesActivity extends ExpandableListActivity {
 
 	private AsyncTask<Activity, LocalIndexInfo, List<LocalIndexInfo>> asyncLoader;
 	private LocalIndexesAdapter listAdapter;
-	private View loadingPanel;
-	
+	private ProgressDialog progressDlg;
+	private LoadLocalIndexDescriptionTask descriptionLoader;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -31,61 +38,117 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.local_index);
 
-		loadingPanel = findViewById(R.id.LoadingPanel);
 		LoadLocalIndexTask task = new LoadLocalIndexTask();
 		asyncLoader = task.execute(this);
+		descriptionLoader = new LoadLocalIndexDescriptionTask();
 		listAdapter = new LocalIndexesAdapter();
+		findViewById(R.id.DownloadButton).setOnClickListener(new View.OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				startActivity(new Intent(LocalIndexesActivity.this, DownloadIndexActivity.class));
+			}
+		});
+		findViewById(R.id.ReloadIndexes).setOnClickListener(new View.OnClickListener() {
+
+			@Override
+			public void onClick(View v) {
+				reloadIndexes();
+			}
+		});
 		setListAdapter(listAdapter);
 	}
-	
+
 	public class LoadLocalIndexTask extends AsyncTask<Activity, LocalIndexInfo, List<LocalIndexInfo>> {
 		List<LocalIndexInfo> progress = new ArrayList<LocalIndexInfo>();
-		
+
 		@Override
 		protected List<LocalIndexInfo> doInBackground(Activity... params) {
 			LocalIndexHelper helper = new LocalIndexHelper((OsmandApplication) params[0].getApplication());
 			progress.clear();
 			return helper.getAllLocalIndexData(this);
 		}
-		
-		public void loadFile(LocalIndexInfo loaded){
+
+		public void loadFile(LocalIndexInfo loaded) {
 			publishProgress(loaded);
 		}
-		
+
 		@Override
 		protected void onProgressUpdate(LocalIndexInfo... values) {
-			for(LocalIndexInfo v : values){
+			for (LocalIndexInfo v : values) {
 				listAdapter.addLocalIndexInfo(v);
 			}
 			listAdapter.notifyDataSetChanged();
 		}
-		
+
 		@Override
 		protected void onPostExecute(List<LocalIndexInfo> result) {
-			loadingPanel.setVisibility(View.INVISIBLE);
+			findViewById(R.id.ProgressBar).setVisibility(View.GONE);
+			findViewById(R.id.ReloadIndexes).setVisibility(View.VISIBLE);
 		}
-		
+
 	}
 	
+	public class LoadLocalIndexDescriptionTask extends AsyncTask<LocalIndexInfo, LocalIndexInfo, LocalIndexInfo[]> {
+
+		@Override
+		protected LocalIndexInfo[] doInBackground(LocalIndexInfo... params) {
+			LocalIndexHelper helper = new LocalIndexHelper((OsmandApplication) LocalIndexesActivity.this.getApplication());
+			for(LocalIndexInfo i : params){
+				helper.updateDescription(i);
+			}
+			return params;
+		}
+
+		@Override
+		protected void onPreExecute() {
+			findViewById(R.id.ProgressBar).setVisibility(View.VISIBLE);
+		}
+
+		@Override
+		protected void onProgressUpdate(LocalIndexInfo... values) {
+			listAdapter.notifyDataSetChanged();
+		}
+
+		@Override
+		protected void onPostExecute(LocalIndexInfo[] result) {
+			listAdapter.notifyDataSetChanged();
+			findViewById(R.id.ProgressBar).setVisibility(View.GONE);
+		}
+
+	}
 	
-	
+	@Override
+	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
+		LocalIndexInfo item = listAdapter.getChild(groupPosition, childPosition);
+		item.setExpanded(!item.isExpanded());
+		if(item.isExpanded()){
+			descriptionLoader.execute(item);
+		}
+		listAdapter.notifyDataSetInvalidated();
+		return true;
+	}
+
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
+		if (progressDlg != null) {
+			progressDlg.dismiss();
+			progressDlg = null;
+		}
 		asyncLoader.cancel(true);
 	}
-	
-	
-	protected class LocalIndexesAdapter extends BaseExpandableListAdapter  {
+
+	protected class LocalIndexesAdapter extends BaseExpandableListAdapter {
 		List<List<LocalIndexInfo>> data = new ArrayList<List<LocalIndexInfo>>();
 		List<LocalIndexInfo> category = new ArrayList<LocalIndexInfo>();
-		private MessageFormat format;
+		private MessageFormat formatMb;
 
 		public LocalIndexesAdapter() {
-			format = new MessageFormat("{0, number,##.#} MB");
+			formatMb = new MessageFormat("{0, number,##.#} MB");
 		}
-		
-		public void addLocalIndexInfo(LocalIndexInfo info){
+
+		public void addLocalIndexInfo(LocalIndexInfo info) {
 			int found = -1;
 			// search from end
 			for (int i = category.size() - 1; i >= 0; i--) {
@@ -95,11 +158,11 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 					break;
 				}
 			}
-			if(found == -1){
+			if (found == -1) {
 				found = category.size();
 				category.add(new LocalIndexInfo(info.getType(), info.isBackupedData()));
 			}
-			if(found >= data.size()) {
+			if (found >= data.size()) {
 				data.add(new ArrayList<LocalIndexInfo>());
 			}
 			data.get(found).add(info);
@@ -124,17 +187,39 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 				LayoutInflater inflater = getLayoutInflater();
 				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item, parent, false);
 			}
-			((TextView) v.findViewById(R.id.local_index_name)).setText(child.getName());
-			if(child.getSize() != 0){
-				String size = format.format(new Object[] { (float) child.getSize() / (1 << 10) });
-				((TextView) v.findViewById(R.id.local_index_descr)).setText(size);
+			TextView viewName = ((TextView) v.findViewById(R.id.local_index_name));
+			viewName.setText(child.getName());
+			if (child.isNotSupported()) {
+				viewName.setTextColor(Color.RED);
+			} else if (child.isCorrupted()) {
+				viewName.setTextColor(Color.MAGENTA);
+			} else if (child.isLoaded()) {
+				viewName.setTextColor(Color.GREEN);
 			} else {
-				((TextView) v.findViewById(R.id.local_index_descr)).setText("");
+				viewName.setTextColor(Color.LTGRAY);
 			}
-			
+			if (child.getSize() >= 0) {
+				String size;
+				if (child.getSize() > 100) {
+					size = formatMb.format(new Object[] { (float) child.getSize() / (1 << 10) });
+				} else {
+					size = child.getSize() + " Kb";
+				}
+				((TextView) v.findViewById(R.id.local_index_size)).setText(size);
+			} else {
+				((TextView) v.findViewById(R.id.local_index_size)).setText("");
+			}
+			TextView descr = ((TextView) v.findViewById(R.id.local_index_descr));
+			if(child.isExpanded()){
+				descr.setVisibility(View.VISIBLE);
+				descr.setText(child.getDescription());
+			} else {
+				descr.setVisibility(View.GONE);
+			}
+
 			return v;
 		}
-		
+
 		@Override
 		public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
 			View v = convertView;
@@ -144,18 +229,19 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item_category, parent, false);
 			}
 			StringBuilder t = new StringBuilder(group.getType().getHumanString(LocalIndexesActivity.this));
-			if(group.isBackupedData()){
-				t.append(" ").append(getString(R.string.local_indexes_cat_backup));
+			if (group.isBackupedData()) {
+				t.append("* ");
 			}
 			TextView nameView = ((TextView) v.findViewById(R.id.local_index_category_name));
 			t.append(" [").append(getChildrenCount(groupPosition)).append(" ").append(getString(R.string.local_index_items)).append("]");
 			nameView.setText(t.toString());
-			if(!group.isBackupedData()){
-				nameView.setTypeface(Typeface.DEFAULT_BOLD);
+			if (!group.isBackupedData()) {
+				nameView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
 			} else {
-				nameView.setTypeface(Typeface.DEFAULT);
+				nameView.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
 			}
 			
+
 			return v;
 		}
 
@@ -183,16 +269,52 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		public boolean hasStableIds() {
 			return false;
 		}
-
+		
 		@Override
 		public boolean isChildSelectable(int groupPosition, int childPosition) {
-			return false;
+			return true;
+		}
+
+	}
+
+	public void reloadIndexes() {
+		progressDlg = ProgressDialog.show(this, getString(R.string.loading_data), getString(R.string.reading_indexes), true);
+		final ProgressDialogImplementation impl = new ProgressDialogImplementation(progressDlg);
+		impl.setRunnable("Initializing app", new Runnable() { //$NON-NLS-1$
+				@Override
+				public void run() {
+					try {
+						showWarnings(((OsmandApplication) getApplication()).getResourceManager().reloadIndexes(impl));
+					} finally {
+						if (progressDlg != null) {
+							progressDlg.dismiss();
+							progressDlg = null;
+						}
+					}
+				}
+		});
+		impl.run();
+	}
+
+	protected void showWarnings(List<String> warnings) {
+		if (!warnings.isEmpty()) {
+			final StringBuilder b = new StringBuilder();
+			boolean f = true;
+			for (String w : warnings) {
+				if (f) {
+					f = false;
+				} else {
+					b.append('\n');
+				}
+				b.append(w);
+			}
+			runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					Toast.makeText(LocalIndexesActivity.this, b.toString(), Toast.LENGTH_LONG).show();
+				}
+			});
 		}
-		
 	}
-	
-	
-	
-	
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index e7b1546c0f..6ba952b797 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -353,7 +353,7 @@ public class MapActivityLayers {
 	public void selectGPXFileLayer(final CallbackWithObject<GPXFileResult> callbackWithObject) {
 		final List<String> list = new ArrayList<String>();
 		final OsmandSettings settings = getApplication().getSettings();
-		final File dir = settings.extendOsmandPath(ResourceManager.APP_DIR + SavingTrackHelper.TRACKS_PATH);
+		final File dir = settings.extendOsmandPath(ResourceManager.GPX_PATH);
 		if (dir != null && dir.canRead()) {
 			File[] files = dir.listFiles();
 			if (files != null) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
index 3acb0b17d7..cf9aa8b78d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
@@ -25,7 +25,6 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.format.DateFormat;
 
 public class SavingTrackHelper extends SQLiteOpenHelper {
-	public final static String TRACKS_PATH = "tracks"; //$NON-NLS-1$
 	
 	public final static String DATABASE_NAME = "tracks"; //$NON-NLS-1$
 	public final static int DATABASE_VERSION = 2;
@@ -116,7 +115,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 		List<String> warnings = new ArrayList<String>();
 		File dir = OsmandSettings.getOsmandSettings(ctx).getExternalStorageDirectory();
 		if(db != null && dir.canWrite()){
-			dir = new File(dir, ResourceManager.APP_DIR + TRACKS_PATH);
+			dir = new File(dir, ResourceManager.GPX_PATH);
 			dir.mkdirs();
 			if (dir.exists()) {
 				
diff --git a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
index 08ed3b8555..3a0db8b7f8 100644
--- a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
+++ b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
@@ -1051,4 +1051,7 @@ public class MapRenderRepositories {
 	}
 
 
+	public Map<String, BinaryMapIndexReader> getMetaInfoFiles() {
+		return files;
+	}
 }

From f82c7cab79464c5a098e700819c9af7085244a58 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Fri, 19 Aug 2011 10:00:53 +0200
Subject: [PATCH 5/9] Fix small issues

---
 OsmAnd/res/layout/local_index.xml                    |  3 ++-
 OsmAnd/res/values/strings.xml                        |  3 ---
 OsmAnd/res/xml/settings_pref.xml                     |  6 +-----
 OsmAnd/src/net/osmand/plus/OsmandSettings.java       |  2 --
 .../osmand/plus/activities/LocalIndexesActivity.java |  4 ++--
 .../net/osmand/plus/activities/SettingsActivity.java | 12 +-----------
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index c57ed26213..adb2c94da7 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -8,6 +8,7 @@
    <ProgressBar android:id="@+id/ProgressBar" android:paddingLeft="5dp" android:indeterminate="true" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
    <Button android:id="@+id/ReloadIndexes" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/local_index_reload"
 		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
+   <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"/>
    <Button android:id="@+id/DownloadButton" android:layout_width="wrap_content" android:layout_gravity="right" android:layout_height="wrap_content" android:text="@string/local_index_download"
 		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp"/>
 </LinearLayout>
@@ -16,4 +17,4 @@
 <ExpandableListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" 
 		android:layout_marginLeft="3dp" android:layout_marginTop="3dp" android:layout_marginRight="3dp" ></ExpandableListView>
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 84e0664160..d2f6eca1fa 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -17,9 +17,6 @@
 	<string name="local_indexes_cat_map">Map data</string>
 	<string name="local_indexes_cat_poi">POI data</string>
 	
-	<string name="local_indexes_view">View data</string>
-	<string name="local_indexes_view_descr">View currently installed offline data</string>
-	
 	<string name="ttsvoice">TTS Voice</string>
 	<string name="search_offline_clear_search">New Search</string>
 	<string name="map_text_size_descr">Select text size for names on the map</string>
diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml
index 7a8e2fad63..20007fabaf 100644
--- a/OsmAnd/res/xml/settings_pref.xml
+++ b/OsmAnd/res/xml/settings_pref.xml
@@ -30,11 +30,7 @@
 	</PreferenceScreen>
 
 
-	<PreferenceScreen android:key="index_settings" android:title="@string/index_settings" android:summary="@string/index_settings_descr">
-		<Preference android:title="@string/reload_indexes" android:key="reload_indexes" android:summary="@string/reload_indexes_descr"></Preference>
-		<Preference android:title="@string/download_indexes" android:key="download_indexes" android:summary="@string/download_indexes_descr"></Preference>
-		<Preference android:title="@string/local_indexes_view" android:key="local_indexes" android:summary="@string/local_indexes_view_descr"></Preference>
-	</PreferenceScreen>
+	<Preference android:title="@string/index_settings" android:key="local_indexes" android:summary="@string/index_settings_descr"></Preference>
 
 
 	<PreferenceScreen android:key = "monitor_settings" android:title="@string/monitor_preferences" android:summary="@string/monitor_preferences_descr">
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 5342271fee..5dc142d6bc 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -452,9 +452,7 @@ public class OsmandSettings {
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public static final String SAVE_CURRENT_TRACK = "save_current_track"; //$NON-NLS-1$
-	public static final String RELOAD_INDEXES = "reload_indexes"; //$NON-NLS-1$
 	public static final String LOCAL_INDEXES = "local_indexes"; //$NON-NLS-1$
-	public static final String DOWNLOAD_INDEXES = "download_indexes"; //$NON-NLS-1$
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final CommonPreference<Boolean> SAVE_TRACK_TO_GPX = new BooleanPreference("save_track_to_gpx", false, false);
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
index 02f90ea5a0..83ee6ff9b1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
@@ -102,7 +102,6 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 
 		@Override
 		protected void onPreExecute() {
-			findViewById(R.id.ProgressBar).setVisibility(View.VISIBLE);
 		}
 
 		@Override
@@ -113,7 +112,6 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		@Override
 		protected void onPostExecute(LocalIndexInfo[] result) {
 			listAdapter.notifyDataSetChanged();
-			findViewById(R.id.ProgressBar).setVisibility(View.GONE);
 		}
 
 	}
@@ -123,6 +121,7 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		LocalIndexInfo item = listAdapter.getChild(groupPosition, childPosition);
 		item.setExpanded(!item.isExpanded());
 		if(item.isExpanded()){
+			descriptionLoader = new LoadLocalIndexDescriptionTask();
 			descriptionLoader.execute(item);
 		}
 		listAdapter.notifyDataSetInvalidated();
@@ -137,6 +136,7 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 			progressDlg = null;
 		}
 		asyncLoader.cancel(true);
+		descriptionLoader.cancel(true);
 	}
 
 	protected class LocalIndexesAdapter extends BaseExpandableListAdapter {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index ade68f2d51..1853a00a23 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -276,12 +276,8 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 		underlayPreference.setOnPreferenceChangeListener(this);
 		
 
-		Preference reloadIndexes =(Preference) screen.findPreference(OsmandSettings.RELOAD_INDEXES);
-		reloadIndexes.setOnPreferenceClickListener(this);
 		Preference localIndexes =(Preference) screen.findPreference(OsmandSettings.LOCAL_INDEXES);
 		localIndexes.setOnPreferenceClickListener(this);
-		Preference downloadIndexes =(Preference) screen.findPreference(OsmandSettings.DOWNLOAD_INDEXES);
-		downloadIndexes.setOnPreferenceClickListener(this);
 		saveCurrentTrack =(Preference) screen.findPreference(OsmandSettings.SAVE_CURRENT_TRACK);
 		saveCurrentTrack.setOnPreferenceClickListener(this);
 		routeServiceEnabled =(CheckBoxPreference) screen.findPreference(OsmandSettings.SERVICE_OFF_ENABLED);
@@ -637,15 +633,9 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 
 	@Override
 	public boolean onPreferenceClick(Preference preference) {
-		if(preference.getKey().equals(OsmandSettings.DOWNLOAD_INDEXES)){
-			startActivity(new Intent(this, DownloadIndexActivity.class));
-			return true;
-		} else if(preference.getKey().equals(OsmandSettings.LOCAL_INDEXES)){
+		if(preference.getKey().equals(OsmandSettings.LOCAL_INDEXES)){
 			startActivity(new Intent(this, LocalIndexesActivity.class));
 			return true;
-		} else if(preference.getKey().equals(OsmandSettings.RELOAD_INDEXES)){
-			reloadIndexes();
-			return true;
 		} else if(preference == saveCurrentTrack){
 			SavingTrackHelper helper = new SavingTrackHelper(this);
 			if (helper.hasDataToSave()) {

From 5c16661dfb018d5e43e74ba73b1933006069070b Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 20 Aug 2011 14:10:09 +0200
Subject: [PATCH 6/9] Add selection mode

---
 OsmAnd/res/layout/local_index.xml             |   8 +-
 OsmAnd/res/layout/local_index_list_item.xml   |   2 +-
 OsmAnd/res/values/strings.xml                 |   8 +-
 .../plus/activities/LocalIndexesActivity.java | 149 +++++++++++++++---
 4 files changed, 137 insertions(+), 30 deletions(-)

diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index adb2c94da7..665aee0f7f 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -6,9 +6,13 @@
   
 <LinearLayout android:id="@+id/LoadingPanel" android:layout_width="fill_parent" android:layout_height="wrap_content">
    <ProgressBar android:id="@+id/ProgressBar" android:paddingLeft="5dp" android:indeterminate="true" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-   <Button android:id="@+id/ReloadIndexes" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/local_index_reload"
-		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
+   <CheckBox android:id="@+id/SelectionMode" android:layout_width="wrap_content" android:layout_height="wrap_content"
+		android:layout_marginLeft = "3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
    <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"/>
+   <Button android:id="@+id/ActionButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/local_index_download"
+		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
+   <Button android:id="@+id/CancelButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/default_buttons_cancel"
+		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
    <Button android:id="@+id/DownloadButton" android:layout_width="wrap_content" android:layout_gravity="right" android:layout_height="wrap_content" android:text="@string/local_index_download"
 		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp"/>
 </LinearLayout>
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 245bc5e5c2..357ec433c9 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -5,7 +5,7 @@ android:orientation="vertical">
   <LinearLayout android:layout_width="fill_parent"	android:layout_height="wrap_content" android:layout_marginLeft="15dp">
 	<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
 		<CheckBox android:id="@+id/check_local_index" android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:gravity="center_vertical" android:focusable="false" android:visibility="visible"/>
+			android:gravity="center_vertical" android:focusable="false"/>
 	</LinearLayout>
 	<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
 		android:layout_weight="1" android:textSize="20sp"></TextView>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index d2f6eca1fa..40075e6a82 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-	
-	<string name="local_index_reload">Refresh locally</string>
-	<string name="local_index_download">Download New</string>
+	<string name="local_index_mi_restore">Restore</string>
+	<string name="local_index_mi_backup">Backup</string>
+	<string name="local_index_mi_delete">Delete</string>
+	<string name="local_index_mi_reload">Reload</string>
+	<string name="local_index_download">Download</string>
 	<string name="local_index_tile_data">Tile data %1$s - minimum zoom %2$d, maximum zoom %3$d</string>
 	<string name="local_index_poi_data">POI data</string>
 	<string name="local_index_address_data">Address data</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
index 83ee6ff9b1..19aa2ae1ae 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
@@ -2,7 +2,9 @@ package net.osmand.plus.activities;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import net.osmand.plus.ProgressDialogImplementation;
 import net.osmand.plus.R;
@@ -16,13 +18,20 @@ import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.view.View.OnClickListener;
 import android.widget.BaseExpandableListAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ExpandableListView;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 
 public class LocalIndexesActivity extends ExpandableListActivity {
 
@@ -31,6 +40,9 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 	private ProgressDialog progressDlg;
 	private LoadLocalIndexDescriptionTask descriptionLoader;
 
+	private boolean selectionMode = false;
+	private Set<LocalIndexInfo> selectedItems = new LinkedHashSet<LocalIndexInfo>();
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -49,11 +61,13 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 				startActivity(new Intent(LocalIndexesActivity.this, DownloadIndexActivity.class));
 			}
 		});
-		findViewById(R.id.ReloadIndexes).setOnClickListener(new View.OnClickListener() {
-
+		
+		((CheckBox)findViewById(R.id.SelectionMode)).setOnCheckedChangeListener(new OnCheckedChangeListener() {
+			
 			@Override
-			public void onClick(View v) {
-				reloadIndexes();
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+				selectionMode = isChecked;
+				listAdapter.notifyDataSetInvalidated();
 			}
 		});
 		setListAdapter(listAdapter);
@@ -84,17 +98,18 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		@Override
 		protected void onPostExecute(List<LocalIndexInfo> result) {
 			findViewById(R.id.ProgressBar).setVisibility(View.GONE);
-			findViewById(R.id.ReloadIndexes).setVisibility(View.VISIBLE);
+			findViewById(R.id.SelectionMode).setVisibility(View.VISIBLE);
+			
 		}
 
 	}
-	
+
 	public class LoadLocalIndexDescriptionTask extends AsyncTask<LocalIndexInfo, LocalIndexInfo, LocalIndexInfo[]> {
 
 		@Override
 		protected LocalIndexInfo[] doInBackground(LocalIndexInfo... params) {
 			LocalIndexHelper helper = new LocalIndexHelper((OsmandApplication) LocalIndexesActivity.this.getApplication());
-			for(LocalIndexInfo i : params){
+			for (LocalIndexInfo i : params) {
 				helper.updateDescription(i);
 			}
 			return params;
@@ -115,12 +130,12 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		}
 
 	}
-	
+
 	@Override
 	public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
 		LocalIndexInfo item = listAdapter.getChild(groupPosition, childPosition);
 		item.setExpanded(!item.isExpanded());
-		if(item.isExpanded()){
+		if (item.isExpanded()) {
 			descriptionLoader = new LoadLocalIndexDescriptionTask();
 			descriptionLoader.execute(item);
 		}
@@ -138,6 +153,27 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		asyncLoader.cancel(true);
 		descriptionLoader.cancel(true);
 	}
+	
+	private class SelectItemListener implements CompoundButton.OnCheckedChangeListener {
+		
+
+		private final LocalIndexInfo child;
+
+		public SelectItemListener(LocalIndexInfo child) {
+			this.child = child;
+		}
+
+		@Override
+		public void onCheckedChanged(CompoundButton v, boolean isChecked) {
+			if(isChecked){
+				selectedItems.add(child);
+			} else {
+				selectedItems.remove(child);
+			}
+		}
+
+		
+	}
 
 	protected class LocalIndexesAdapter extends BaseExpandableListAdapter {
 		List<List<LocalIndexInfo>> data = new ArrayList<List<LocalIndexInfo>>();
@@ -183,7 +219,7 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
 			View v = convertView;
 			LocalIndexInfo child = (LocalIndexInfo) getChild(groupPosition, childPosition);
-			if (v == null) {
+			if (v == null || selectionMode) {
 				LayoutInflater inflater = getLayoutInflater();
 				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item, parent, false);
 			}
@@ -210,12 +246,19 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 				((TextView) v.findViewById(R.id.local_index_size)).setText("");
 			}
 			TextView descr = ((TextView) v.findViewById(R.id.local_index_descr));
-			if(child.isExpanded()){
+			if (child.isExpanded()) {
 				descr.setVisibility(View.VISIBLE);
 				descr.setText(child.getDescription());
 			} else {
 				descr.setVisibility(View.GONE);
 			}
+			CheckBox checkbox = (CheckBox) v.findViewById(R.id.check_local_index);
+			checkbox.setVisibility(selectionMode ? View.VISIBLE : View.GONE);
+			if (selectionMode) {
+				checkbox.setSelected(selectedItems.contains(child));
+				checkbox.setOnCheckedChangeListener(new SelectItemListener(child));
+			}
+			
 
 			return v;
 		}
@@ -240,7 +283,6 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 			} else {
 				nameView.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
 			}
-			
 
 			return v;
 		}
@@ -269,30 +311,89 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		public boolean hasStableIds() {
 			return false;
 		}
-		
+
 		@Override
 		public boolean isChildSelectable(int groupPosition, int childPosition) {
 			return true;
 		}
-
 	}
+	
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, R.string.local_index_mi_reload, 0, R.string.local_index_mi_reload);
+		menu.add(0, R.string.local_index_mi_delete, 0, R.string.local_index_mi_delete);
+		menu.add(0, R.string.local_index_mi_restore, 0, R.string.local_index_mi_restore);
+		menu.add(0, R.string.local_index_mi_backup, 0, R.string.local_index_mi_backup);
+		
+		return true;
+	}
+	
+	private void openSelectionMode(String actionButton){
+		selectionMode = true;
+		selectedItems.clear();
+		Button action = (Button) findViewById(R.id.ActionButton);
+		action.setVisibility(View.VISIBLE);
+		action.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+			}
+		});
+		Button cancel = (Button) findViewById(R.id.CancelButton);
+		cancel.setVisibility(View.VISIBLE);
+		cancel.setOnClickListener(new View.OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				closeSelectionMode();
+			}
+		});
+		findViewById(R.id.DownloadButton).setVisibility(View.GONE);
+		listAdapter.notifyDataSetChanged();
+	}
+	
+	private void closeSelectionMode(){
+		selectionMode = false;
+		findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
+		findViewById(R.id.CancelButton).setVisibility(View.GONE);
+		findViewById(R.id.ActionButton).setVisibility(View.GONE);
+		listAdapter.notifyDataSetChanged();
+	}
+	
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if(item.getItemId() == R.string.local_index_mi_reload){
+			reloadIndexes();
+		} else if(item.getItemId() == R.string.local_index_mi_delete){
+			openSelectionMode(getString(R.string.local_index_mi_delete));
+		} else if(item.getItemId() == R.string.local_index_mi_backup){
+			openSelectionMode(getString(R.string.local_index_mi_backup));
+		} else if(item.getItemId() == R.string.local_index_mi_restore){
+			openSelectionMode(getString(R.string.local_index_mi_restore));
+		} else {
+			return super.onOptionsItemSelected(item);
+		}
+		return true;
+	}
+	
 
 	public void reloadIndexes() {
 		progressDlg = ProgressDialog.show(this, getString(R.string.loading_data), getString(R.string.reading_indexes), true);
 		final ProgressDialogImplementation impl = new ProgressDialogImplementation(progressDlg);
 		impl.setRunnable("Initializing app", new Runnable() { //$NON-NLS-1$
-				@Override
-				public void run() {
-					try {
-						showWarnings(((OsmandApplication) getApplication()).getResourceManager().reloadIndexes(impl));
-					} finally {
-						if (progressDlg != null) {
-							progressDlg.dismiss();
-							progressDlg = null;
+					@Override
+					public void run() {
+						try {
+							showWarnings(((OsmandApplication) getApplication()).getResourceManager().reloadIndexes(impl));
+						} finally {
+							if (progressDlg != null) {
+								progressDlg.dismiss();
+								progressDlg = null;
+							}
 						}
 					}
-				}
-		});
+				});
 		impl.run();
 	}
 

From cbc3cd560278501c8ee693ba1381e5c258521123 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 20 Aug 2011 18:56:34 +0200
Subject: [PATCH 7/9] Implement actions

---
 OsmAnd/res/layout/local_index.xml             |  17 +-
 OsmAnd/res/layout/local_index_list_item.xml   |   2 +-
 OsmAnd/res/values/strings.xml                 |   6 +
 .../plus/activities/LocalIndexHelper.java     |  10 +
 .../plus/activities/LocalIndexesActivity.java | 616 ++++++++++++------
 5 files changed, 459 insertions(+), 192 deletions(-)

diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index 665aee0f7f..53f78d3671 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -4,17 +4,20 @@
   android:layout_width="fill_parent"
   android:layout_height="fill_parent" android:orientation="vertical">
   
-<LinearLayout android:id="@+id/LoadingPanel" android:layout_width="fill_parent" android:layout_height="wrap_content">
-   <ProgressBar android:id="@+id/ProgressBar" android:paddingLeft="5dp" android:indeterminate="true" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-   <CheckBox android:id="@+id/SelectionMode" android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:layout_marginLeft = "3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
-   <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"/>
+<LinearLayout android:id="@+id/LoadingPanel" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3dp">
+   <Button android:id="@+id/DownloadButton" android:layout_width="wrap_content" android:layout_gravity="right" android:layout_height="wrap_content" android:text="@string/local_index_download"
+		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp"/>
+   <TextView android:id="@+id/DescriptionText"  android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1"
+   			android:text="@string/local_index_description"/> 
+   <LinearLayout android:id="@+id/FillLayoutStart"  android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" android:visibility="gone"/>
    <Button android:id="@+id/ActionButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/local_index_download"
 		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
    <Button android:id="@+id/CancelButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/default_buttons_cancel"
 		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp" android:visibility="gone"/>
-   <Button android:id="@+id/DownloadButton" android:layout_width="wrap_content" android:layout_gravity="right" android:layout_height="wrap_content" android:text="@string/local_index_download"
-		android:layout_marginLeft = "3dp" android:layout_marginTop ="3dp" android:layout_marginRight = "3dp"/>
+  
+	<LinearLayout android:id="@+id/FillLayoutEnd"  android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" android:visibility="gone"/>
+	<ProgressBar android:id="@+id/ProgressBar" android:layout_marginLeft="5dp" android:indeterminate="true" android:layout_width="wrap_content" android:layout_height="wrap_content"
+      android:layout_marginRight="5dp"/>
 </LinearLayout>
 
 
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 357ec433c9..f48f117879 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -8,7 +8,7 @@ android:orientation="vertical">
 			android:gravity="center_vertical" android:focusable="false"/>
 	</LinearLayout>
 	<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:layout_weight="1" android:textSize="20sp"></TextView>
+		android:layout_weight="1" android:textSize="20sp" android:layout_marginLeft="8dp"></TextView>
 
 	<TextView android:id="@+id/local_index_size" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="75dp"
 		android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 40075e6a82..d4b816efb0 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+	<string name="local_index_items_backuped">%1$d items of %2$d were succesfully backuped.</string>
+	<string name="local_index_items_deleted">%1$d items of %2$d were succesfully deleted.</string>
+	<string name="local_index_items_restored">%1$d items of %2$d were succesfully restored.</string>
+	<string name="local_index_no_items_to_do">No items to %1$s</string>	
+    <string name="local_index_action_do">You are about to %1$s %2$s items. Are you sure?</string>
+	<string name="local_index_description">Offline data available on the phone.\n You can download new or backup and delete existing data.</string>
 	<string name="local_index_mi_restore">Restore</string>
 	<string name="local_index_mi_backup">Backup</string>
 	<string name="local_index_mi_delete">Delete</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
index ffb97b99e0..4b6447ce62 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
@@ -239,6 +239,7 @@ public class LocalIndexHelper {
 		private boolean notSupported = false;
 		private boolean loaded;
 		private String pathToData;
+		private String fileName;
 		private boolean singleFile;
 		private int kbSize = -1;
 		
@@ -247,6 +248,7 @@ public class LocalIndexHelper {
 		
 		public LocalIndexInfo(LocalIndexType type, File f, boolean backuped){
 			pathToData = f.getAbsolutePath();
+			fileName = f.getName();
 			name = formatName(f.getName());
 			this.type = type;
 			singleFile = !f.isDirectory();
@@ -277,6 +279,10 @@ public class LocalIndexHelper {
 			}
 		}
 		
+		public void setBackupedData(boolean backupedData) {
+			this.backupedData = backupedData;
+		}
+		
 		public void setSize(int size) {
 			this.kbSize = size;
 		}
@@ -345,6 +351,10 @@ public class LocalIndexHelper {
 			return description;
 		}
 		
+		public String getFileName() {
+			return fileName;
+		}
+		
 	}
 
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
index 19aa2ae1ae..c6911f42bb 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
@@ -1,22 +1,32 @@
 package net.osmand.plus.activities;
 
+import java.io.File;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
+import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.ProgressDialogImplementation;
 import net.osmand.plus.R;
+import net.osmand.plus.ResourceManager;
 import net.osmand.plus.activities.LocalIndexHelper.LocalIndexInfo;
+import net.osmand.plus.activities.LocalIndexHelper.LocalIndexType;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.ExpandableListActivity;
 import android.app.ProgressDialog;
+import android.app.AlertDialog.Builder;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.AsyncTask.Status;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -27,11 +37,9 @@ import android.view.View.OnClickListener;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.ExpandableListView;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 
 public class LocalIndexesActivity extends ExpandableListActivity {
 
@@ -39,9 +47,14 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 	private LocalIndexesAdapter listAdapter;
 	private ProgressDialog progressDlg;
 	private LoadLocalIndexDescriptionTask descriptionLoader;
+	private LocalIndexOperationTask operationTask;
 
 	private boolean selectionMode = false;
 	private Set<LocalIndexInfo> selectedItems = new LinkedHashSet<LocalIndexInfo>();
+	
+	protected static int DELETE_OPERATION = 1;
+	protected static int BACKUP_OPERATION = 2;
+	protected static int RESTORE_OPERATION = 3;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -62,14 +75,6 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 			}
 		});
 		
-		((CheckBox)findViewById(R.id.SelectionMode)).setOnCheckedChangeListener(new OnCheckedChangeListener() {
-			
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-				selectionMode = isChecked;
-				listAdapter.notifyDataSetInvalidated();
-			}
-		});
 		setListAdapter(listAdapter);
 	}
 
@@ -78,7 +83,7 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 
 		@Override
 		protected List<LocalIndexInfo> doInBackground(Activity... params) {
-			LocalIndexHelper helper = new LocalIndexHelper((OsmandApplication) params[0].getApplication());
+			LocalIndexHelper helper = new LocalIndexHelper((OsmandApplication) getApplication());
 			progress.clear();
 			return helper.getAllLocalIndexData(this);
 		}
@@ -87,6 +92,11 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 			publishProgress(loaded);
 		}
 
+		@Override
+		protected void onPreExecute() {
+			findViewById(R.id.ProgressBar).setVisibility(View.VISIBLE);
+		}
+		
 		@Override
 		protected void onProgressUpdate(LocalIndexInfo... values) {
 			for (LocalIndexInfo v : values) {
@@ -98,9 +108,114 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		@Override
 		protected void onPostExecute(List<LocalIndexInfo> result) {
 			findViewById(R.id.ProgressBar).setVisibility(View.GONE);
-			findViewById(R.id.SelectionMode).setVisibility(View.VISIBLE);
+		}
+
+	}
+	
+	public class LocalIndexOperationTask extends AsyncTask<LocalIndexInfo, LocalIndexInfo, String> {
+		
+		private final int operation;
+		private OsmandSettings settings;
+
+		public LocalIndexOperationTask(int operation){
+			this.operation = operation;
+			settings = ((OsmandApplication) getApplication()).getSettings();
+		}
+		
+		public File getFileToRestore(LocalIndexInfo i){
+			if(i.isBackupedData()){
+				File parent = new File(i.getPathToData()).getParentFile();
+				if(i.getType() == LocalIndexType.GPX_DATA){
+					parent = settings.extendOsmandPath(ResourceManager.GPX_PATH);
+				} else if(i.getType() == LocalIndexType.MAP_DATA){
+					parent = settings.extendOsmandPath(ResourceManager.MAPS_PATH);
+				} else if(i.getType() == LocalIndexType.POI_DATA){
+					parent = settings.extendOsmandPath(ResourceManager.POI_PATH);
+				} else if(i.getType() == LocalIndexType.TILES_DATA){
+					parent = settings.extendOsmandPath(ResourceManager.TILES_PATH);
+				} else if(i.getType() == LocalIndexType.VOICE_DATA){
+					parent = settings.extendOsmandPath(ResourceManager.VOICE_PATH);
+				} else if(i.getType() == LocalIndexType.TTS_VOICE_DATA){
+					parent = settings.extendOsmandPath(ResourceManager.VOICE_PATH);
+				}
+				return new File(parent, i.getFileName());
+			}
+			return new File(i.getPathToData());
+		}
+		
+		private File getFileToBackup(LocalIndexInfo i) {
+			if(!i.isBackupedData()){
+				return new File(settings.extendOsmandPath(ResourceManager.BACKUP_PATH), i.getFileName());
+			}
+			return new File(i.getPathToData());
+		}
+		
+		private boolean move(File from, File to){
+			return from.renameTo(to);
+		}
+		
+		@Override
+		protected String doInBackground(LocalIndexInfo... params) {
+			int count = 0;
+			int total = 0;
+			for(LocalIndexInfo info : params) {
+				if(!isCancelled()){
+					boolean successfull = false;
+					if(operation == DELETE_OPERATION){
+						File f = new File(info.getPathToData());
+						successfull = f.delete();
+					} else if(operation == RESTORE_OPERATION){
+						successfull = move(new File(info.getPathToData()), getFileToRestore(info));
+						if(successfull){
+							info.setBackupedData(false);
+						}
+					} else if(operation == BACKUP_OPERATION){
+						successfull = move(new File(info.getPathToData()), getFileToBackup(info));
+						if(successfull){
+							info.setBackupedData(true);
+						}
+					}
+					total ++;
+					if(successfull){
+						count++;
+						publishProgress(info);
+					}
+				}
+			}
+			if(operation == DELETE_OPERATION){
+				return getString(R.string.local_index_items_deleted, count, total);
+			} else if(operation == BACKUP_OPERATION){
+				return getString(R.string.local_index_items_backuped, count, total);
+			} else if(operation == RESTORE_OPERATION){
+				return getString(R.string.local_index_items_restored, count, total);
+			}  
+			return "";
+		}
+
+
+		@Override
+		protected void onProgressUpdate(LocalIndexInfo... values) {
+			if(operation == DELETE_OPERATION){
+				listAdapter.delete(values);
+			} else if(operation == BACKUP_OPERATION){
+				listAdapter.move(values, false);
+			} else if(operation == RESTORE_OPERATION){
+				listAdapter.move(values, true);
+			}
 			
 		}
+		
+		@Override
+		protected void onPreExecute() {
+			findViewById(R.id.ProgressBar).setVisibility(View.VISIBLE);
+		}
+
+		@Override
+		protected void onPostExecute(String result) {
+			findViewById(R.id.ProgressBar).setVisibility(View.GONE);
+			Toast.makeText(LocalIndexesActivity.this, result, Toast.LENGTH_LONG).show();
+			reloadIndexes();
+		}
 
 	}
 
@@ -108,7 +223,7 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 
 		@Override
 		protected LocalIndexInfo[] doInBackground(LocalIndexInfo... params) {
-			LocalIndexHelper helper = new LocalIndexHelper((OsmandApplication) LocalIndexesActivity.this.getApplication());
+			LocalIndexHelper helper = new LocalIndexHelper((OsmandApplication) getApplication());
 			for (LocalIndexInfo i : params) {
 				helper.updateDescription(i);
 			}
@@ -142,6 +257,14 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		listAdapter.notifyDataSetInvalidated();
 		return true;
 	}
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		if(operationTask != null){
+			operationTask.cancel(true);
+		}
+	}
 
 	@Override
 	protected void onDestroy() {
@@ -154,190 +277,79 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		descriptionLoader.cancel(true);
 	}
 	
-	private class SelectItemListener implements CompoundButton.OnCheckedChangeListener {
-		
-
-		private final LocalIndexInfo child;
-
-		public SelectItemListener(LocalIndexInfo child) {
-			this.child = child;
-		}
-
-		@Override
-		public void onCheckedChanged(CompoundButton v, boolean isChecked) {
-			if(isChecked){
-				selectedItems.add(child);
-			} else {
-				selectedItems.remove(child);
-			}
-		}
-
-		
-	}
-
-	protected class LocalIndexesAdapter extends BaseExpandableListAdapter {
-		List<List<LocalIndexInfo>> data = new ArrayList<List<LocalIndexInfo>>();
-		List<LocalIndexInfo> category = new ArrayList<LocalIndexInfo>();
-		private MessageFormat formatMb;
-
-		public LocalIndexesAdapter() {
-			formatMb = new MessageFormat("{0, number,##.#} MB");
-		}
-
-		public void addLocalIndexInfo(LocalIndexInfo info) {
-			int found = -1;
-			// search from end
-			for (int i = category.size() - 1; i >= 0; i--) {
-				LocalIndexInfo cat = category.get(i);
-				if (cat.getType() == info.getType() && info.isBackupedData() == cat.isBackupedData()) {
-					found = i;
-					break;
-				}
-			}
-			if (found == -1) {
-				found = category.size();
-				category.add(new LocalIndexInfo(info.getType(), info.isBackupedData()));
-			}
-			if (found >= data.size()) {
-				data.add(new ArrayList<LocalIndexInfo>());
-			}
-			data.get(found).add(info);
-		}
-
-		@Override
-		public LocalIndexInfo getChild(int groupPosition, int childPosition) {
-			return data.get(groupPosition).get(childPosition);
-		}
-
-		@Override
-		public long getChildId(int groupPosition, int childPosition) {
-			// it would be unusable to have 10000 local indexes
-			return groupPosition * 10000 + childPosition;
-		}
-
-		@Override
-		public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
-			View v = convertView;
-			LocalIndexInfo child = (LocalIndexInfo) getChild(groupPosition, childPosition);
-			if (v == null || selectionMode) {
-				LayoutInflater inflater = getLayoutInflater();
-				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item, parent, false);
-			}
-			TextView viewName = ((TextView) v.findViewById(R.id.local_index_name));
-			viewName.setText(child.getName());
-			if (child.isNotSupported()) {
-				viewName.setTextColor(Color.RED);
-			} else if (child.isCorrupted()) {
-				viewName.setTextColor(Color.MAGENTA);
-			} else if (child.isLoaded()) {
-				viewName.setTextColor(Color.GREEN);
-			} else {
-				viewName.setTextColor(Color.LTGRAY);
-			}
-			if (child.getSize() >= 0) {
-				String size;
-				if (child.getSize() > 100) {
-					size = formatMb.format(new Object[] { (float) child.getSize() / (1 << 10) });
-				} else {
-					size = child.getSize() + " Kb";
-				}
-				((TextView) v.findViewById(R.id.local_index_size)).setText(size);
-			} else {
-				((TextView) v.findViewById(R.id.local_index_size)).setText("");
-			}
-			TextView descr = ((TextView) v.findViewById(R.id.local_index_descr));
-			if (child.isExpanded()) {
-				descr.setVisibility(View.VISIBLE);
-				descr.setText(child.getDescription());
-			} else {
-				descr.setVisibility(View.GONE);
-			}
-			CheckBox checkbox = (CheckBox) v.findViewById(R.id.check_local_index);
-			checkbox.setVisibility(selectionMode ? View.VISIBLE : View.GONE);
-			if (selectionMode) {
-				checkbox.setSelected(selectedItems.contains(child));
-				checkbox.setOnCheckedChangeListener(new SelectItemListener(child));
-			}
-			
-
-			return v;
-		}
-
-		@Override
-		public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
-			View v = convertView;
-			LocalIndexInfo group = getGroup(groupPosition);
-			if (v == null) {
-				LayoutInflater inflater = getLayoutInflater();
-				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item_category, parent, false);
-			}
-			StringBuilder t = new StringBuilder(group.getType().getHumanString(LocalIndexesActivity.this));
-			if (group.isBackupedData()) {
-				t.append("* ");
-			}
-			TextView nameView = ((TextView) v.findViewById(R.id.local_index_category_name));
-			t.append(" [").append(getChildrenCount(groupPosition)).append(" ").append(getString(R.string.local_index_items)).append("]");
-			nameView.setText(t.toString());
-			if (!group.isBackupedData()) {
-				nameView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
-			} else {
-				nameView.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
-			}
-
-			return v;
-		}
-
-		@Override
-		public int getChildrenCount(int groupPosition) {
-			return data.get(groupPosition).size();
-		}
-
-		@Override
-		public LocalIndexInfo getGroup(int groupPosition) {
-			return category.get(groupPosition);
-		}
-
-		@Override
-		public int getGroupCount() {
-			return category.size();
-		}
-
-		@Override
-		public long getGroupId(int groupPosition) {
-			return groupPosition;
-		}
-
-		@Override
-		public boolean hasStableIds() {
-			return false;
-		}
-
-		@Override
-		public boolean isChildSelectable(int groupPosition, int childPosition) {
-			return true;
-		}
-	}
 	
+
 	
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		menu.add(0, R.string.local_index_mi_reload, 0, R.string.local_index_mi_reload);
-		menu.add(0, R.string.local_index_mi_delete, 0, R.string.local_index_mi_delete);
-		menu.add(0, R.string.local_index_mi_restore, 0, R.string.local_index_mi_restore);
 		menu.add(0, R.string.local_index_mi_backup, 0, R.string.local_index_mi_backup);
-		
+		menu.add(0, R.string.local_index_mi_reload, 1, R.string.local_index_mi_reload);
+		menu.add(0, R.string.local_index_mi_delete, 2, R.string.local_index_mi_delete);
+		menu.add(0, R.string.local_index_mi_restore, 3, R.string.local_index_mi_restore);
 		return true;
 	}
 	
-	private void openSelectionMode(String actionButton){
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		if(operationTask == null || operationTask.getStatus() == Status.FINISHED){
+			menu.setGroupVisible(0, true);
+		} else {
+			menu.setGroupVisible(0, false);
+		}
+		return true;
+	}
+	
+	public void doAction(int actionResId){
+		if(actionResId == R.string.local_index_mi_backup){
+			operationTask = new LocalIndexOperationTask(BACKUP_OPERATION);
+		} else if(actionResId == R.string.local_index_mi_delete){
+			operationTask = new LocalIndexOperationTask(DELETE_OPERATION);
+		} else if(actionResId == R.string.local_index_mi_restore){
+			operationTask = new LocalIndexOperationTask(RESTORE_OPERATION);
+		} else {
+			operationTask = null;
+		}
+		if(operationTask != null){
+			operationTask.execute(selectedItems.toArray(new LocalIndexInfo[selectedItems.size()]));
+		}
+		closeSelectionMode();
+	}
+	
+	private void openSelectionMode(final int actionResId){
+		final String actionButton = getString(actionResId);
+		if(listAdapter.getGroupCount() == 0){
+			listAdapter.cancelFilter();
+			Toast.makeText(LocalIndexesActivity.this, getString(R.string.local_index_no_items_to_do, actionButton.toLowerCase()), Toast.LENGTH_SHORT).show();
+			return;
+		}
+		
+		
 		selectionMode = true;
 		selectedItems.clear();
 		Button action = (Button) findViewById(R.id.ActionButton);
 		action.setVisibility(View.VISIBLE);
+		action.setText(actionButton);
 		action.setOnClickListener(new OnClickListener() {
 			
 			@Override
 			public void onClick(View v) {
+				if(selectedItems.isEmpty()){
+					Toast.makeText(LocalIndexesActivity.this, getString(R.string.local_index_no_items_to_do, actionButton.toLowerCase()), Toast.LENGTH_SHORT).show();
+					return;
+				}
+				
+				Builder builder = new AlertDialog.Builder(LocalIndexesActivity.this);
+				builder.setMessage(getString(R.string.local_index_action_do, actionButton.toLowerCase(), selectedItems.size()));
+				builder.setPositiveButton(actionButton, new DialogInterface.OnClickListener() {
+					
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						doAction(actionResId);
+					}
+				});
+				builder.setNegativeButton(R.string.default_buttons_cancel, null);
+				builder.show();
+				
 			}
 		});
 		Button cancel = (Button) findViewById(R.id.CancelButton);
@@ -350,14 +362,21 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 			}
 		});
 		findViewById(R.id.DownloadButton).setVisibility(View.GONE);
+		findViewById(R.id.DescriptionText).setVisibility(View.GONE);
+		findViewById(R.id.FillLayoutStart).setVisibility(View.VISIBLE);
+		findViewById(R.id.FillLayoutEnd).setVisibility(View.VISIBLE);
 		listAdapter.notifyDataSetChanged();
 	}
 	
 	private void closeSelectionMode(){
 		selectionMode = false;
 		findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
+		findViewById(R.id.DescriptionText).setVisibility(View.VISIBLE);
+		findViewById(R.id.FillLayoutStart).setVisibility(View.GONE);
+		findViewById(R.id.FillLayoutEnd).setVisibility(View.GONE);
 		findViewById(R.id.CancelButton).setVisibility(View.GONE);
 		findViewById(R.id.ActionButton).setVisibility(View.GONE);
+		listAdapter.cancelFilter();
 		listAdapter.notifyDataSetChanged();
 	}
 	
@@ -366,11 +385,14 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		if(item.getItemId() == R.string.local_index_mi_reload){
 			reloadIndexes();
 		} else if(item.getItemId() == R.string.local_index_mi_delete){
-			openSelectionMode(getString(R.string.local_index_mi_delete));
+			openSelectionMode(R.string.local_index_mi_delete);
 		} else if(item.getItemId() == R.string.local_index_mi_backup){
-			openSelectionMode(getString(R.string.local_index_mi_backup));
+			listAdapter.filterCategories(false);
+			listAdapter.filterCategories(LocalIndexType.MAP_DATA, LocalIndexType.POI_DATA);
+			openSelectionMode(R.string.local_index_mi_backup);
 		} else if(item.getItemId() == R.string.local_index_mi_restore){
-			openSelectionMode(getString(R.string.local_index_mi_restore));
+			listAdapter.filterCategories(true);
+			openSelectionMode(R.string.local_index_mi_restore);
 		} else {
 			return super.onOptionsItemSelected(item);
 		}
@@ -418,4 +440,230 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		}
 	}
 
+	
+
+	protected class LocalIndexesAdapter extends BaseExpandableListAdapter {
+		Map<LocalIndexInfo, List<LocalIndexInfo>> data = new LinkedHashMap<LocalIndexInfo, List<LocalIndexInfo>>();
+		List<LocalIndexInfo> category = new ArrayList<LocalIndexInfo>();
+		List<LocalIndexInfo> filterCategory = null;
+		
+		private MessageFormat formatMb;
+
+		public LocalIndexesAdapter() {
+			formatMb = new MessageFormat("{0, number,##.#} MB");
+		}
+		
+		public LocalIndexInfo findCategory(LocalIndexInfo val, boolean backuped){
+			for(LocalIndexInfo i : category){
+				if(i.isBackupedData() == backuped && val.getType() == i.getType() ){
+					return i;
+				}
+			}
+			LocalIndexInfo newCat = new LocalIndexInfo(val.getType(), backuped);
+			category.add(newCat);
+			data.put(newCat, new ArrayList<LocalIndexInfo>());
+			return newCat;
+		}
+		
+		public void delete(LocalIndexInfo[] values) {
+			for(LocalIndexInfo i : values){
+				LocalIndexInfo c = findCategory(i, i.isBackupedData());
+				if(c != null){
+					data.get(c).remove(i);
+				}
+			}
+			listAdapter.notifyDataSetChanged();
+		}
+		
+		public void move(LocalIndexInfo[] values, boolean oldBackupState) {
+			for(LocalIndexInfo i : values){
+				LocalIndexInfo c = findCategory(i, oldBackupState);
+				if(c != null){
+					data.get(c).remove(i);
+				}
+				c = findCategory(i, !oldBackupState);
+				if(c != null){
+					data.get(c).add(i);
+				}
+			}
+			listAdapter.notifyDataSetChanged();
+		}
+
+		public void cancelFilter(){
+			filterCategory = null;
+			notifyDataSetChanged();
+		}
+		
+		public void filterCategories(LocalIndexType... types) {
+			List<LocalIndexInfo> filter = new ArrayList<LocalIndexInfo>();
+			List<LocalIndexInfo> source = filterCategory == null ? category : filterCategory;
+			for (LocalIndexInfo info : source) {
+				for (LocalIndexType ts : types) {
+					if (info.getType() == ts) {
+						filter.add(info);
+					}
+				}
+			}
+			filterCategory = filter;
+			notifyDataSetChanged();
+		}
+		
+		public void filterCategories(boolean backup) {
+			List<LocalIndexInfo> filter = new ArrayList<LocalIndexInfo>();
+			List<LocalIndexInfo> source = filterCategory == null ? category : filterCategory;
+			for (LocalIndexInfo info : source) {
+				if (info.isBackupedData() == backup) {
+					filter.add(info);
+				}
+			}
+			filterCategory = filter;
+			notifyDataSetChanged();
+		}
+
+		public void addLocalIndexInfo(LocalIndexInfo info) {
+			int found = -1;
+			// search from end
+			for (int i = category.size() - 1; i >= 0; i--) {
+				LocalIndexInfo cat = category.get(i);
+				if (cat.getType() == info.getType() && info.isBackupedData() == cat.isBackupedData()) {
+					found = i;
+					break;
+				}
+			}
+			if (found == -1) {
+				found = category.size();
+				category.add(new LocalIndexInfo(info.getType(), info.isBackupedData()));
+			}
+			if (!data.containsKey(category.get(found))) {
+				data.put(category.get(found), new ArrayList<LocalIndexInfo>());
+			}
+			data.get(category.get(found)).add(info);
+		}
+
+		@Override
+		public LocalIndexInfo getChild(int groupPosition, int childPosition) {
+			LocalIndexInfo cat = filterCategory != null ? filterCategory.get(groupPosition) : category.get(groupPosition);
+			return data.get(cat).get(childPosition);
+		}
+
+		@Override
+		public long getChildId(int groupPosition, int childPosition) {
+			// it would be unusable to have 10000 local indexes
+			return groupPosition * 10000 + childPosition;
+		}
+
+		@Override
+		public View getChildView(int groupPosition, int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
+			View v = convertView;
+			final LocalIndexInfo child = (LocalIndexInfo) getChild(groupPosition, childPosition);
+			if (v == null ) {
+				LayoutInflater inflater = getLayoutInflater();
+				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item, parent, false);
+			}
+			TextView viewName = ((TextView) v.findViewById(R.id.local_index_name));
+			viewName.setText(child.getName());
+			if (child.isNotSupported()) {
+				viewName.setTextColor(Color.RED);
+			} else if (child.isCorrupted()) {
+				viewName.setTextColor(Color.MAGENTA);
+			} else if (child.isLoaded()) {
+				viewName.setTextColor(Color.GREEN);
+			} else {
+				viewName.setTextColor(Color.LTGRAY);
+			}
+			if (child.getSize() >= 0) {
+				String size;
+				if (child.getSize() > 100) {
+					size = formatMb.format(new Object[] { (float) child.getSize() / (1 << 10) });
+				} else {
+					size = child.getSize() + " Kb";
+				}
+				((TextView) v.findViewById(R.id.local_index_size)).setText(size);
+			} else {
+				((TextView) v.findViewById(R.id.local_index_size)).setText("");
+			}
+			TextView descr = ((TextView) v.findViewById(R.id.local_index_descr));
+			if (child.isExpanded()) {
+				descr.setVisibility(View.VISIBLE);
+				descr.setText(child.getDescription());
+			} else {
+				descr.setVisibility(View.GONE);
+			}
+			final CheckBox checkbox = (CheckBox) v.findViewById(R.id.check_local_index);
+			checkbox.setVisibility(selectionMode ? View.VISIBLE : View.GONE);
+			if (selectionMode) {
+				checkbox.setChecked(selectedItems.contains(child));
+				checkbox.setOnClickListener(new View.OnClickListener() {
+					
+					@Override
+					public void onClick(View v) {
+						if(checkbox.isChecked()){
+							selectedItems.add(child);
+						} else {
+							selectedItems.remove(child);
+						}
+					}
+				});
+			}
+			
+
+			return v;
+		}
+
+		@Override
+		public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
+			View v = convertView;
+			LocalIndexInfo group = getGroup(groupPosition);
+			if (v == null) {
+				LayoutInflater inflater = getLayoutInflater();
+				v = inflater.inflate(net.osmand.plus.R.layout.local_index_list_item_category, parent, false);
+			}
+			StringBuilder t = new StringBuilder(group.getType().getHumanString(LocalIndexesActivity.this));
+			if (group.isBackupedData()) {
+				t.append("* ");
+			}
+			TextView nameView = ((TextView) v.findViewById(R.id.local_index_category_name));
+			t.append(" [").append(getChildrenCount(groupPosition)).append(" ").append(getString(R.string.local_index_items)).append("]");
+			nameView.setText(t.toString());
+			if (!group.isBackupedData()) {
+				nameView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
+			} else {
+				nameView.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
+			}
+
+			return v;
+		}
+
+		@Override
+		public int getChildrenCount(int groupPosition) {
+			LocalIndexInfo cat = filterCategory != null ? filterCategory.get(groupPosition) : category.get(groupPosition);
+			return data.get(cat).size();
+		}
+
+		@Override
+		public LocalIndexInfo getGroup(int groupPosition) {
+			return filterCategory == null ?  category.get(groupPosition)  : filterCategory.get(groupPosition);
+		}
+
+		@Override
+		public int getGroupCount() {
+			return filterCategory == null ?  category.size() : filterCategory.size();
+		}
+
+		@Override
+		public long getGroupId(int groupPosition) {
+			return groupPosition;
+		}
+
+		@Override
+		public boolean hasStableIds() {
+			return false;
+		}
+
+		@Override
+		public boolean isChildSelectable(int groupPosition, int childPosition) {
+			return true;
+		}
+	}
+	
 }

From bb264fb38a3ba715e4a0ee0bda1ce8e2004b66bb Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 20 Aug 2011 21:01:31 +0200
Subject: [PATCH 8/9] Update progress

---
 .../src/net/osmand/IProgress.java             | 27 +++++++
 OsmAnd/res/values/strings.xml                 |  2 +-
 .../plus/activities/LocalIndexesActivity.java | 76 ++++++++++---------
 3 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/IProgress.java b/DataExtractionOSM/src/net/osmand/IProgress.java
index 68cd736ee5..3f349573ef 100644
--- a/DataExtractionOSM/src/net/osmand/IProgress.java
+++ b/DataExtractionOSM/src/net/osmand/IProgress.java
@@ -26,5 +26,32 @@ public interface IProgress {
 	public boolean isIndeterminate();
 	
 	public boolean isInterrupted();
+	
+	public IProgress EMPTY_PROGRESS = new IProgress() {
+		
+		@Override
+		public void startWork(int work) {}
+		
+		@Override
+		public void startTask(String taskName, int work) {}
+		
+		@Override
+		public void setGeneralProgress(String genProgress) {}
+		
+		@Override
+		public void remaining(int remainingWork) {}
+		
+		@Override
+		public void progress(int deltaWork) {}
+		
+		@Override
+		public boolean isInterrupted() {return false;}
+		
+		@Override
+		public boolean isIndeterminate() {return false;}
+		
+		@Override
+		public void finishTask() {}
+	};  
 
 }
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index d4b816efb0..f68733e819 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,7 +11,7 @@
 	<string name="local_index_mi_delete">Delete</string>
 	<string name="local_index_mi_reload">Reload</string>
 	<string name="local_index_download">Download</string>
-	<string name="local_index_tile_data">Tile data %1$s - minimum zoom %2$d, maximum zoom %3$d</string>
+	<string name="local_index_tile_data">Tile data: \n %1$s - minimum zoom \n %2$d, maximum zoom %3$d</string>
 	<string name="local_index_poi_data">POI data</string>
 	<string name="local_index_address_data">Address data</string>
 	<string name="local_index_transport_data">Transport data</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
index c6911f42bb..3239ba09e1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import net.osmand.IProgress;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.ProgressDialogImplementation;
 import net.osmand.plus.R;
@@ -45,7 +46,6 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 
 	private AsyncTask<Activity, LocalIndexInfo, List<LocalIndexInfo>> asyncLoader;
 	private LocalIndexesAdapter listAdapter;
-	private ProgressDialog progressDlg;
 	private LoadLocalIndexDescriptionTask descriptionLoader;
 	private LocalIndexOperationTask operationTask;
 
@@ -151,6 +151,9 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		}
 		
 		private boolean move(File from, File to){
+			if(!to.getParentFile().exists()){
+				to.getParentFile().mkdirs();
+			}
 			return from.renameTo(to);
 		}
 		
@@ -254,6 +257,9 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 			descriptionLoader = new LoadLocalIndexDescriptionTask();
 			descriptionLoader.execute(item);
 		}
+		if(selectionMode){
+			selectedItems.add(item);
+		}
 		listAdapter.notifyDataSetInvalidated();
 		return true;
 	}
@@ -269,10 +275,6 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
-		if (progressDlg != null) {
-			progressDlg.dismiss();
-			progressDlg = null;
-		}
 		asyncLoader.cancel(true);
 		descriptionLoader.cancel(true);
 	}
@@ -401,43 +403,43 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 	
 
 	public void reloadIndexes() {
-		progressDlg = ProgressDialog.show(this, getString(R.string.loading_data), getString(R.string.reading_indexes), true);
-		final ProgressDialogImplementation impl = new ProgressDialogImplementation(progressDlg);
-		impl.setRunnable("Initializing app", new Runnable() { //$NON-NLS-1$
-					@Override
-					public void run() {
-						try {
-							showWarnings(((OsmandApplication) getApplication()).getResourceManager().reloadIndexes(impl));
-						} finally {
-							if (progressDlg != null) {
-								progressDlg.dismiss();
-								progressDlg = null;
-							}
+		AsyncTask<Void, String, List<String>> task = new AsyncTask<Void, String, List<String>>(){
+
+			@Override
+			protected void onPostExecute(List<String> warnings) {
+				findViewById(R.id.ProgressBar).setVisibility(View.INVISIBLE);
+				if (!warnings.isEmpty()) {
+					final StringBuilder b = new StringBuilder();
+					boolean f = true;
+					for (String w : warnings) {
+						if (f) {
+							f = false;
+						} else {
+							b.append('\n');
 						}
+						b.append(w);
 					}
-				});
-		impl.run();
+					Toast.makeText(LocalIndexesActivity.this, b.toString(), Toast.LENGTH_LONG).show();
+				}
+			}
+			
+			@Override
+			protected void onPreExecute() {
+				super.onPreExecute();
+				findViewById(R.id.ProgressBar).setVisibility(View.VISIBLE);
+			}
+			@Override
+			protected List<String> doInBackground(Void... params) {
+				return ((OsmandApplication) getApplication()).getResourceManager().reloadIndexes(IProgress.EMPTY_PROGRESS);
+			}
+			
+		};
+		task.execute();
+		
 	}
 
 	protected void showWarnings(List<String> warnings) {
-		if (!warnings.isEmpty()) {
-			final StringBuilder b = new StringBuilder();
-			boolean f = true;
-			for (String w : warnings) {
-				if (f) {
-					f = false;
-				} else {
-					b.append('\n');
-				}
-				b.append(w);
-			}
-			runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					Toast.makeText(LocalIndexesActivity.this, b.toString(), Toast.LENGTH_LONG).show();
-				}
-			});
-		}
+		
 	}
 
 	

From 18867f962b8408abc858b384841aa0d4354d1028 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sat, 20 Aug 2011 22:32:59 +0200
Subject: [PATCH 9/9] Add detailed information

---
 OsmAnd/res/values/strings.xml                 |  4 +-
 .../src/net/osmand/plus/SQLiteTileSource.java | 15 ++++
 .../plus/activities/LocalIndexHelper.java     | 81 ++++++++++++++++++-
 .../plus/activities/LocalIndexesActivity.java | 11 +--
 4 files changed, 99 insertions(+), 12 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index f68733e819..7f7ca8b470 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+	<string name="local_index_gpx_info">Subtracks : %1$d\nTotal Points : %2$d\nWay points : %3$d</string>
+	<string name="local_index_installed">Installed</string>
 	<string name="local_index_items_backuped">%1$d items of %2$d were succesfully backuped.</string>
 	<string name="local_index_items_deleted">%1$d items of %2$d were succesfully deleted.</string>
 	<string name="local_index_items_restored">%1$d items of %2$d were succesfully restored.</string>
@@ -11,7 +13,7 @@
 	<string name="local_index_mi_delete">Delete</string>
 	<string name="local_index_mi_reload">Reload</string>
 	<string name="local_index_download">Download</string>
-	<string name="local_index_tile_data">Tile data: \n %1$s - minimum zoom \n %2$d, maximum zoom %3$d</string>
+	<string name="local_index_tile_data">Tile data: %1$s \nMinimum zoom : %2$d\nMaximum zoom : %3$d\nDownloadable : %4$s \nZooms downloaded : %5$s</string>
 	<string name="local_index_poi_data">POI data</string>
 	<string name="local_index_address_data">Address data</string>
 	<string name="local_index_transport_data">Transport data</string>
diff --git a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
index 22ce3f4924..569cf167c4 100644
--- a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
+++ b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
@@ -150,6 +150,21 @@ public class SQLiteTileSource implements ITileSource {
 		return db;
 	}
 	
+	public boolean exists(int zoom) {
+		SQLiteDatabase db = getDatabase();
+		if(db == null){
+			return false;
+		}
+		Cursor cursor = db.rawQuery("SELECT 1 FROM tiles WHERE z = ?", new String[] {(17 - zoom)+""});    //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
+		try {
+			boolean e = cursor.moveToFirst();
+			cursor.close();
+			return e;
+		} catch (SQLiteDiskIOException e) {
+			return false;
+		}
+	}
+	
 	public boolean exists(int x, int y, int zoom) {
 		SQLiteDatabase db = getDatabase();
 		if(db == null){
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
index 4b6447ce62..b96f6bc5d7 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
@@ -3,18 +3,28 @@ package net.osmand.plus.activities;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 
+import net.osmand.GPXUtilities;
+import net.osmand.GPXUtilities.GPXFileResult;
 import net.osmand.binary.BinaryIndexPart;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.binary.BinaryMapAddressReaderAdapter.AddressRegion;
 import net.osmand.binary.BinaryMapIndexReader.MapIndex;
+import net.osmand.binary.BinaryMapIndexReader.MapRoot;
 import net.osmand.binary.BinaryMapTransportReaderAdapter.TransportIndex;
 import net.osmand.data.IndexConstants;
 import net.osmand.map.TileSourceManager;
 import net.osmand.map.TileSourceManager.TileSourceTemplate;
+import net.osmand.osm.MapUtils;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.ResourceManager;
@@ -29,6 +39,8 @@ import android.os.Build;
 public class LocalIndexHelper {
 		
 	private final OsmandApplication app;
+	
+	private MessageFormat dateformat = new MessageFormat("{0,date,dd.MM.yyyy}", Locale.US);
 
 	public LocalIndexHelper(OsmandApplication app){
 		this.app = app;
@@ -38,16 +50,61 @@ public class LocalIndexHelper {
 		return getLocalIndexData(null, loadTask);
 	}
 	
+	public String getInstalledDate(File f){
+		return app.getString(R.string.local_index_installed) + " : " + dateformat.format(new Object[]{new Date(f.lastModified())});
+	}
 	
+	@SuppressWarnings("unchecked")
 	public void updateDescription(LocalIndexInfo info){
+		File f = new File(info.getPathToData());
 		if(info.getType() == LocalIndexType.MAP_DATA){
-			updateObfFileInformation(info, new File(info.getPathToData()));
+			updateObfFileInformation(info, f);
+			info.setDescription(info.getDescription() + getInstalledDate(f));
+		} else if(info.getType() == LocalIndexType.POI_DATA){
+			info.setDescription(getInstalledDate(f));
+		} else if(info.getType() == LocalIndexType.GPX_DATA){
+			GPXFileResult result = GPXUtilities.loadGPXFile(app, f);
+			if(result.error != null){
+				info.setCorrupted(true);
+				info.setDescription(result.error);
+			} else {
+				int points = 0;
+				for(int i =0; i< result.locations.size() ; i++){
+					points += result.locations.get(i).size();
+				}
+				info.setDescription(app.getString(R.string.local_index_gpx_info, result.locations.size(), points,
+						result.wayPoints.size()));
+			}
+		} else if(info.getType() == LocalIndexType.VOICE_DATA){
+			info.setDescription(getInstalledDate(f));
+		} else if(info.getType() == LocalIndexType.TTS_VOICE_DATA){
+			info.setDescription(getInstalledDate(f));
 		} else if(info.getType() == LocalIndexType.TILES_DATA){
-			File f = new File(info.getPathToData());
 			if(f.isDirectory() && TileSourceManager.isTileSourceMetaInfoExist(f)){
 				TileSourceTemplate template = TileSourceManager.createTileSourceTemplate(new File(info.getPathToData()));
+				Set<Integer> zooms = new TreeSet<Integer>();
+				for(String s : f.list()){
+					try {
+						zooms.add(Integer.parseInt(s));
+					} catch (NumberFormatException e) {
+					}
+				}
+				
 				String descr = app.getString(R.string.local_index_tile_data, 
-					template.getName(), template.getMinimumZoomSupported(), template.getMaximumZoomSupported());
+					template.getName(), template.getMinimumZoomSupported(), template.getMaximumZoomSupported(),
+					template.getUrlTemplate() != null, zooms.toString());
+				info.setDescription(descr);
+			} else if(f.isFile() && f.getName().endsWith(SQLiteTileSource.EXT)){
+				SQLiteTileSource template = new SQLiteTileSource(f, Collections.EMPTY_LIST);
+				Set<Integer> zooms = new TreeSet<Integer>();
+				for(int i=1; i<22; i++){
+					if(template.exists(i)){
+						zooms.add(i);
+					}
+				}
+				String descr = app.getString(R.string.local_index_tile_data, 
+						template.getName(), template.getMinimumZoomSupported(), template.getMaximumZoomSupported(),
+						template.couldBeDownloadedFromInternet(), zooms.toString());
 				info.setDescription(descr);
 			}
 		}
@@ -175,6 +232,16 @@ public class LocalIndexHelper {
 		}
 		
 	}
+	
+	private MessageFormat format = new MessageFormat("\t {0}, {1} NE \n\t {2}, {3} NE", Locale.US);
+
+	private String formatLatLonBox(int left, int right, int top, int bottom) {
+		double l = MapUtils.get31LongitudeX(left);
+		double r = MapUtils.get31LongitudeX(right);
+		double t = MapUtils.get31LatitudeY(top);
+		double b = MapUtils.get31LatitudeY(bottom);
+		return format.format(new Object[] { l, t, r, b });
+	}
 
 	private void updateObfFileInformation(LocalIndexInfo info, File mapFile) {
 		try {
@@ -189,10 +256,18 @@ public class LocalIndexHelper {
 					MapIndex mi = ((MapIndex) part);
 					builder.append(app.getString(R.string.local_index_map_data)).append(": ").
 						append(mi.getName()).append("\n");
+					if(mi.getRoots().size() > 0){
+						MapRoot mapRoot = mi.getRoots().get(0);
+						String box = formatLatLonBox(mapRoot.getLeft(), mapRoot.getRight(), mapRoot.getTop(), mapRoot.getBottom());
+						builder.append(box).append("\n");
+					}
 				} else if(part instanceof TransportIndex){
 					TransportIndex mi = ((TransportIndex) part);
+					int sh = (31 - BinaryMapIndexReader.TRANSPORT_STOP_ZOOM);
 					builder.append(app.getString(R.string.local_index_transport_data)).append(": ").
 						append(mi.getName()).append("\n");
+					String box = formatLatLonBox(mi.getLeft() << sh, mi.getRight() << sh, mi.getTop() << sh, mi.getBottom() << sh);
+					builder.append(box).append("\n");
 				} else if(part instanceof AddressRegion){
 					AddressRegion mi = ((AddressRegion) part);
 					builder.append(app.getString(R.string.local_index_address_data)).append(": ").
diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
index 3239ba09e1..ca3690c43f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java
@@ -9,9 +9,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import net.osmand.Algoritms;
 import net.osmand.IProgress;
 import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.ProgressDialogImplementation;
 import net.osmand.plus.R;
 import net.osmand.plus.ResourceManager;
 import net.osmand.plus.activities.LocalIndexHelper.LocalIndexInfo;
@@ -19,7 +19,6 @@ import net.osmand.plus.activities.LocalIndexHelper.LocalIndexType;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ExpandableListActivity;
-import android.app.ProgressDialog;
 import android.app.AlertDialog.Builder;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -166,7 +165,7 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 					boolean successfull = false;
 					if(operation == DELETE_OPERATION){
 						File f = new File(info.getPathToData());
-						successfull = f.delete();
+						successfull = Algoritms.removeAllFiles(f);
 					} else if(operation == RESTORE_OPERATION){
 						successfull = move(new File(info.getPathToData()), getFileToRestore(info));
 						if(successfull){
@@ -407,7 +406,7 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 
 			@Override
 			protected void onPostExecute(List<String> warnings) {
-				findViewById(R.id.ProgressBar).setVisibility(View.INVISIBLE);
+				findViewById(R.id.ProgressBar).setVisibility(View.GONE);
 				if (!warnings.isEmpty()) {
 					final StringBuilder b = new StringBuilder();
 					boolean f = true;
@@ -438,10 +437,6 @@ public class LocalIndexesActivity extends ExpandableListActivity {
 		
 	}
 
-	protected void showWarnings(List<String> warnings) {
-		
-	}
-
 	
 
 	protected class LocalIndexesAdapter extends BaseExpandableListAdapter {