Skip to content

Commit b767cf8

Browse files
committed
Merge remote-tracking branch 'upstream/develop-9.0' into merge_develop_9.0-28.08.2018
2 parents f474096 + 9ea857b commit b767cf8

File tree

65 files changed

+888
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+888
-232
lines changed

.gitignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ encryptedstack.cpp
2020
encryptedstack.h
2121
stacksecurity_encrypted.cpp
2222
util/perfect/perfect.linux-*
23-
extensions/*/*/*.xml
24-
extensions/*/*/*.lci
25-
extensions/*/*/*.lcm
26-
extensions/*/*/*.lce
27-
extensions/*/*/api.lcdoc
23+
**/extensions/*/*/*.xml
24+
**/extensions/*/*/*.lci
25+
**/extensions/*/*/*.lcm
26+
**/extensions/*/*/*.lce
27+
**/extensions/*/*/api.lcdoc
28+
*/src/.lci/*
2829

2930
# Compiled source and intermediates #
3031
###################

Makefile.common

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ guess_linux_arch_script := \
4343
case `uname -p` in \
4444
x86_64) echo x86_64 ;; \
4545
x86|i*86) echo x86 ;; \
46+
unknown) case `uname -m` in \
47+
x86_64) echo x86_64 ;; \
48+
x86|i*86) echo x86 ;; \
49+
esac ;; \
4650
esac
4751
guess_linux_arch := $(shell $(guess_linux_arch_script))
4852

docs/development/testing.md

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,33 @@ Before running each test command, the test framework inserts a test library stac
6161
* `TestAssert pDescription, pExpectTrue`: Make a test assertion. The test is recorded as a failure if *pExpectTrue* is false. *pDescription* should be a short string that describes the test (e.g. "clipboard is clear").
6262
* `TestSkip pDescription, pReasonSkipped`: Record a test as having been skipped. *pReasonSkipped* should be a short explanation of why the test was skipped (e.g. "not supported on Windows").
6363
* `TestSkipIf pRequirement, pOptions`: Skip a test if the requirements
64-
are met. `pOptions` varies depending on the `pRequirement` enum. The
65-
following requirements are implemented:
66-
- `ide` - the IDE repo is available. No options.
64+
are met. `pOptions` varies depending on the `pRequirement` enum (if no
65+
options are explicitly specified then no options are available for that
66+
particular `pRequirement`. The following requirements are implemented:
67+
- `ide` - the IDE repo is available
6768
- `lcb` - LCB compilation supported
68-
- `docs` - the docs are available. No options.
69+
- `docs` - the docs are available
70+
- `standalone` - the test is running in the standalone test runner
6971
- `securityPermissions` - Option `set` to skip if a test should not
7072
set the `securityPermissions`
7173
- `platform` - options are comma delimited platform strings
7274
- `processor` - options are comma delimited processor strings
7375
- `stack` - options are comma delimited stack names to test if they
7476
are available
7577
- `environment` - options are comma delimited environment strings
78+
- `clipboard` - access to the clipboard is available
79+
- `wait` - the `wait` command is available and works as expected
80+
- `security` - the security module is available
81+
- `write` - write access to the filesystem is available
82+
- `ui` - the test is running in a graphical environment (as opposed
83+
to the command line)
84+
- `desktop` - the test is running on a desktop computer
85+
- `mobile` - the test is running on a mobile device
86+
- `external` - an external module can be loaded/used. Options are a
87+
comma delimited list of external module names
88+
- `database` - an database module can be loaded/used. Options are a
89+
comma delimited list of external module names
90+
- `jvm` - the Java Virtual Machine is available
7691
* `TestSkipIfNot pRequirement, pOptions`: Skip a test if the
7792
requirements are not met. Requirements and options are the same as for
7893
`TestSkipIf`.
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
Name: androidRequestPermission
2+
3+
Type: command
4+
5+
Syntax: androidRequestPermission <permissionName>
6+
7+
Summary:
8+
Displays a dialog showing a permission request for <permissionName>. If a user has already granted permission for <permissionName>, this command does nothing.
9+
10+
Introduced: 9.0.1
11+
12+
OS: android
13+
14+
Platforms: mobile
15+
16+
Example:
17+
local tCameraPermissionGranted
18+
put androidHasPermission("android.permission.CAMERA") into tCameraPermissionGranted
19+
if not tCameraPermissionGranted then
20+
androidRequestPermission "android.permission.CAMERA"
21+
end if
22+
put androidHasPermission("android.permission.CAMERA") into tCameraPermissionGranted
23+
if not tCameraPermissionGranted then
24+
answer "This app is not permitted to access the device camera. You can change this" && \
25+
"in the Settings app."
26+
end if
27+
28+
29+
Parameters:
30+
permissionName (enum):
31+
The name of the permission to request.
32+
33+
- "android.permission.READ_CALENDAR": permission to allow an application to read the device's calendar.
34+
- "android.permission.WRITE_CALENDAR": permission to allow an application to write to the device's calendar.
35+
- "android.permission.CAMERA": permission to allow an application to access the device's camera.
36+
- "android.permission.ACCESS_COARSE_LOCATION": permission to allow an application to access the device's coarse location.
37+
- "android.permission.ACCESS_FINE_LOCATION": permission to allow an application to access the device's fine location.
38+
- "android.permission.READ_CONTACTS": permission to allow an application to read data from the device's contacts.
39+
- "android.permission.WRITE_CONTACTS": permission to allow an application to write date to the device's contacts.
40+
- "android.permission.GET_ACCOUNTS": permission to allow an application to access to the list of accounts in the Accounts Service.
41+
- "android.permission.RECORD_AUDIO": permission to allow an application to allow an application to record audio.
42+
- "android.permission.READ_EXTERNAL_STORAGE": permission to allow an application to read data from the device's external storage.
43+
- "android.permission.WRITE_EXTERNAL_STORAGE": permission to allow an application to write data to the device's external storage.
44+
- "android.permission.READ_PHONE_STATE": permission to allow an application to access phone state, including the phone number of the device, current cellular network information, the status of any ongoing calls, and a list of any PhoneAccounts registered on the device.
45+
- "android.permission.READ_PHONE_NUMBERS": permission to allow an application to access the device's phone number(s).
46+
- "android.permission.CALL_PHONE": permission to allow an application to initiate a phone call without going through the Dialer user interface for the user to confirm the call.
47+
- "android.permission.ANSWER_PHONE_CALLS": permission to allow an application to answer an incoming phone call.
48+
- "android.permission.READ_CALL_LOG": permission to allow an application to read the user's call log.
49+
- "android.permission.WRITE_CALL_LOG": permission to allow an application to write to the user's call log.
50+
- "android.permission.ADD_VOICEMAIL": permission to allow an application to add voicemails into the system.
51+
- "android.permission.USE_SIP": permission to allow an application to use SIP service.
52+
- "android.permission.PROCESS_OUTGOING_CALLS": permission to allow an application to see the number being dialed during an outgoing call with the option to redirect the call to a different number or abort the call altogether.
53+
- "android.permission.SEND_SMS": permission to allow an application to send SMS messages.
54+
- "android.permission.RECEIVE_SMS": permission to allow an application to receive SMS messages
55+
- "android.permission.READ_SMS": permission to allow an application to read SMS messages.
56+
- "android.permission.RECEIVE_WAP_PUSH": permission to allow an application to receive WAP push messages.
57+
- "android.permission.RECEIVE_MMS": permission to allow an application to receive MMS messages.
58+
- "android.permission.BODY_SENSORS": permission to allow an application to access data from sensors that the user uses to measure what is happening inside his/her body, such as heart rate.
59+
60+
61+
62+
Description:
63+
Use the <androidRequestPermission> command to request permission for <permissionName> from the user.
64+
65+
>*Note:* Permission names are case sensitive.

docs/dictionary/command/mobilePickMedia.lcdoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,17 @@ to select multiple items on iOS, the user has to select the Done button,
7676
once all of the selections have been made.
7777

7878
The remaining arguments specify the type of media items the user should
79-
> be allowed to select from the iPod library. On Android, it is not
80-
> necessary to specify any arguments. The application that is launched
81-
> is in control of the audio media types that are to be selected.
79+
be allowed to select from the iPod library. On Android, it is not
80+
necessary to specify any arguments. The application that is launched
81+
is in control of the audio media types that are to be selected.
8282
>*Note:* <mobilePickMedia> does not return anything for m4p files or
8383
> iCloud files that are not physically on the device, even if they are
8484
> displayed in the picker itself.
85+
8586
>*Note:* On iOS, <mobilePickMedia> returns references to the iTunes data
8687
> store on the iOS device. These media references can only be played
8788
> with the <mobilePlaySoundOnChannel> command.
89+
8890
>*Note:* <mobilePickMedia> is not available on the iOS simulator.
8991

9092
References: mobilePlaySoundOnChannel (command), mobilePick (command),

docs/dictionary/command/mobilePickPhoto.lcdoc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ mobilePickPhoto "front camera", 250, 250
2323

2424
Parameters:
2525
source (enum):
26-
The source for the image. One of:
26+
The source for the image.
2727

28-
- "library"
29-
- "album"
30-
- "camera"
31-
32-
33-
- "rear camera": iOS only
34-
- "front camera": iOS only
28+
- "library":
29+
- "album":
30+
- "camera":
31+
- "rear camera": iOS only
32+
- "front camera": iOS only
3533

3634

3735
maxwidth:

docs/dictionary/command/mobilePlaySoundOnChannel.lcdoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ channel:
3333
The name of the channel to play the sound on.
3434

3535
type (enum):
36-
One of:
37-
3836
- "now": The sound is played immediately, replacing any current sound
3937
(and queued sound) on the channel.
4038
- "next": The sound is queued to play immediately after the current

docs/dictionary/command/mobileSetLocationHistoryLimit.lcdoc

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,19 @@ sample provided with the <locationChanged> event (which will always be
5757
the last sample in the history). e.g.
5858

5959
on locationChanged
60-
61-
local tHistory
62-
put mobileGetLocationHistory() into tHistory
63-
repeat for each element tSample in tHistory
64-
65-
processLocationChanged tSample
66-
67-
end repeat
60+
local tHistory
61+
put mobileGetLocationHistory() into tHistory
62+
repeat for each element tSample in tHistory
63+
processLocationChanged tSample
64+
end repeat
6865
end locationChanged
6966

7067

7168
References: mobileStopTrackingSensor (command),
72-
mobileStartTrackingSensor (command), mobileGetLocationHistory (function),
69+
mobileStartTrackingSensor (command),
70+
mobileGetLocationHistory (function),
7371
mobileGetLocationHistoryLimit (function),
7472
mobileSensorAvailable (function), mobileSensorReading (function),
75-
mobileLocationAuthorizationStatus (function), locationChanged (message),
76-
trackingError (message)
73+
mobileLocationAuthorizationStatus (function),
74+
locationChanged (message), trackingError (message)
7775

docs/dictionary/command/mobileStartTrackingSensor.lcdoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ loosely (enum):
3333
How accurate the readings from sensors should be. The default value is
3434
false
3535

36-
- "true": readings are determined without using accurate(but power
36+
- "true": readings are determined without using accurate (but power
3737
consuming) sources such as GPS.
38-
- "false": readings are determined using accurate(but power consuming)
38+
- "false": readings are determined using accurate (but power consuming)
3939
sources such as GPS.
4040

4141

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
Name: androidHasPermission
2+
3+
Type: function
4+
5+
Syntax: androidHasPermission(<permissionName>)
6+
7+
Summary:
8+
Returns if permission <permissionName> has been granted by the user.
9+
10+
Introduced: 9.0.1
11+
12+
OS: android
13+
14+
Platforms: mobile
15+
16+
Example:
17+
local tLocationPermissionGranted
18+
put androidHasPermission("android.permission.ACCESS_FINE_LOCATION") into tLocationPermissionGranted
19+
if not tLocationPermissionGranted then
20+
androidRequestPermission "android.permission.ACCESS_FINE_LOCATION"
21+
end if
22+
if not tLocationPermissionGranted then
23+
answer "This app is not permitted to access the device location. You can change this" && \
24+
"in the Settings app."
25+
end if
26+
27+
28+
Parameters:
29+
permissionName (enum):
30+
The name of the permission to request.
31+
32+
- "android.permission.READ_CALENDAR": permission to allow an application to read the device's calendar.
33+
- "android.permission.WRITE_CALENDAR": permission to allow an application to write to the device's calendar.
34+
- "android.permission.CAMERA": permission to allow an application to access the device's camera.
35+
- "android.permission.ACCESS_COARSE_LOCATION": permission to allow an application to access the device's coarse location.
36+
- "android.permission.ACCESS_FINE_LOCATION": permission to allow an application to access the device's fine location.
37+
- "android.permission.READ_CONTACTS": permission to allow an application to read data from the device's contacts.
38+
- "android.permission.WRITE_CONTACTS": permission to allow an application to write date to the device's contacts.
39+
- "android.permission.GET_ACCOUNTS": permission to allow an application to access to the list of accounts in the Accounts Service.
40+
- "android.permission.RECORD_AUDIO": permission to allow an application to allow an application to record audio.
41+
- "android.permission.READ_EXTERNAL_STORAGE": permission to allow an application to read data from the device's external storage.
42+
- "android.permission.WRITE_EXTERNAL_STORAGE": permission to allow an application to write data to the device's external storage.
43+
- "android.permission.READ_PHONE_STATE": permission to allow an application to access phone state, including the phone number of the device, current cellular network information, the status of any ongoing calls, and a list of any PhoneAccounts registered on the device.
44+
- "android.permission.READ_PHONE_NUMBERS": permission to allow an application to access the device's phone number(s).
45+
- "android.permission.CALL_PHONE": permission to allow an application to initiate a phone call without going through the Dialer user interface for the user to confirm the call.
46+
- "android.permission.ANSWER_PHONE_CALLS": permission to allow an application to answer an incoming phone call.
47+
- "android.permission.READ_CALL_LOG": permission to allow an application to read the user's call log.
48+
- "android.permission.WRITE_CALL_LOG": permission to allow an application to write to the user's call log.
49+
- "android.permission.ADD_VOICEMAIL": permission to allow an application to add voicemails into the system.
50+
- "android.permission.USE_SIP": permission to allow an application to use SIP service.
51+
- "android.permission.PROCESS_OUTGOING_CALLS": permission to allow an application to see the number being dialed during an outgoing call with the option to redirect the call to a different number or abort the call altogether.
52+
- "android.permission.SEND_SMS": permission to allow an application to send SMS messages.
53+
- "android.permission.RECEIVE_SMS": permission to allow an application to receive SMS messages
54+
- "android.permission.READ_SMS": permission to allow an application to read SMS messages.
55+
- "android.permission.RECEIVE_WAP_PUSH": permission to allow an application to receive WAP push messages.
56+
- "android.permission.RECEIVE_MMS": permission to allow an application to receive MMS messages.
57+
- "android.permission.BODY_SENSORS": permission to allow an application to access data from sensors that the user uses to measure what is happening inside his/her body, such as heart rate.
58+
59+
Returns(boolean):
60+
True if permission has been granted, false otherwise.
61+
62+
63+
Description:
64+
Use the <androidRequestPermission> function to find out if permission <permissionName> has been granted by the user.
65+
66+
>*Note:* Permission names are case sensitive.

0 commit comments

Comments
 (0)