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 2016-02-29 07:47:41 +01:00
commit 9a735a7211
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenuFullScreen.java
View file

@ -73,11 +73,13 @@ public class AudioVideoNoteRecordingMenuFullScreen extends AudioVideoNoteRecordi
}
public WeakReference<AudioVideoNoteRecordingMenuFullScreenFragment> findMenuFragment() {
Fragment fragment = getMapActivity().getSupportFragmentManager().findFragmentByTag(AudioVideoNoteRecordingMenuFullScreenFragment.TAG);
if (fragment != null && !fragment.isDetached()) {
return new WeakReference<>((AudioVideoNoteRecordingMenuFullScreenFragment) fragment);
} else {
return null;
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
Fragment fragment = mapActivity.getSupportFragmentManager().findFragmentByTag(AudioVideoNoteRecordingMenuFullScreenFragment.TAG);
if (fragment != null && !fragment.isDetached()) {
return new WeakReference<>((AudioVideoNoteRecordingMenuFullScreenFragment) fragment);
}
}
return null;
}
}

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

@ -1913,20 +1913,21 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
public synchronized void shootAgain() {
cancelPhotoTimer();
cam.cancelAutoFocus();
photoRawData = null;
if (cam != null) {
try {
cam.cancelAutoFocus();
cam.stopPreview();
cam.startPreview();
internalShoot();
try {
cam.stopPreview();
cam.startPreview();
internalShoot();
} catch (Exception e) {
logErr(e);
closeRecordingMenu();
closeCamera();
finishRecording();
e.printStackTrace();
} catch (Exception e) {
logErr(e);
closeRecordingMenu();
closeCamera();
finishRecording();
e.printStackTrace();
}
}
}