Skip to content

Commit 275d151

Browse files
authored
Merge pull request #36 from VirgilSecurity/dev
Added group chats
2 parents cd8dbd6 + ea0bdaf commit 275d151

File tree

85 files changed

+7303
-1872
lines changed

Some content is hidden

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

85 files changed

+7303
-1872
lines changed

.travis.yml

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,49 @@ jdk: oraclejdk8
55
# Include branches
66
branches:
77
only:
8-
- dev
9-
- master
8+
- dev
9+
- master
10+
- travis-setup
1011

1112
before_cache:
12-
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
13-
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
13+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
14+
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
1415

1516
cache:
16-
directories:
17-
- $HOME/.gradle/caches/
18-
- $HOME/.gradle/wrapper/
19-
- $HOME/.android/build-cache
17+
directories:
18+
- $HOME/.gradle/caches/
19+
- $HOME/.gradle/wrapper/
20+
- $HOME/.android/build-cache
2021

2122
env:
22-
global:
23-
- ANDROID_BUILD_API=28
24-
- ANDROID_BUILD_TOOLS=28.0.3
25-
- ANDROID_EMULATOR_API=24
26-
- ADB_INSTALL_TIMEOUT=5 # minutes
27-
- ANDROID_ABI=default/armeabi-v7a
28-
- secure: Nz/+LNm9NO3PgvrwLIKDVjlJTskzZPKYXWnNe1T8kUflcQp6dygc9M3tqOgXVRTb33DPhZFZoM04fHJ7iAAyOydH0uNt3nI8zujFiQg7wGOm4vUczk6PYQrWNe/uAyrov+KjLbjNElBxZPDgMDTRD2e3j+UG0X+Xzjm3LqrWChpDjS037EuCpEILNdNETkHeAMVwAvcHrWkXiFMO6aYCHV+teo0zivrELbo6MCaxfMOKY0eMckgxJFtQbAF3hshr98325cczvIzQt5J/bFBkMaBx0IkSDAktDk++jVnoqIfpQVkM6x4mSjz64Q22BW5wIHsgfkT/Cjm7vn1LNpQsPO28p1Ja/W3TqVCeU1XR6sm7Zn+3b7ecSfGjh7p8L6gu9rzpsGIHOG88aWZuqpnF5Vgxjs4l2AXd/luAjv0ATLY45A9SMllLgzixrV4R0xn/DWUlKHsZ4KjiZZipFRXHYvxI/iB8BJR+fRSPKqWWtVxB44mHN7zBS5PvRfu/L7AugF3C2+5OgU+r15u+hQYdHxOrQhWEUKObSJ42MKjEzwaH6oioYKee0ImdB1iPu0IP1jvcImtWanPGU/wxP4ssjTdEOAZepJg90gNes/Hx2gdal6iRtvN2G1xpCJXty4EBLbK2lIfXP6//IiQG0EDLAJfw5npRBluiDvG/tcDxW1E=
29-
- secure: C7b6XlTt+gqr3O4avm7CwgheSi0o0Hn0SQPZHa1Fs9+xbcNLI5EAE6BMNIDH/70aOl/DygJptxmr7Fx8NwAiU+dGWKqe6NhIqpZiizGz9o1J3FpoF5+v+r0777b2oHrqnUiBT7MO//3R1kFL4WmEyoEKzkwT5yMz3qnCI1feKCvKXtLdoyDt3E9w9fMz83lWSXIp0YYpaMyUDKBVwdkbPFbfvr9Ew2spWjTrUkb0gVTbz+GHzdX0Y0PrKHusdZiLQSd3MqmXP7y4VcIafzKEWgXaxe94GBc/r5v9RLBwhqORIhtcu0GJMq9KuWH2uROspgJ9jzgAAJcrTWxaNJ02oarRQF7QdJPdfuIq5XLGqOaMCLKAFjAaogyPacfbUmcfeFokbPW9I7LoHIDcCydSdYC3K3Iw725FoPoNhVncOuwxouMnaWECXLQVlxCQmNN8QSlTBC6bFrgQ/2NwkMPSkMKr+/dKxnPvnWmo6uzqGSZwnLoGlnIryNPzIf8CZTsSWcl6dWxw7LYNMuPOVZGz4AMN8NKFqIrbl0sE3cr00z8N1FHwX2hD2D6dYRMpnv5l6N6ZxxKQT4BwmmpnFIIiKJyoNodUlgYtZX3iJICLQcpmHTrTle+h6XT24biUFF/uPO2TUGmhCEVzLgdlPvbiCePlAg1oytJIxmXjrmCJx/A=
23+
global:
24+
- ANDROID_BUILD_API=28
25+
- ANDROID_BUILD_TOOLS=28.0.3
26+
- ANDROID_EMULATOR_API=24
27+
- ADB_INSTALL_TIMEOUT=5 # minutes
28+
- ANDROID_ABI=default/armeabi-v7a
29+
- secure: Nz/+LNm9NO3PgvrwLIKDVjlJTskzZPKYXWnNe1T8kUflcQp6dygc9M3tqOgXVRTb33DPhZFZoM04fHJ7iAAyOydH0uNt3nI8zujFiQg7wGOm4vUczk6PYQrWNe/uAyrov+KjLbjNElBxZPDgMDTRD2e3j+UG0X+Xzjm3LqrWChpDjS037EuCpEILNdNETkHeAMVwAvcHrWkXiFMO6aYCHV+teo0zivrELbo6MCaxfMOKY0eMckgxJFtQbAF3hshr98325cczvIzQt5J/bFBkMaBx0IkSDAktDk++jVnoqIfpQVkM6x4mSjz64Q22BW5wIHsgfkT/Cjm7vn1LNpQsPO28p1Ja/W3TqVCeU1XR6sm7Zn+3b7ecSfGjh7p8L6gu9rzpsGIHOG88aWZuqpnF5Vgxjs4l2AXd/luAjv0ATLY45A9SMllLgzixrV4R0xn/DWUlKHsZ4KjiZZipFRXHYvxI/iB8BJR+fRSPKqWWtVxB44mHN7zBS5PvRfu/L7AugF3C2+5OgU+r15u+hQYdHxOrQhWEUKObSJ42MKjEzwaH6oioYKee0ImdB1iPu0IP1jvcImtWanPGU/wxP4ssjTdEOAZepJg90gNes/Hx2gdal6iRtvN2G1xpCJXty4EBLbK2lIfXP6//IiQG0EDLAJfw5npRBluiDvG/tcDxW1E=
30+
- secure: C7b6XlTt+gqr3O4avm7CwgheSi0o0Hn0SQPZHa1Fs9+xbcNLI5EAE6BMNIDH/70aOl/DygJptxmr7Fx8NwAiU+dGWKqe6NhIqpZiizGz9o1J3FpoF5+v+r0777b2oHrqnUiBT7MO//3R1kFL4WmEyoEKzkwT5yMz3qnCI1feKCvKXtLdoyDt3E9w9fMz83lWSXIp0YYpaMyUDKBVwdkbPFbfvr9Ew2spWjTrUkb0gVTbz+GHzdX0Y0PrKHusdZiLQSd3MqmXP7y4VcIafzKEWgXaxe94GBc/r5v9RLBwhqORIhtcu0GJMq9KuWH2uROspgJ9jzgAAJcrTWxaNJ02oarRQF7QdJPdfuIq5XLGqOaMCLKAFjAaogyPacfbUmcfeFokbPW9I7LoHIDcCydSdYC3K3Iw725FoPoNhVncOuwxouMnaWECXLQVlxCQmNN8QSlTBC6bFrgQ/2NwkMPSkMKr+/dKxnPvnWmo6uzqGSZwnLoGlnIryNPzIf8CZTsSWcl6dWxw7LYNMuPOVZGz4AMN8NKFqIrbl0sE3cr00z8N1FHwX2hD2D6dYRMpnv5l6N6ZxxKQT4BwmmpnFIIiKJyoNodUlgYtZX3iJICLQcpmHTrTle+h6XT24biUFF/uPO2TUGmhCEVzLgdlPvbiCePlAg1oytJIxmXjrmCJx/A=
3031

3132
android:
32-
components:
33-
- tools # to get the new `repository-11.xml`
34-
- tools # to install Android SDK tools
35-
- platform-tools
36-
- build-tools-$ANDROID_BUILD_TOOLS
37-
- android-$ANDROID_BUILD_API
38-
- android-$ANDROID_EMULATOR_API
39-
- extra-android-m2repository # for design library
40-
- extra-google-m2repository
41-
- extra-google-google_play_services
42-
- addon-google_apis-google-28 # google play services
43-
- sys-img-armeabi-v7a-addon-google_apis-google-$ANDROID_BUILD_API
44-
- sys-img-armeabi-v7a-android-$ANDROID_EMULATOR_API
33+
components:
34+
- tools # to get the new `repository-11.xml`
35+
- tools # to install Android SDK tools
36+
- platform-tools
37+
- build-tools-$ANDROID_BUILD_TOOLS
38+
- android-$ANDROID_BUILD_API
39+
- android-$ANDROID_EMULATOR_API
40+
- extra-android-m2repository # for design library
41+
- extra-google-m2repository
42+
- extra-google-google_play_services
43+
- addon-google_apis-google-28 # google play services
44+
- sys-img-armeabi-v7a-addon-google_apis-google-$ANDROID_BUILD_API
45+
- sys-img-armeabi-v7a-android-$ANDROID_EMULATOR_API
4546

46-
licenses:
47-
- 'android-sdk-preview-license-52d11cd2'
48-
- 'android-sdk-license-.+'
49-
- 'google-gdk-license-.+'
47+
licenses:
48+
- 'android-sdk-preview-license-52d11cd2'
49+
- 'android-sdk-license-.+'
50+
- 'google-gdk-license-.+'
5051

5152
before_install:
5253
- yes | sdkmanager "platforms;android-28"
@@ -55,18 +56,19 @@ before_install:
5556
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
5657
- chmod +x gradlew
5758
- ./gradlew dependencies || true
59+
- openssl aes-256-cbc -K $encrypted_62e1b1822e5d_key -iv $encrypted_62e1b1822e5d_iv -in ethree-common/src/androidTest/resources/compat/compat_data.json.enc -out ethree-common/src/androidTest/resources/compat/compat_data.json -d
5860

5961
before_script:
60-
- android list targets
61-
- android list sdk --extended --no-ui --all
62-
- echo "y" | android update sdk -a --no-ui --filter sys-img-armeabi-v7a-android-$ANDROID_EMULATOR_API,sys-img-x86_64-android-$ANDROID_EMULATOR_API
63-
- echo no | android create avd --force -n test -t android-$ANDROID_EMULATOR_API --abi $ANDROID_ABI
64-
- QEMU_AUDIO_DRV=none emulator -avd test -no-window &
65-
- android-wait-for-emulator
66-
- adb shell input keyevent 82 &
62+
- android list targets
63+
- android list sdk --extended --no-ui --all
64+
- echo "y" | android update sdk -a --no-ui --filter sys-img-armeabi-v7a-android-$ANDROID_EMULATOR_API,sys-img-x86_64-android-$ANDROID_EMULATOR_API
65+
- echo no | android create avd --force -n test -t android-$ANDROID_EMULATOR_API --abi $ANDROID_ABI
66+
- QEMU_AUDIO_DRV=none emulator -avd test -no-window &
67+
- android-wait-for-emulator
68+
- adb shell input keyevent 82 &
6769

6870
script:
69-
- "./gradlew clean build connectedCheck -PdisablePreDex --stacktrace"
71+
- "./gradlew clean build connectedCheck -PdisablePreDex --stacktrace"
7072

7173
after_success:
7274
.ci/push-javadoc-to-gh-pages.sh

0 commit comments

Comments
 (0)