Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make AndroidCamera compatible with android API >= 24 #649

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make AndroidCamera compatible with android API >= 24 #649

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35daf3e
Make AndroidCamera compatible with android API >= 24 by allowing to s…
antocuni Oct 11, 2021
67537a4
make flake8 happy
antocuni Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions plyer/platforms/android/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
import android
import android.activity
from os import remove
from jnius import autoclass, cast
from jnius import autoclass, cast, JavaException
from plyer.facades import Camera
from plyer.platforms.android import activity

Intent = autoclass('android.content.Intent')
PythonActivity = autoclass('org.kivy.android.PythonActivity')
MediaStore = autoclass('android.provider.MediaStore')
Uri = autoclass('android.net.Uri')
File = autoclass('java.io.File')
FileProvider = autoclass('android.support.v4.content.FileProvider')


class AndroidCamera(Camera):

FILEPROVIDER_AUTHORITY = None

def _take_picture(self, on_complete, filename=None):
assert(on_complete is not None)
self.on_complete = on_complete
self.filename = filename
android.activity.unbind(on_activity_result=self._on_activity_result)
android.activity.bind(on_activity_result=self._on_activity_result)
intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
uri = Uri.parse('file://' + filename)
uri = self._get_uri_for_file(filename)
parcelable = cast('android.os.Parcelable', uri)
intent.putExtra(MediaStore.EXTRA_OUTPUT, parcelable)
activity.startActivityForResult(intent, 0x123)
Expand All @@ -32,7 +36,7 @@ def _take_video(self, on_complete, filename=None):
android.activity.unbind(on_activity_result=self._on_activity_result)
android.activity.bind(on_activity_result=self._on_activity_result)
intent = Intent(MediaStore.ACTION_VIDEO_CAPTURE)
uri = Uri.parse('file://' + filename)
uri = self._get_uri_for_file(filename)
parcelable = cast('android.os.Parcelable', uri)
intent.putExtra(MediaStore.EXTRA_OUTPUT, parcelable)

Expand All @@ -54,6 +58,28 @@ def _remove(self, fn):
except OSError:
pass

def _get_uri_for_file(self, filename):
if self.FILEPROVIDER_AUTHORITY is None:
# default behavior, backward-compatible: works with Android <= 9
return Uri.parse('file://' + filename)
#
# For Android >= 10, we need to declare a FileProvider in
# AndroidManifest and set plyer.camera.FILEPROVIDER_AUTHORITY
# accordingly
curActivity = cast('android.app.Activity', PythonActivity.mActivity)
ctx = curActivity.getApplicationContext()
try:
return FileProvider.getUriForFile(ctx, self.FILEPROVIDER_AUTHORITY,
File(filename))
except JavaException:
raise Exception(
f'Cannot get a uri for filename {filename} for the '
f'Fileprovider authority {self.FILEPROVIDER_AUTHORITY}. This '
f'probably means that FILE_PROVIDER_PATHS is not configured '
f'correctly in AndroidManifest.xml and/or you need to change '
f'the value of plyer.camera.FILEPROVIDER_AUTHORITY'
)


def instance():
return AndroidCamera()