-
Notifications
You must be signed in to change notification settings - Fork 758
CB-10977 android: Removing global state used for permission requests #174
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you 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 org.apache.cordova.file; | ||
|
|
||
| import android.util.SparseArray; | ||
|
|
||
| import org.apache.cordova.CallbackContext; | ||
|
|
||
| /** | ||
| * Holds pending runtime permission requests | ||
| */ | ||
| class PendingRequests { | ||
| private int currentReqId = 0; | ||
| private SparseArray<Request> requests = new SparseArray<Request>(); | ||
|
|
||
| /** | ||
| * Creates a request and adds it to the array of pending requests. Each created request gets a | ||
| * unique result code for use with requestPermission() | ||
| * @param rawArgs The raw arguments passed to the plugin | ||
| * @param action The action this request corresponds to (get file, etc.) | ||
| * @param callbackContext The CallbackContext for this plugin call | ||
| * @return The request code that can be used to retrieve the Request object | ||
| */ | ||
| public synchronized int createRequest(String rawArgs, int action, CallbackContext callbackContext) { | ||
| Request req = new Request(rawArgs, action, callbackContext); | ||
| requests.put(req.requestCode, req); | ||
| return req.requestCode; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the request corresponding to this request code and removes it from the pending requests | ||
| * @param requestCode The request code for the desired request | ||
| * @return The request corresponding to the given request code or null if such a | ||
| * request is not found | ||
| */ | ||
| public synchronized Request getAndRemove(int requestCode) { | ||
| Request result = requests.get(requestCode); | ||
| requests.remove(requestCode); | ||
| return result; | ||
| } | ||
|
|
||
| /** | ||
| * Holds the options and CallbackContext for a call made to the plugin. | ||
| */ | ||
| public class Request { | ||
|
|
||
| // Unique int used to identify this request in any Android permission callback | ||
| private int requestCode; | ||
|
|
||
| // Action to be performed after permission request result | ||
| private int action; | ||
|
|
||
| // Raw arguments passed to plugin | ||
| private String rawArgs; | ||
|
|
||
| // The callback context for this plugin request | ||
| private CallbackContext callbackContext; | ||
|
|
||
| private Request(String rawArgs, int action, CallbackContext callbackContext) { | ||
| this.rawArgs = rawArgs; | ||
| this.action = action; | ||
| this.callbackContext = callbackContext; | ||
| this.requestCode = currentReqId ++; | ||
| } | ||
|
|
||
| public int getAction() { | ||
| return this.action; | ||
| } | ||
|
|
||
| public String getRawArgs() { | ||
| return rawArgs; | ||
| } | ||
|
|
||
| public CallbackContext getCallbackContext() { | ||
| return callbackContext; | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should there be a return after this line?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ha, yep! Good catch! It doesn't look like there was a return there before either so I wonder how that worked.