diff --git a/doc/help.htm b/doc/help.htm index 4e6e174..4a55885 100644 --- a/doc/help.htm +++ b/doc/help.htm @@ -18,10 +18,10 @@ (my-qt-function *c++* x y) ; call from Lisp -ensure-permissions (permission/permissions) +ensure-permissions (&rest permissions) - Android only; requests the passed permission, or a list of them. - Returns the permission if it was granted, or a list of the granted + Android only; requests the passed permissions. If granted, it returns + either the string (only one permission passed) or a list of granted permissions. (ensure-permissions "android.permission.ACCESS_FINE_LOCATION") diff --git a/src/cpp/ecl_ext.cpp b/src/cpp/ecl_ext.cpp index fe600ea..c3a5689 100644 --- a/src/cpp/ecl_ext.cpp +++ b/src/cpp/ecl_ext.cpp @@ -553,16 +553,16 @@ cl_object reload2() { } cl_object ensure_permissions2(cl_object l_permissions) { - /// args: (permission/permissions) - /// Android only; requests the passed permission, or a list of them. - /// Returns the permission if it was granted, or a list of the granted + /// args: (&rest permissions) + /// Android only; requests the passed permissions. If granted, it returns + /// either the string (only one permission passed) or a list of granted /// permissions. /// (ensure-permissions "android.permission.ACCESS_FINE_LOCATION") cl_object l_ret = ECL_T; #if (defined Q_OS_ANDROID) && (QT_VERSION > 0x050A00) // 5.10 QStringList permissions(toQStringList(l_permissions)); - QStringList denied; QStringList granted; + QStringList denied; Q_FOREACH (QString p, permissions) { if (QtAndroid::checkPermission(p) == QtAndroid::PermissionResult::Granted) { granted << p; diff --git a/src/lisp/ini.lisp b/src/lisp/ini.lisp index d19f55a..d388a07 100644 --- a/src/lisp/ini.lisp +++ b/src/lisp/ini.lisp @@ -214,8 +214,8 @@ ;;; android -(defun ensure-permissions (permissions) - (qrun* (%ensure-permissions (x:ensure-list permissions)))) +(defun ensure-permissions (&rest permissions) + (qrun* (%ensure-permissions permissions))) (defun qlog (arg1 &rest args) "args: (arg1 &rest args)