Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[TIMOB-20320] Android: Provide generic requestPermission(s) method #7778

Closed
wants to merge 3 commits into from
Closed

[TIMOB-20320] Android: Provide generic requestPermission(s) method #7778

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f84a0c9
Proposal for TIMOB-20320
stgrosshh Feb 25, 2016
bbb0778
Fix possible NPE issue
stgrosshh Feb 27, 2016
53b09bd
Code formatting as requested
stgrosshh Mar 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
222 changes: 171 additions & 51 deletions android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
package org.appcelerator.titanium;

import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Stack;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;

import org.appcelerator.kroll.KrollDict;
Expand Down Expand Up @@ -93,7 +96,45 @@ public abstract class TiBaseActivity extends AppCompatActivity
private TiWeakList<OnPrepareOptionsMenuEvent> onPrepareOptionsMenuListeners = new TiWeakList<OnPrepareOptionsMenuEvent>();
private APSAnalytics analytics = APSAnalytics.getInstance();


public static class PermissionContextData {
private final Integer requestCode;
private final KrollObject context;
private final KrollFunction callback;
private final String[] permissions;

public PermissionContextData(Integer requestCode, KrollFunction callback,
KrollObject context, String... perms) {
this.requestCode = requestCode;
this.callback = callback;
this.context = context;
this.permissions = perms;
}

public Integer getRequestCode() {
return requestCode;
}

public KrollFunction getCallback() {
return callback;
}

public KrollObject getContext() {
return context;
}

public String[] getPermissions() {
return permissions;
}
}

private ConcurrentHashMap<Integer,PermissionContextData> callbackDataByPermission = new ConcurrentHashMap<Integer, PermissionContextData>();

// mark as deprecated, we have no real control over usage and refactoring is not really possible due
// to direct access without a method based API. Used e.g in Titanium Media module
@Deprecated
public static KrollObject storageCallbackContext, cameraCallbackContext, contactsCallbackContext, oldCalendarCallbackContext, calendarCallbackContext, locationCallbackContext;
@Deprecated
public static KrollFunction storagePermissionCallback, cameraPermissionCallback, contactsPermissionCallback, oldCalendarPermissionCallback, calendarPermissionCallback, locationPermissionCallback;

protected View layout;
Expand Down Expand Up @@ -421,59 +462,138 @@ protected View createLayout()
return new TiCompositeLayout(this, arrangement, null);
}

private void permissionCallback(int[] grantResults, KrollFunction callback, KrollObject context, String permission) {
if (callback == null) {
return;
}
boolean granted = true;
for (int i = 0; i < grantResults.length; ++i) {
if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
granted = false;
break;
}
}
if (granted) {
KrollDict response = new KrollDict();
response.putCodeAndMessage(0, null);
callback.callAsync(context, response);
} else {
KrollDict response = new KrollDict();
response.putCodeAndMessage(-1, "One or more permission(s) were denied");
callback.callAsync(context, response);
}
}

@Override
public void onRequestPermissionsResult(int requestCode,
String permissions[], int[] grantResults) {
switch (requestCode) {
case TiC.PERMISSION_CODE_CAMERA: {
permissionCallback(grantResults, cameraPermissionCallback, cameraCallbackContext, "Camera");
return;
}
case TiC.PERMISSION_CODE_OLD_CALENDAR: {
permissionCallback(grantResults, oldCalendarPermissionCallback, oldCalendarCallbackContext, "Calendar");
return;
}
case TiC.PERMISSION_CODE_CALENDAR: {
permissionCallback(grantResults, calendarPermissionCallback, calendarCallbackContext, "Calendar");
return;
}
case TiC.PERMISSION_CODE_LOCATION: {
permissionCallback(grantResults, locationPermissionCallback, locationCallbackContext, "Location");
return;
}
case TiC.PERMISSION_CODE_CONTACTS: {
permissionCallback(grantResults, contactsPermissionCallback, contactsCallbackContext, "Contacts");
return;
}
case TiC.PERMISSION_CODE_EXTERNAL_STORAGE: {
permissionCallback(grantResults, storagePermissionCallback, storageCallbackContext, "Storage");
return;
}
@Override
public void onRequestPermissionsResult(int requestCode, String permissions[],
int[] grantResults) {
if (!callbackDataByPermission.isEmpty()) {
handlePermissionRequestResult(requestCode, permissions, grantResults);
return;
}
// old static implementation
switch (requestCode) {
case TiC.PERMISSION_CODE_CAMERA: {
permissionCallback(grantResults, cameraPermissionCallback,
cameraCallbackContext, "Camera");
return;
}

case TiC.PERMISSION_CODE_OLD_CALENDAR: {
permissionCallback(grantResults, oldCalendarPermissionCallback,
oldCalendarCallbackContext, "Calendar");
return;
}

case TiC.PERMISSION_CODE_CALENDAR: {
permissionCallback(grantResults, calendarPermissionCallback,
calendarCallbackContext, "Calendar");
return;
}

case TiC.PERMISSION_CODE_LOCATION: {
permissionCallback(grantResults, locationPermissionCallback,
locationCallbackContext, "Location");
return;
}

case TiC.PERMISSION_CODE_CONTACTS: {
permissionCallback(grantResults, contactsPermissionCallback,
contactsCallbackContext, "Contacts");
return;
}

case TiC.PERMISSION_CODE_EXTERNAL_STORAGE: {
permissionCallback(grantResults, storagePermissionCallback,
storageCallbackContext, "Storage");
return;
}

}
}

private void handlePermissionRequestResult(Integer requestCode,
String[] permissions, int[] grantResults) {
PermissionContextData cbd = callbackDataByPermission.get(requestCode);
if (cbd == null)
return;

List<String> deniedPerms = new ArrayList<String>(permissions.length);
boolean granted = true;
for (int i = 0; i < grantResults.length; ++i) {
if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
granted = false;
deniedPerms.add(permissions[i]);
}
}

KrollDict response = new KrollDict();
if (granted) {
response.putCodeAndMessage(0, null);
response.put("requestCode", requestCode);
response.put("permissions", permissions);
} else {
response.putCodeAndMessage(-1, "One or more permission(s) were denied");
response.put("requestCode", requestCode);
response.put("permissions", permissions);
String[] denied = deniedPerms.toArray(new String[deniedPerms.size()]);
response.put("denied", denied);
}

KrollFunction callback = cbd.getCallback();
if (callback != null) {
KrollObject context = cbd.getContext();
if (context == null)
Log.w("Permissions", "Callback context object is null");
callback.callAsync(context, response);
} else {
Log.w("Permissions", "Callback function has been garbage collected!?");
}
}

@Deprecated
private void permissionCallback(int[] grantResults, KrollFunction callback,
KrollObject context, String permission) {
if (callback == null) {
return;
}
boolean granted = true;
for (int i = 0; i < grantResults.length; ++i) {
if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
granted = false;
break;
}
}
if (granted) {
KrollDict response = new KrollDict();
response.putCodeAndMessage(0, null);
callback.callAsync(context, response);
} else {
KrollDict response = new KrollDict();
response.putCodeAndMessage(-1, "One or more permission(s) were denied");
callback.callAsync(context, response);
}
}

}
}
/**
* register permission request result callback for activity
*
* @param requestCode request code (8 Bit) to associate callback with request
* @param callback callback function which receives a KrollDict with success,
* code, optional message and requestCode
* @param context KrollObject as required by async callback pattern
* @param requestedPermissions one or more requested permission
*/
public void registerPermissionRequestCallback(Integer requestCode,
KrollFunction callback,
KrollObject context,
String... requestedPermissions) {
// TBD: shall we assert any pre conditions here? Is duplicate registration ok?
if (callback != null && context != null) {
PermissionContextData callbackContext = new PermissionContextData(requestCode,
callback, context, requestedPermissions);
callbackDataByPermission.put(requestCode, callbackContext);
}
}

protected void setFullscreen(boolean fullscreen)
{
Expand Down