mirror of
https://github.com/SimpleMobileTools/Simple-Camera.git
synced 2025-06-27 09:02:59 +02:00
update location permission strings
This commit is contained in:
@ -34,6 +34,7 @@ import com.simplemobiletools.camera.models.MySize
|
||||
import com.simplemobiletools.camera.models.ResolutionOption
|
||||
import com.simplemobiletools.commons.activities.BaseSimpleActivity
|
||||
import com.simplemobiletools.commons.extensions.toast
|
||||
import com.simplemobiletools.commons.helpers.PERMISSION_ACCESS_FINE_LOCATION
|
||||
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
|
||||
|
||||
class CameraXPreview(
|
||||
@ -353,7 +354,7 @@ class CameraXPreview(
|
||||
|
||||
override fun onResume(owner: LifecycleOwner) {
|
||||
super.onResume(owner)
|
||||
if (config.saveMediaLocation) {
|
||||
if (config.savePhotoVideoLocation) {
|
||||
if (simpleLocationManager == null) {
|
||||
simpleLocationManager = SimpleLocationManager(activity)
|
||||
}
|
||||
@ -488,7 +489,7 @@ class CameraXPreview(
|
||||
|
||||
val metadata = Metadata().apply {
|
||||
isReversedHorizontal = isFrontCameraInUse() && config.flipPhotos
|
||||
if (config.saveMediaLocation) {
|
||||
if (config.savePhotoVideoLocation) {
|
||||
location = simpleLocationManager?.getLocation()
|
||||
}
|
||||
}
|
||||
@ -591,14 +592,14 @@ class CameraXPreview(
|
||||
val recording = when (val mediaOutput = mediaOutputHelper.getVideoMediaOutput()) {
|
||||
is MediaOutput.FileDescriptorMediaOutput -> {
|
||||
FileDescriptorOutputOptions.Builder(mediaOutput.fileDescriptor).apply {
|
||||
if (config.saveMediaLocation) {
|
||||
if (config.savePhotoVideoLocation) {
|
||||
setLocation(simpleLocationManager?.getLocation())
|
||||
}
|
||||
}.build().let { videoCapture!!.output.prepareRecording(activity, it) }
|
||||
}
|
||||
is MediaOutput.FileMediaOutput -> {
|
||||
FileOutputOptions.Builder(mediaOutput.file).apply {
|
||||
if (config.saveMediaLocation) {
|
||||
if (config.savePhotoVideoLocation) {
|
||||
setLocation(simpleLocationManager?.getLocation())
|
||||
}
|
||||
}.build().let { videoCapture!!.output.prepareRecording(activity, it) }
|
||||
@ -606,7 +607,7 @@ class CameraXPreview(
|
||||
is MediaOutput.MediaStoreOutput -> {
|
||||
MediaStoreOutputOptions.Builder(contentResolver, mediaOutput.contentUri).apply {
|
||||
setContentValues(mediaOutput.contentValues)
|
||||
if (config.saveMediaLocation) {
|
||||
if (config.savePhotoVideoLocation) {
|
||||
setLocation(simpleLocationManager?.getLocation())
|
||||
}
|
||||
}.build().let { videoCapture!!.output.prepareRecording(activity, it) }
|
||||
|
Reference in New Issue
Block a user