From a0600929774c1e90c7dc43043ff87b5ea84213b4 Mon Sep 17 00:00:00 2001 From: trivedigaurav Date: Sun, 29 Jun 2014 13:44:50 -0400 Subject: [PATCH] Activity was imported twice --- plyer/platforms/android/camera.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plyer/platforms/android/camera.py b/plyer/platforms/android/camera.py index 5a3f9ad05..a4c2f95f6 100644 --- a/plyer/platforms/android/camera.py +++ b/plyer/platforms/android/camera.py @@ -1,6 +1,3 @@ - -import android -import android.activity from os import unlink from jnius import autoclass, cast from plyer.facades import Camera @@ -18,8 +15,8 @@ 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) + activity.unbind(on_activity_result=self._on_activity_result) + activity.bind(on_activity_result=self._on_activity_result) intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE) uri = Uri.parse('file://' + filename) parcelable = cast('android.os.Parcelable', uri) @@ -29,7 +26,7 @@ def _take_picture(self, on_complete, filename=None): def _on_activity_result(self, requestCode, resultCode, intent): if requestCode != 0x123: return - android.activity.unbind(on_activity_result=self._on_activity_result) + activity.unbind(on_activity_result=self._on_activity_result) if self.on_complete(self.filename): self._unlink(self.filename)