diff --git a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java index bfd3b6ecfd..228d02be00 100644 --- a/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java @@ -225,7 +225,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment { } public void hideProgressBar() { - getSherlockActivity().setSupportProgressBarIndeterminateVisibility(false); + if (getSherlockActivity() != null){ + getSherlockActivity().setSupportProgressBarIndeterminateVisibility(false); + } } private void updateSelectionMode(ActionMode m) { @@ -963,7 +965,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment { @Override protected void onPostExecute(Void result) { - getSherlockActivity().setProgressBarIndeterminateVisibility(false); + if (getSherlockActivity() != null){ + getSherlockActivity().setProgressBarIndeterminateVisibility(false); + } if (info.gpx != null){ getMyApplication().getSelectedGpxHelper().selectGpxFile(info.gpx, selected, true); listAdapter.notifyDataSetChanged(); diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java index e7b91b57fa..ca61fc51f9 100644 --- a/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java +++ b/OsmAnd/src/net/osmand/plus/activities/actions/StartGPSStatus.java @@ -157,7 +157,7 @@ public class StartGPSStatus extends OsmAndAction { // if (g.activity.length() == 0) { PackageManager pm = mapActivity.getPackageManager(); try { - String appName = !g.paidAppName.isEmpty() && + String appName = !g.paidAppName.equals("") && g.installed(mapActivity, g.paidAppName) ? g.paidAppName : g.appName; intent = pm.getLaunchIntentForPackage(appName); } catch (RuntimeException e) { diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java index 81050b13a1..6c125ea29f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java @@ -274,7 +274,7 @@ public class SearchAddressFragment extends SherlockFragment { String city = settings.getLastSearchedCityName(); String cityName = !Algorithms.isEmpty(postcode) ? postcode : city; ai.objectName = settings.getLastSearchedStreet(); - ai.historyName = MessageFormat.format(ctx. getString(R.string.search_history_int_streets), settings.getLastSearchedStreet(), + ai.historyName = MessageFormat.format(ctx != null ? ctx.getString(R.string.search_history_int_streets) : "", settings.getLastSearchedStreet(), settings.getLastSearchedIntersectedStreet(), cityName); ai.zoom = 17; return ai; @@ -287,7 +287,7 @@ public class SearchAddressFragment extends SherlockFragment { String cityName = !Algorithms.isEmpty(postcode) ? postcode : city; String street = settings.getLastSearchedStreet(); ai.objectName = street; - ai.historyName = MessageFormat.format(ctx.getString(R.string.search_history_street), street, cityName); + ai.historyName = MessageFormat.format(ctx != null ? ctx.getString(R.string.search_history_street) : "", street, cityName); ai.zoom = 16; return ai; } @@ -301,7 +301,7 @@ public class SearchAddressFragment extends SherlockFragment { String street = settings.getLastSearchedStreet(); String building = settings.getLastSearchedBuilding(); ai.objectName = street + " " + building; - ai.historyName = MessageFormat.format(ctx.getString(R.string.search_history_building), building, street, + ai.historyName = MessageFormat.format(ctx != null ? ctx.getString(R.string.search_history_building) : "", building, street, cityName); ai.zoom = 17; return ai; @@ -310,7 +310,7 @@ public class SearchAddressFragment extends SherlockFragment { public static AddressInformation buildCity(Context ctx, OsmandSettings settings){ AddressInformation ai = new AddressInformation(); String city = settings.getLastSearchedCityName(); - ai.historyName = MessageFormat.format(ctx.getString(R.string.search_history_city), city); + ai.historyName = MessageFormat.format(ctx != null ? ctx.getString(R.string.search_history_city) : "", city); ai.objectName = city; ai.zoom = 14; return ai; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java index f77184f833..55f2340a06 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java @@ -439,7 +439,7 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA } public LatLon getEndStop(int position){ - if(position == -1){ + if(position < 0){ return lastKnownMapLocation; } RouteInfoLocation item = intermediateListAdapater.getItem(position); diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java index 983b4139f1..91d08cd075 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java @@ -255,7 +255,7 @@ public class GpxImportHelper { private String saveImport(final GPXUtilities.GPXFile gpxFile, final String fileName) { final String warning; - if (gpxFile.isEmpty()) { + if (gpxFile.isEmpty() || fileName == null) { warning = application.getString(R.string.error_reading_gpx); } else { final File importDir = application.getAppPath(IndexConstants.GPX_IMPORT_DIR); diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java index c0adbf11ae..ab497f2639 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java @@ -167,17 +167,23 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements header = getLayoutInflater().inflate(R.layout.osmo_groups_list_header, null); getExpandableListView().addHeaderView(header); CompoundButton trackr = (CompoundButton) header.findViewById(R.id.enable_tracker); - trackr.setChecked(osMoPlugin.getTracker().isEnabledTracker()); + if(osMoPlugin != null && osMoPlugin.getTracker() != null){ + trackr.setChecked(osMoPlugin.getTracker().isEnabledTracker()); + } trackr.setOnCheckedChangeListener(new OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if(isChecked) { - osMoPlugin.getTracker().enableTracker(); + if (osMoPlugin != null && osMoPlugin.getTracker() != null){ + osMoPlugin.getTracker().enableTracker(); + } app.startNavigationService(NavigationService.USED_BY_LIVE); app.getSettings().SERVICE_OFF_INTERVAL.set(0); } else { - osMoPlugin.getTracker().disableTracker(); + if (osMoPlugin != null && osMoPlugin.getTracker() != null){ + osMoPlugin.getTracker().disableTracker(); + } if (app.getNavigationService() != null) { app.getNavigationService().stopIfNeeded(app,NavigationService.USED_BY_LIVE); } @@ -449,8 +455,10 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements if(device != null) { Location location = device.getLastLocation(); MapActivity.getMapViewTrackingUtilities().setMapLinkedToLocation(false); - app.getSettings().setMapLocationToShow(location.getLatitude(), location.getLongitude(), app.getSettings().getLastKnownMapZoom(), - null, device.getVisibleName(), device); + if (location != null){ + app.getSettings().setMapLocationToShow(location.getLatitude(), location.getLongitude(), app.getSettings().getLastKnownMapZoom(), + null, device.getVisibleName(), device); + } OsMoPositionLayer.setFollowTrackerId(device); MapActivity.launchMapActivityMoveToTop(OsMoGroupsActivity.this); } @@ -496,17 +504,19 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements Builder bld = new AlertDialog.Builder(this); bld.setTitle(R.string.osmo_group); StringBuilder sb = new StringBuilder(); - setFields(sb, R.string.osmo_group_name, group.name); - if(group.description != null) { - setFields(sb, R.string.osmo_group_description, group.description); + if (group != null){ + setFields(sb, R.string.osmo_group_name, group.name); + if(group.description != null) { + setFields(sb, R.string.osmo_group_description, group.description); + } + if(group.expireTime != 0) { + setFields(sb, R.string.osmo_expire_group, new Date(group.expireTime).toString()); + } + if(group.policy != null) { + setFields(sb, R.string.osmo_group_policy, group.policy); + } + setFields(sb, R.string.osmo_connect_to_group_id, group.groupId); } - if(group.expireTime != 0) { - setFields(sb, R.string.osmo_expire_group, new Date(group.expireTime).toString()); - } - if(group.policy != null) { - setFields(sb, R.string.osmo_group_policy, group.policy); - } - setFields(sb, R.string.osmo_connect_to_group_id, group.groupId); ScrollView sv = new ScrollView(this); TextView tv = new TextView(this); sv.addView(tv); diff --git a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java index ffe7df7af4..577adeb357 100644 --- a/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java +++ b/OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java @@ -390,7 +390,7 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin { r.setMinZoom(Integer.parseInt(minZoom.getText().toString())); r.setMaxZoom(Integer.parseInt(maxZoom.getText().toString())); r.setEllipticYTile(elliptic.isChecked()); - r.setUrlToLoad(urlToLoad.getText().toString().isEmpty() ? null : urlToLoad.getText().toString().replace("{$x}", "{1}") + r.setUrlToLoad(urlToLoad.getText().toString().equals("") ? null : urlToLoad.getText().toString().replace("{$x}", "{1}") .replace("{$y}", "{2}").replace("{$z}", "{0}")); if (r != null && r.getName().length() > 0) { if (settings.installTileSource(r)) { diff --git a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java index b706ccae3d..df174a4bb6 100644 --- a/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java @@ -54,6 +54,9 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa try { for (int i = 0; i < objects.size(); i++) { TransportStop n = objects.get(i); + if (n.getLocation() == null){ + continue; + } int x = (int) tb.getPixXFromLatLon(n.getLocation().getLatitude(), n.getLocation().getLongitude()); int y = (int) tb.getPixYFromLatLon(n.getLocation().getLatitude(), n.getLocation().getLongitude()); if (Math.abs(x - ex) <= radius && Math.abs(y - ey) <= radius) {