Cancel any request permissions after the user has granted permission.

This commit is contained in:
Jimmy Shih
2013-01-25 15:19:41 -08:00
parent 19675f74ab
commit 19131fe4a0
3 changed files with 14 additions and 1 deletions
@@ -96,6 +96,7 @@ public class AccountChooserActivity extends Activity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) { switch (requestCode) {
case SyncUtils.DRIVE_PERMISSION_REQUEST_CODE: case SyncUtils.DRIVE_PERMISSION_REQUEST_CODE:
SyncUtils.cancelNotification(this);
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
driveCallback.onSuccess(); driveCallback.onSuccess();
} else { } else {
@@ -162,6 +162,17 @@ public class SyncUtils {
} }
return null; return null;
} }
/**
* Cancels any notification to request drive permission.
*
* @param context the context
*/
public static void cancelNotification(Context context) {
NotificationManager notificationManager = (NotificationManager) context.getSystemService(
Context.NOTIFICATION_SERVICE);
notificationManager.cancel(NOTIFICATION_ID);
}
/** /**
* Syncs now for the current account. * Syncs now for the current account.
@@ -138,11 +138,12 @@ public class GoogleSettingsActivity extends AbstractSettingsActivity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) { switch (requestCode) {
case SyncUtils.DRIVE_PERMISSION_REQUEST_CODE: case SyncUtils.DRIVE_PERMISSION_REQUEST_CODE:
SyncUtils.cancelNotification(this);
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
permissionCallback.onSuccess(); permissionCallback.onSuccess();
} else { } else {
permissionCallback.onFailure(); permissionCallback.onFailure();
} }
break; break;
default: default:
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);