Skip to content

Commit a07e931

Browse files
authored
Merge pull request #3932 from deltachat/adb/issue-3930
process permissions result in GroupCreateActivity
2 parents 20a3820 + 79f6010 commit a07e931

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* warn if the app has not been updated after 6 months instead of 1 year
1414
* avoid "unknown sender for this chat" error
1515
* properly display "Messages are end-to-end encrypted." in all encrypted groups
16+
* show dialog if user has permanently denied camera permission and tries to take picture for group avatar
1617
* several small fixes and improvements
1718
* update to core 2.17.0
1819

src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
3333
import org.thoughtcrime.securesms.mms.AttachmentManager;
3434
import org.thoughtcrime.securesms.mms.GlideApp;
35+
import org.thoughtcrime.securesms.permissions.Permissions;
3536
import org.thoughtcrime.securesms.profiles.AvatarHelper;
3637
import org.thoughtcrime.securesms.scribbles.ScribbleActivity;
3738
import org.thoughtcrime.securesms.util.SelectedContactsAdapter;
@@ -341,6 +342,12 @@ private SelectedContactsAdapter getAdapter() {
341342
return ret;
342343
}
343344

345+
@Override
346+
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
347+
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
348+
Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
349+
}
350+
344351
@Override
345352
public void onActivityResult(int reqCode, int resultCode, final Intent data) {
346353
super.onActivityResult(reqCode, resultCode, data);

0 commit comments

Comments
 (0)