Email: Update Email APP targetSdkVersion to 23
Cherry pick the one commit from the upstream CAF branch LA.BF.1.1.3
(revision rb1.15) that allows the AOSP e-mail app to be compatible with
runtime permissions.
FPIIM-669
Original commit message:
Incase of Email OTA or GMS runtime permissions issue.
Change-Id: I1dc1c5d65d3b96b302137bbd902737c1777da013
CRs-Fixed: 999214
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f619a34..fbd7812 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -47,7 +47,7 @@
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
<!-- This needs to be present when we are doing unbundled releases. -->
- <uses-sdk android:targetSdkVersion="21" android:minSdkVersion="14" />
+ <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="14" />
<!-- additional uses -->
@@ -380,6 +380,11 @@
android:label="@string/open_source_licenses">
</activity>
+ <activity android:name="com.android.email.activity.RequestPermissionsActivity" >
+ </activity>
+ <activity android:name="com.android.email.activity.RequestPermissionsActivityBase" >
+ </activity>
+
<!-- additional activities -->
<provider
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2f39425..f150d27 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -682,4 +682,5 @@
<!-- Name for preference entry which leads to the per-folder sync settings activity -->
<string name="folder_sync_settings_pref_title">Folder sync settings</string>
+ <string name="missing_required_permission">You have disabled a required permission.</string>
</resources>
diff --git a/src/com/android/email/activity/RequestPermissionsActivity.java b/src/com/android/email/activity/RequestPermissionsActivity.java
new file mode 100644
index 0000000..d5d9050
--- /dev/null
+++ b/src/com/android/email/activity/RequestPermissionsActivity.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Not a Contribution.
+ *
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.email.activity;
+
+import android.Manifest.permission;
+import android.app.Activity;
+import com.android.email.R;
+
+/**
+ * Activity that requests permissions needed for activities exported from Contacts.
+ */
+public class RequestPermissionsActivity extends RequestPermissionsActivityBase {
+
+ private static final String[] REQUIRED_PERMISSIONS = new String[]{
+ permission.READ_CONTACTS, // Contacts group
+ permission.READ_EXTERNAL_STORAGE,
+ permission.READ_CALENDAR, // Calendar group
+ permission.GET_ACCOUNTS,
+ permission.READ_PHONE_STATE
+ };
+
+ @Override
+ protected String[] getRequiredPermissions() {
+ return REQUIRED_PERMISSIONS;
+ }
+
+ @Override
+ protected String[] getDesiredPermissions() {
+ return new String[]{
+ permission.READ_CONTACTS, // Contacts group
+ permission.READ_EXTERNAL_STORAGE,
+ permission.READ_CALENDAR, // Calendar group
+ permission.GET_ACCOUNTS,
+ permission.READ_PHONE_STATE
+ };
+ }
+
+ public static boolean startPermissionActivity(Activity activity) {
+ return startPermissionActivity(activity,
+ REQUIRED_PERMISSIONS,
+ RequestPermissionsActivity.class);
+ }
+}
diff --git a/src/com/android/email/activity/RequestPermissionsActivityBase.java b/src/com/android/email/activity/RequestPermissionsActivityBase.java
new file mode 100644
index 0000000..3933dfb
--- /dev/null
+++ b/src/com/android/email/activity/RequestPermissionsActivityBase.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Not a Contribution.
+ *
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.email.activity;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Trace;
+import android.widget.Toast;
+
+import com.android.email.R;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Activity that asks the user for all {@link #getDesiredPermissions} if any of
+ * {@link #getRequiredPermissions} are missing.
+ *
+ * NOTE: As a result of b/22095159, this can behave oddly in the case where the final permission
+ * you are requesting causes an application restart.
+ */
+public abstract class RequestPermissionsActivityBase extends Activity {
+ public static final String PREVIOUS_ACTIVITY_INTENT = "previous_intent";
+ private static final int PERMISSIONS_REQUEST_ALL_PERMISSIONS = 1;
+
+ /**
+ * @return list of permissions that are needed in order for {@link #PREVIOUS_ACTIVITY_INTENT} to
+ * operate. You only need to return a single permission per permission group you care about.
+ */
+ protected abstract String[] getRequiredPermissions();
+
+ /**
+ * @return list of permissions that would be useful for {@link #PREVIOUS_ACTIVITY_INTENT} to
+ * operate. You only need to return a single permission per permission group you care about.
+ */
+ protected abstract String[] getDesiredPermissions();
+
+ private Intent mPreviousActivityIntent;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mPreviousActivityIntent = (Intent) getIntent().getExtras().get(PREVIOUS_ACTIVITY_INTENT);
+
+ // Only start a requestPermissions() flow when first starting this activity the first time.
+ // The process is likely to be restarted during the permission flow (necessary to enable
+ // permissions) so this is important to track.
+ if (savedInstanceState == null) {
+ requestPermissions();
+ }
+ }
+
+ /**
+ * If any permissions the Contacts app needs are missing, open an Activity
+ * to prompt the user for these permissions. Moreover, finish the current activity.
+ *
+ * This is designed to be called inside {@link android.app.Activity#onCreate}
+ */
+ protected static boolean startPermissionActivity(Activity activity,
+ String[] requiredPermissions, Class<?> newActivityClass) {
+ if (!RequestPermissionsActivity.hasPermissions(activity, requiredPermissions)) {
+ final Intent intent = new Intent(activity, newActivityClass);
+ intent.putExtra(PREVIOUS_ACTIVITY_INTENT, activity.getIntent());
+ activity.startActivity(intent);
+ activity.finish();
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode, String permissions[],
+ int[] grantResults) {
+ if (permissions != null && permissions.length > 0
+ && isAllGranted(permissions, grantResults)) {
+ mPreviousActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+ startActivity(mPreviousActivityIntent);
+ finish();
+ overridePendingTransition(0, 0);
+ } else {
+ Toast.makeText(this, R.string.missing_required_permission, Toast.LENGTH_SHORT).show();
+ finish();
+ }
+ }
+
+ private boolean isAllGranted(String permissions[], int[] grantResult) {
+ for (int i = 0; i < permissions.length; i++) {
+ if (grantResult[i] != PackageManager.PERMISSION_GRANTED
+ && isPermissionRequired(permissions[i])) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private boolean isPermissionRequired(String p) {
+ return Arrays.asList(getRequiredPermissions()).contains(p);
+ }
+
+ private void requestPermissions() {
+ Trace.beginSection("requestPermissions");
+ try {
+ // Construct a list of missing permissions
+ final ArrayList<String> unsatisfiedPermissions = new ArrayList<>();
+ for (String permission : getDesiredPermissions()) {
+ if (checkSelfPermission(permission)
+ != PackageManager.PERMISSION_GRANTED) {
+ unsatisfiedPermissions.add(permission);
+ }
+ }
+ if (unsatisfiedPermissions.size() == 0) {
+ throw new RuntimeException("Request permission activity was called even"
+ + " though all permissions are satisfied.");
+ }
+ requestPermissions(
+ unsatisfiedPermissions.toArray(new String[unsatisfiedPermissions.size()]),
+ PERMISSIONS_REQUEST_ALL_PERMISSIONS);
+ } finally {
+ Trace.endSection();
+ }
+ }
+
+ protected static boolean hasPermissions(Context context, String[] permissions) {
+ Trace.beginSection("hasPermission");
+ try {
+ for (String permission : permissions) {
+ if (context.checkSelfPermission(permission)
+ != PackageManager.PERMISSION_GRANTED) {
+ return false;
+ }
+ }
+ return true;
+ } finally {
+ Trace.endSection();
+ }
+ }
+}
diff --git a/src/com/android/email/activity/setup/AccountSetupFinal.java b/src/com/android/email/activity/setup/AccountSetupFinal.java
index adaa32a..772691e 100644
--- a/src/com/android/email/activity/setup/AccountSetupFinal.java
+++ b/src/com/android/email/activity/setup/AccountSetupFinal.java
@@ -43,6 +43,7 @@
import android.widget.Toast;
import com.android.email.R;
+import com.android.email.activity.RequestPermissionsActivity;
import com.android.email.setup.AuthenticatorSetupIntentHelper;
import com.android.email.service.EmailServiceUtils;
import com.android.emailcommon.VendorPolicyLoader;
@@ -182,6 +183,9 @@
@Override
public void onCreate(Bundle savedInstanceState) {
+ if (RequestPermissionsActivity.startPermissionActivity(this)) {
+ finish();
+ }
super.onCreate(savedInstanceState);
final Intent intent = getIntent();
diff --git a/src/com/android/email/activity/setup/EmailPreferenceActivity.java b/src/com/android/email/activity/setup/EmailPreferenceActivity.java
index cbb47b9..62fb401 100644
--- a/src/com/android/email/activity/setup/EmailPreferenceActivity.java
+++ b/src/com/android/email/activity/setup/EmailPreferenceActivity.java
@@ -27,6 +27,7 @@
import android.view.MenuItem;
import com.android.email.R;
+import com.android.email.activity.RequestPermissionsActivity;
import com.android.email.setup.AuthenticatorSetupIntentHelper;
import com.android.emailcommon.utility.IntentUtilities;
import com.android.mail.providers.UIProvider.EditSettingsExtras;
@@ -93,6 +94,9 @@
@Override
public void onCreate(Bundle savedInstanceState) {
+ if (RequestPermissionsActivity.startPermissionActivity(this)) {
+ finish();
+ }
super.onCreate(savedInstanceState);
final Intent i = getIntent();
diff --git a/src/com/android/email2/ui/MailActivityEmail.java b/src/com/android/email2/ui/MailActivityEmail.java
index 23b3fac..630a03b 100644
--- a/src/com/android/email2/ui/MailActivityEmail.java
+++ b/src/com/android/email2/ui/MailActivityEmail.java
@@ -27,6 +27,7 @@
import android.os.Bundle;
import com.android.email.Preferences;
+import com.android.email.activity.RequestPermissionsActivity;
import com.android.email.provider.EmailProvider;
import com.android.email.service.AttachmentService;
import com.android.email.service.EmailServiceUtils;
@@ -57,6 +58,9 @@
@Override
public void onCreate(Bundle bundle) {
+ if (RequestPermissionsActivity.startPermissionActivity(this)) {
+ finish();
+ }
final Intent intent = getIntent();
final Uri data = intent != null ? intent.getData() : null;
if (data != null) {