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 2017-11-12 14:57:26 +01:00
commit 6882d0f508
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/activities/LocalIndexHelper.java
View file

@ -361,7 +361,7 @@ public class LocalIndexHelper {
VOICE_DATA(R.string.local_indexes_cat_voice, R.drawable.ic_action_volume_up, 30),
FONT_DATA(R.string.fonts_header, R.drawable.ic_action_map_language, 35),
DEACTIVATED(R.string.local_indexes_cat_backup, R.drawable.ic_type_archive, 1000);
// AV_DATA(R.string.local_indexes_cat_av);;
// AV_DATA(R.string.local_indexes_cat_av);
@StringRes
private final int resId;

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

@ -525,7 +525,7 @@ public class DownloadIndexesThread {
}
filesToReindex.clear();
// slow down but let update all button work properly
indexes.updateFilesToUpdate();;
indexes.updateFilesToUpdate();
}
}
} finally {
@ -647,4 +647,4 @@ public class DownloadIndexesThread {
downloadInProgress();
}
}
}
}

4
OsmAnd/src/net/osmand/plus/download/DownloadResources.java
View file

@ -181,7 +181,7 @@ public class DownloadResources extends DownloadResourceGroup {
protected void updateFilesToUpdate() {
initAlreadyLoadedFiles();;
initAlreadyLoadedFiles();
recalculateFilesToUpdate();
}
@ -439,4 +439,4 @@ public class DownloadResources extends DownloadResourceGroup {
return downloadRegion.getSuperregion() != null
&& addIndexItem(downloadThread, type, downloadRegion.getSuperregion(), res);
}
}
}

2
OsmAnd/src/net/osmand/plus/download/DownloadValidationManager.java
View file

@ -114,7 +114,7 @@ public class DownloadValidationManager {
double szChange = ((double) szChangeLong) / (1 << 20);
double szMaxTemp = szChange + ((double) szMaxTempLong) / (1 << 20);
// get availabile space
// get available space
double asz = downloadThread.getAvailableSpace();
if (asz != -1 && asz > 0 && (szMaxTemp > asz)) {
AlertDialog.Builder builder = new AlertDialog.Builder(context);

2
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java
View file

@ -204,7 +204,7 @@ public class SendPoiDialogFragment extends DialogFragment {
group = deleteGroup;
break;
case 3:
action = getString(R.string.default_changeset_reopen);;
action = getString(R.string.default_changeset_reopen);
group = reopenGroup;
break;
default: