Merge branch 'master' of https://github.com/osmandapp/Osmand

OsmAnd/res/values-da/strings.xml

@@ -1999,4 +1999,5 @@
     <string name="map_downloaded_descr">Kort over %1$ s er hentet. Gå tilbage til kortet for at begynde at bruge det.</string>
     <string name="go_to_map">Gå til kortet</string>
     <string name="shared_string_qr_code">QR kode</string>
-    </resources>
+    <string name="enter_country_name">Indtast landenavn</string>
+</resources>

OsmAnd/res/values-fr/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="offline_edition">Modifications hors-ligne</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="offline_edition">Modifications hors-ligne</string>
   <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
   
   <string name="update_poi_does_not_change_indexes">Les modifications de PI dans l\'application sont sans effet sur les cartes téléchargées, les modifications sont enregistrées dans un fichier.</string>
@@ -2073,4 +2074,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 <string name="map_downloaded">Carte téléchargée</string>
     <string name="go_to_map">Aller à la carte</string>
     <string name="map_downloaded_descr">La carte %1$s a été téléchargée. Allez à la carte pour l’utiliser.</string>
-    </resources>
+    <string name="shared_string_qr_code">QR-code</string>
+    <string name="enter_country_name">Saisissez le pays</string>
+</resources>

OsmAnd/res/values-sv/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
 <string name="ChooseCountry">Välj land</string>
 <string name="choose_city">Välj stad</string>
 <string name="choose_building">Välj byggnad</string>
@@ -1950,4 +1951,5 @@
 <string name="map_downloaded">Karta hämtad</string>
     <string name="map_downloaded_descr">Karta över %1$s har hämtats. Gå tillbaka till kartan för att börja använda den.</string>
     <string name="go_to_map">Gå till kartan</string>
-    </resources>
+    <string name="shared_string_qr_code">QR-kod</string>
+    </resources>

OsmAnd/src/net/osmand/plus/download/DownloadActivity.java

@@ -24,6 +24,7 @@ import net.osmand.access.AccessibleToast;
 import net.osmand.map.WorldRegion;
 import net.osmand.map.WorldRegion.RegionParams;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.DrivingRegion;
 import net.osmand.plus.OsmandSettings.MetricsConstants;
@@ -41,6 +42,8 @@ import net.osmand.plus.download.ui.DownloadResourceGroupFragment;
 import net.osmand.plus.download.ui.GoToMapFragment;
 import net.osmand.plus.download.ui.LocalIndexesFragment;
 import net.osmand.plus.download.ui.UpdatesIndexFragment;
+import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
+import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.plus.views.controls.PagerSlidingTabStrip;
 
 import org.apache.commons.logging.Log;
@@ -85,6 +88,11 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
 	private DownloadValidationManager downloadValidationManager;
 	protected WorldRegion downloadItem;
 
+	private boolean srtmDisabled;
+	private boolean srtmNeedsInstallation;
+	private boolean nauticalPluginDisabled;
+	private boolean freeVersion;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
@@ -173,6 +181,7 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
 	@Override
 	protected void onResume() {
 		super.onResume();
+		initAppStatusVariables();
 		getMyApplication().getAppCustomization().resumeActivity(DownloadActivity.class, this);
 		downloadThread.setUiActivity(this);
 		downloadInProgress();
@@ -614,4 +623,29 @@ public class DownloadActivity extends ActionBarProgressActivity implements Downl
 
 		messageTextView.setText(R.string.device_memory);
 	}
+
+	public boolean isSrtmDisabled() {
+		return srtmDisabled;
+	}
+
+	public boolean isSrtmNeedsInstallation() {
+		return srtmNeedsInstallation;
+	}
+
+	public boolean isNauticalPluginDisabled() {
+		return nauticalPluginDisabled;
+	}
+
+	public boolean isFreeVersion() {
+		return freeVersion;
+	}
+
+	public void initAppStatusVariables() {
+		srtmDisabled = OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) == null;
+		nauticalPluginDisabled = OsmandPlugin.getEnabledPlugin(NauticalMapsPlugin.class) == null;
+		freeVersion = Version.isFreeVersion(getMyApplication());
+		OsmandPlugin srtmPlugin = OsmandPlugin.getPlugin(SRTMPlugin.class);
+		srtmNeedsInstallation = srtmPlugin == null || srtmPlugin.needsInstallation();
+
+	}
 }

OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java

@@ -33,7 +33,6 @@ import net.osmand.plus.download.DownloadResources;
 import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.download.ui.LocalIndexesFragment.LocalIndexOperationTask;
 import net.osmand.plus.helpers.FileNameTranslationHelper;
-import net.osmand.plus.openseamapsplugin.NauticalMapsPlugin;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 
 import java.io.File;
@@ -121,14 +120,11 @@ public class ItemViewHolder {
 		this.showTypeInName = showTypeInName;
 	}
 
-
-	// FIXME don't initialize on every row 
 	private void initAppStatusVariables() {
-		srtmDisabled = OsmandPlugin.getEnabledPlugin(SRTMPlugin.class) == null;
-		nauticalPluginDisabled = OsmandPlugin.getEnabledPlugin(NauticalMapsPlugin.class) == null;
-		freeVersion = Version.isFreeVersion(context.getMyApplication());
-		OsmandPlugin srtmPlugin = OsmandPlugin.getPlugin(SRTMPlugin.class);
-		srtmNeedsInstallation = srtmPlugin == null || srtmPlugin.needsInstallation();
+		srtmDisabled = context.isSrtmDisabled();
+		nauticalPluginDisabled = context.isNauticalPluginDisabled();
+		freeVersion = context.isFreeVersion();
+		srtmNeedsInstallation = context.isSrtmNeedsInstallation();
 	}
 
 	public void bindIndexItem(final IndexItem indexItem, final DownloadResourceGroup parentOptional) {