Fix exceptions
This commit is contained in:
parent
2ff8ff8230
commit
0eb598d815
5 changed files with 21 additions and 10 deletions
|
@ -611,7 +611,7 @@
|
|||
<string name="recording_is_recorded">صدا/تصویر در حال ضبط میباشد. برای متوقف کردن آن ویجت AV را بزنید.</string>
|
||||
<string name="recording_playing">صدایی از ضبط مورد نظر درحال پخش میباشد.\n%1$s</string>
|
||||
<string name="recording_delete_confirm">آیا میخواهید این مورد ضبط شده را پاک کنید؟</string>
|
||||
<string name="recording_description">ضبط %1$s%2$ s از %3$s</string>
|
||||
<string name="recording_description">ضبط %1$s%2$s از %3$s</string>
|
||||
<string name="osmand_srtm_short_description_80_chars">افزونه OsmAnd برای منحنی های همتراز آفلاین</string>
|
||||
<string name="use_magnetic_sensor_descr">استفاده از حسگر مغناطیسی به جای سنسور جهت یابی برای استفاده در قطب نما</string>
|
||||
<string name="show_poi_over_map">نشان دادن POI</string>
|
||||
|
|
|
@ -63,17 +63,21 @@ public class EditPOIFilterActivity extends OsmandListActivity {
|
|||
public void onCreate(final Bundle icicle) {
|
||||
Bundle bundle = this.getIntent().getExtras();
|
||||
String filterId = bundle.getString(AMENITY_FILTER);
|
||||
helper = ((OsmandApplication)getApplication()).getPoiFilters();
|
||||
helper = ((OsmandApplication) getApplication()).getPoiFilters();
|
||||
filter = helper.getFilterById(filterId);
|
||||
super.onCreate(icicle);
|
||||
|
||||
|
||||
|
||||
setContentView(R.layout.editing_poi_filter);
|
||||
getSupportActionBar().setTitle(R.string.filterpoi_activity);
|
||||
getSupportActionBar().setIcon(R.drawable.tab_search_poi_icon);
|
||||
|
||||
getSupportActionBar().setSubtitle(filter.getName());
|
||||
setListAdapter(new AmenityAdapter(AmenityType.getCategories()));
|
||||
|
||||
if (filter != null) {
|
||||
getSupportActionBar().setSubtitle(filter.getName());
|
||||
setListAdapter(new AmenityAdapter(AmenityType.getCategories()));
|
||||
} else {
|
||||
setListAdapter(new AmenityAdapter(new AmenityType[0]));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -94,6 +98,9 @@ public class EditPOIFilterActivity extends OsmandListActivity {
|
|||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
if(filter == null) {
|
||||
return super.onCreateOptionsMenu(menu);
|
||||
}
|
||||
createMenuItem(menu, SAVE_FILTER, R.string.edit_filter_save_as_menu_item,
|
||||
R.drawable.ic_action_gsave_light, R.drawable.ic_action_gsave_dark ,
|
||||
MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||
|
|
|
@ -81,8 +81,8 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity {
|
|||
itemsValues.add(AV_CAMERA_FOCUS_CONTINUOUS);
|
||||
}
|
||||
}
|
||||
entries = items.toArray(entries);
|
||||
intValues = itemsValues.toArray(intValues);
|
||||
entries = items.toArray(new String[items.size()]);
|
||||
intValues = itemsValues.toArray(new Integer[itemsValues.size()]);
|
||||
if (entries.length > 0) {
|
||||
ListPreference camFocus = createListPreference(p.AV_CAMERA_FOCUS_TYPE, entries, intValues, R.string.av_camera_focus,
|
||||
R.string.av_camera_focus_descr);
|
||||
|
|
|
@ -259,7 +259,9 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
|
|||
}
|
||||
app.showShortToastMessage(resId);
|
||||
updateSettings();
|
||||
mapView.refreshMap();
|
||||
if(mapView != null) {
|
||||
mapView.refreshMap();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -443,6 +443,8 @@ public class ResourceManager {
|
|||
context.getSettings().PREVIOUS_INSTALLED_VERSION.set(Version.getFullVersion(context));
|
||||
|
||||
context.getPoiFilters().updateFilters(false);
|
||||
} catch (SQLiteException e) {
|
||||
log.error(e.getMessage(), e);
|
||||
} catch (IOException e) {
|
||||
log.error(e.getMessage(), e);
|
||||
} catch (XmlPullParserException e) {
|
||||
|
|
Loading…
Reference in a new issue