Skip to content

Commit 772cea8

Browse files
author
Igor Khomenko
committed
fixed audio issues on Cordova Android samples
1 parent 7995569 commit 772cea8

Some content is hidden

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

45 files changed

+346
-72
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ npm-debug.log
1818
**/build
1919

2020
*.xcarchive
21+
22+
# Android
23+
.gradle
24+
.idea

samples/cordova/video_chat/config.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget id="com.quickblox.cordova.video_chat" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget id="com.quickblox.cordova.video_chat" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
33
<name>QB Video Chat</name>
44
<description>
55
QuickBlox Apache Cordova simple code sample for Web Video (WebRTC) Chat (via QuickBlox SDK + API)
@@ -18,6 +18,14 @@
1818
<allow-intent href="geo:*" />
1919
<platform name="android">
2020
<allow-intent href="market:*" />
21+
<preference name="android-minSdkVersion" value="21" />
22+
<preference name="android-targetSdkVersion" value="21" />
23+
<config-file parent="/*" target="AndroidManifest.xml">
24+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
25+
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
26+
<uses-permission android:name="android.permission.CAMERA" />
27+
<uses-feature android:name="android.hardware.camera" />
28+
</config-file>
2129
</platform>
2230
<platform name="ios">
2331
<allow-intent href="itms:*" />
@@ -33,8 +41,8 @@
3341
<plugin name="cordova-plugin-iosrtc" spec="~3.1.0" />
3442
<plugin name="cordova-plugin-console" spec="~1.0.4" />
3543
<engine name="ios" spec="~4.3.0" />
36-
<engine name="android" spec="~6.0.0" />
3744
<engine name="browser" spec="~4.1.0" />
3845
<plugin name="cordova-custom-config" spec="~3.0.14" />
3946
<plugin name="cordova-plugin-device" spec="~1.1.3" />
47+
<engine name="android" spec="~6.1.1" />
4048
</widget>

samples/cordova/video_chat/platforms/android/.gradle/2.14.1/taskArtifacts/cache.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

samples/cordova/video_chat/platforms/android/AndroidManifest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@
1010
</intent-filter>
1111
</activity>
1212
</application>
13-
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
13+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
14+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
15+
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
16+
<uses-permission android:name="android.permission.CAMERA" />
17+
<uses-feature android:name="android.hardware.camera" />
1418
</manifest>
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":CordovaLib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":CordovaLib" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
18+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
19+
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
20+
<option name="LIBRARY_PROJECT" value="true" />
21+
</configuration>
22+
</facet>
23+
</component>
24+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
25+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
26+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
27+
<content url="file://$MODULE_DIR$">
28+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
29+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
59+
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
96+
</content>
97+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
98+
<orderEntry type="sourceFolder" forTests="false" />
99+
</component>
100+
</module>

samples/cordova/video_chat/platforms/android/CordovaLib/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
buildscript {
2222
repositories {
2323
mavenCentral()
24+
jcenter();
2425
}
2526

2627
dependencies {
27-
classpath 'com.android.tools.build:gradle:2.1.0'
28+
classpath 'com.android.tools.build:gradle:2.2.1'
2829
}
2930

3031
}

samples/cordova/video_chat/platforms/android/CordovaLib/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Indicates whether an apk should be generated for each density.
1111
split.density=false
1212
# Project target.
13-
target=android-24
13+
target=android-25
1414
apk-configurations=
1515
renderscript.opt.level=O0
1616
android.library=true

samples/cordova/video_chat/platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one
3131
* are not expected to implement it.
3232
*/
3333
public interface CordovaWebView {
34-
public static final String CORDOVA_VERSION = "6.0.0";
34+
public static final String CORDOVA_VERSION = "6.1.1";
3535

3636
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
3737

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
18+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
19+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
20+
</configuration>
21+
</facet>
22+
</component>
23+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
24+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
25+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
26+
<content url="file://$MODULE_DIR$">
27+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
28+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
29+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
58+
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
59+
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
96+
</content>
97+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
98+
<orderEntry type="sourceFolder" forTests="false" />
99+
<orderEntry type="module" module-name="CordovaLib" exported="" />
100+
</component>
101+
</module>

0 commit comments

Comments
 (0)