Merge "Revert "Add an activity to ask for optional permissions"" into nyc-dev (3d931ec1) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/common/activity/RequestDesiredPermissionsActivity.java

deleted100644 → 0

+0 −74

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 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.contacts.common.activity;

		import android.Manifest.permission;
		import android.app.Activity;
		import android.content.Intent;

		/**
		* Requests permissions that are not absolutely required by the calling Activity;
		* if permissions are denied, the calling Activity is still restarted.
		*
		* Activities that have a set of permissions that must be granted in order for the Activity to
		* function propertly should call
		* {@link RequestPermissionsActivity#startPermissionActivity(Activity, String[], Class)}
		* before calling {@link RequestDesiredPermissionsActivity#startPermissionActivity(Activity)}.
		*/
		public class RequestDesiredPermissionsActivity extends RequestPermissionsActivityBase {

		private static final String[] DESIRED_PERMISSIONS = new String[] {
		permission.ACCESS_FINE_LOCATION,
		permission.READ_CALENDAR,
		permission.READ_SMS,
		};

		@Override
		protected String[] getRequiredPermissions() {
		return DESIRED_PERMISSIONS;
		}

		@Override
		protected String[] getDesiredPermissions() {
		return DESIRED_PERMISSIONS;
		}

		/**
		* If any desired permissions the Contacts app needs are missing, open an Activity
		* to prompt the user for these permissions.
		*
		* This is designed to be called inside {@link android.app.Activity#onCreate}
		*/
		public static boolean startPermissionActivity(Activity activity) {
		if (activity.getIntent().getExtras().getBoolean(STARTED_PERMISSIONS_ACTIVITY, false)) {
		return false;
		}
		return startPermissionActivity(activity, DESIRED_PERMISSIONS,
		RequestDesiredPermissionsActivity.class);
		}

		@Override
		public void onRequestPermissionsResult(
		int requestCode, String permissions[], int[] grantResults) {
		mPreviousActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
		startActivity(mPreviousActivityIntent);
		overridePendingTransition(0, 0);

		finish();
		overridePendingTransition(0, 0);
		}
		}
		No newline at end of file

src/com/android/contacts/common/activity/RequestPermissionsActivity.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -16,12 +16,8 @@

		package com.android.contacts.common.activity;

		import com.android.contacts.common.R;

		import android.Manifest.permission;
		import android.app.Activity;
		import android.content.Intent;
		import android.widget.Toast;

		/**
		* Activity that requests permissions needed for activities exported from Contacts.
		@@ -52,24 +48,8 @@ public class RequestPermissionsActivity extends RequestPermissionsActivityBase {
		permission.READ_SMS, // SMS group
		};
		}

		public static boolean startPermissionActivity(Activity activity) {
		return startPermissionActivity(activity, REQUIRED_PERMISSIONS,
		RequestPermissionsActivity.class);
		}

		@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();
		}
		}
		}

src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java

+19 −9

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.os.Bundle;
		import android.os.Trace;
		import android.support.v4.app.ActivityCompat;
		import android.support.v4.content.ContextCompat;
		import android.widget.Toast;

		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -40,12 +41,7 @@ import java.util.Arrays;
		*/
		public abstract class RequestPermissionsActivityBase extends Activity
		implements ActivityCompat.OnRequestPermissionsResultCallback {

		public static final String PREVIOUS_ACTIVITY_INTENT = "previous_intent";

		/** Whether the permissions activity was already started. */
		protected static final String STARTED_PERMISSIONS_ACTIVITY = "started_permissions_activity";

		private static final int PERMISSIONS_REQUEST_ALL_PERMISSIONS = 1;

		/**
		@@ -60,7 +56,7 @@ public abstract class RequestPermissionsActivityBase extends Activity
		*/
		protected abstract String[] getDesiredPermissions();

		protected Intent mPreviousActivityIntent;
		private Intent mPreviousActivityIntent;

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		@@ -83,9 +79,8 @@ public abstract class RequestPermissionsActivityBase extends Activity
		*/
		protected static boolean startPermissionActivity(Activity activity,
		String[] requiredPermissions, Class<?> newActivityClass) {
		if (!hasPermissions(activity, requiredPermissions)) {
		if (!RequestPermissionsActivity.hasPermissions(activity, requiredPermissions)) {
		final Intent intent = new Intent(activity, newActivityClass);
		activity.getIntent().putExtra(STARTED_PERMISSIONS_ACTIVITY, true);
		intent.putExtra(PREVIOUS_ACTIVITY_INTENT, activity.getIntent());
		activity.startActivity(intent);
		activity.finish();
		@@ -101,7 +96,22 @@ public abstract class RequestPermissionsActivityBase extends Activity
		return false;
		}

		protected boolean isAllGranted(String permissions[], int[] grantResult) {
		@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])) {