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-07-24 13:41:51 +02:00
commit 97661050ef
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -862,14 +862,16 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
} }
private void initRecMenu(AVActionType actionType, double lat, double lon) { private void initRecMenu(AVActionType actionType, double lat, double lon) {
currentRecording = new CurrentRecording(actionType); if (mapActivity != null) {
if (actionType == AVActionType.REC_PHOTO) { currentRecording = new CurrentRecording(actionType);
recordingMenu = new AudioVideoNoteRecordingMenuFullScreen(this, lat, lon); if (actionType == AVActionType.REC_PHOTO) {
} else { recordingMenu = new AudioVideoNoteRecordingMenuFullScreen(this, lat, lon);
recordingMenu = new AudioVideoNoteRecordingMenu(this, lat, lon); } else {
recordingMenu = new AudioVideoNoteRecordingMenu(this, lat, lon);
}
recordingDone = false;
lockScreenOrientation();
} }
recordingDone = false;
lockScreenOrientation();
} }
public void recordVideo(final double lat, final double lon, final MapActivity mapActivity) { public void recordVideo(final double lat, final double lon, final MapActivity mapActivity) {

6
OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
View file

@ -240,8 +240,10 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment implements InAppList
} }
public void notifyLiveUpdatesChanged() { public void notifyLiveUpdatesChanged() {
if (adapter != null && getMyApplication() != null && getActivity() != null) { if (getActivity() != null) {
adapter.notifyLiveUpdatesChanged(); if (adapter != null && getMyApplication() != null) {
adapter.notifyLiveUpdatesChanged();
}
} }
} }