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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-08-13 18:55:42 +02:00
commit 9a4ca0a0e9
6 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/values/strings.xml
View file

@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="download_additional_maps">Download missing maps $1%s ($2%d MB)?</string>
<string name="more">More...</string>
<string name="rendering_value_browse_map_name">Browse map</string>
<string name="rendering_value_car_name">Car</string>

1
OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
View file

@ -115,6 +115,7 @@ public class OsmAndAppCustomization {
}
public void preDownloadActivity(final DownloadIndexActivity da, final List<DownloadActivityType> downloadTypes, ActionBar actionBar ) {
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(actionBar.getThemedContext(), R.layout.sherlock_spinner_item,
toString(downloadTypes)
);

37
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -40,7 +40,6 @@ import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
@ -51,8 +50,6 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.view.SubMenu;
@ -111,7 +108,6 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
makeSureUserCancelDownload();
}
});
getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
getSupportActionBar().setTitle(R.string.local_index_download);
// recreation upon rotation is pgetaprevented in manifest file
findViewById(R.id.DownloadButton).setOnClickListener(new View.OnClickListener(){
@ -256,19 +252,38 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
}
public void showDialogToDownloadMaps(List<String> maps) {
DownloadIndexAdapter a = (DownloadIndexAdapter) getListAdapter();
boolean e = true;
for (IndexItem i : a.getIndexFiles()) {
int count = 0;
int sz = 0;
String s = "";
for (IndexItem i : downloadListIndexThread.getCachedIndexFiles()) {
for (String map : maps) {
if (i.getFileName().equals(map + ".obf.zip")) {
e = false;
getEntriesToDownload().put(i, i.createDownloadEntry(getMyApplication(), type, new ArrayList<DownloadEntry>(1)));
if (i.getFileName().equals(map + ".obf.zip") && i.getType() == DownloadActivityType.NORMAL_FILE) {
final List<DownloadEntry> de = i.createDownloadEntry(getMyApplication(), i.getType(), new ArrayList<DownloadEntry>(1));
for(DownloadEntry d : de ) {
count++;
sz += d.sizeMB;
}
if(s.length() > 0) {
s +=", ";
}
s += i.getVisibleName(getMyApplication(), getMyApplication().getResourceManager().getOsmandRegions());
getEntriesToDownload().put(i, de);
}
}
}
if(!e){
if(count > 0){
Builder builder = new AlertDialog.Builder(this);
builder.setMessage(MessageFormat.format(getString(R.string.download_additional_maps), s, sz));
builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
downloadFilesCheckInternet();
}
});
builder.setNegativeButton(R.string.default_buttons_no, null);
builder.show();
}
}

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

@ -277,14 +277,13 @@ public class DownloadIndexesThread {
private String reindexFiles(List<File> filesToReindex) {
boolean vectorMapsToReindex = false;
// reindex vector maps all at one time
ResourceManager manager = app.getResourceManager();
for (File f : filesToReindex) {
if (f.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
vectorMapsToReindex = true;
break;
}
}
// reindex vector maps all at one time
ResourceManager manager = app.getResourceManager();
List<String> warnings = new ArrayList<String>();
manager.indexVoiceFiles(this);
if (vectorMapsToReindex) {

2
OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
View file

@ -197,7 +197,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
da.showDialogToDownloadMaps(suggestToDownloadMap);
}
});
}, 2000);
}
}
return warns;

2
OsmAnd/src/net/osmand/plus/sherpafy/TourDownloadType.java
View file

@ -45,7 +45,7 @@ public class TourDownloadType extends DownloadActivityType {
}
public String getBaseUrl(OsmandApplication ctx, String fileName) {
return "http://" + SherpafyCustomization.TOUR_SERVER + "/download?event=2&"
return "http://" + SherpafyCustomization.TOUR_SERVER + "/download_tour.php?event=2&"
+ Version.getVersionAsURLParam(ctx) + "&file=" + fileName;
}