mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into setup

This commit is contained in:
M66B 2021-01-23 19:03:26 +01:00
parent 167a5246d3 1b65c7a40e
commit 035af4d948
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -243,7 +243,7 @@ dependencies {
def recyclerview_version = "1.2.0-beta01"
def coordinatorlayout_version = "1.1.0"
def constraintlayout_version = "2.0.2"
def material_version = "1.3.0-beta01"
def material_version = "1.3.0-rc01"
def browser_version = "1.3.0"
def lbm_version = "1.0.0"
def swiperefresh_version = "1.2.0-alpha01"

6
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@ -404,10 +404,8 @@ public class FragmentSetup extends FragmentBase {
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
for (int i = 0; i < permissions.length; i++)
if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
if (Manifest.permission.READ_CONTACTS.equals(permissions[i]))
setContactsPermission(true);
}
if (Manifest.permission.READ_CONTACTS.equals(permissions[i]))
setContactsPermission(grantResults[i] == PackageManager.PERMISSION_GRANTED);
}
private void setContactsPermission(boolean granted) {