diff --git a/CHANGELOG.md b/CHANGELOG.md index 23741fb9e..221d7ed07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ * warn if the app has not been updated after 6 months instead of 1 year * avoid "unknown sender for this chat" error * properly display "Messages are end-to-end encrypted." in all encrypted groups +* show dialog if user has permanently denied camera permission and tries to take picture for group avatar * several small fixes and improvements * add experimental built-in calls * update to core 2.17.0 diff --git a/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java index 41803e392..0ae42148b 100644 --- a/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java @@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto; import org.thoughtcrime.securesms.mms.AttachmentManager; import org.thoughtcrime.securesms.mms.GlideApp; +import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.scribbles.ScribbleActivity; import org.thoughtcrime.securesms.util.SelectedContactsAdapter; @@ -341,6 +342,12 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity return ret; } + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults); + } + @Override public void onActivityResult(int reqCode, int resultCode, final Intent data) { super.onActivityResult(reqCode, resultCode, data); diff --git a/src/main/res/layout/media_preview_activity.xml b/src/main/res/layout/media_preview_activity.xml index b151df949..002a571f3 100644 --- a/src/main/res/layout/media_preview_activity.xml +++ b/src/main/res/layout/media_preview_activity.xml @@ -3,6 +3,7 @@