diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-06-21 21:27:09 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-06-21 21:27:09 +0200 |
commit | 392a754b44c35a51b70a79c0a1a265d5769c365f (patch) | |
tree | bcf862ed8af6990f2d3d73bfb9df17a78e36d10e /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
parent | eec3582aa7d92706fa5a519fc7110c6ac66b519d (diff) |
reworked permissions
* ask only for necessary permissions on start
* ask for location/microphone when requested
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index b34c22b71..c24946fbd 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -677,7 +677,17 @@ public class ConversationActivity extends XmppActivity return; } } - switch (attachmentChoice) { + if (attachmentChoice == ATTACHMENT_CHOICE_RECORD_VOICE) { + if (!hasMicPermission(attachmentChoice)) { + return; + } + } + if (attachmentChoice == ATTACHMENT_CHOICE_LOCATION) { + if (!hasLocationPermission(attachmentChoice)) { + return; + } + } + switch (attachmentChoice) { case ATTACHMENT_CHOICE_LOCATION: getPreferences().edit().putString("recently_used_quick_action", "location").apply(); break; @@ -767,7 +777,7 @@ public class ConversationActivity extends XmppActivity attachFile(requestCode); } } else { - Toast.makeText(this, R.string.no_storage_permission, Toast.LENGTH_SHORT).show(); + Toast.makeText(this, R.string.no_permission, Toast.LENGTH_SHORT).show(); } } |