Skip to content

Commit 389cef1

Browse files
author
Igor Khomenko
committed
added Android camera permissions for Cordova WebRTC sample
1 parent 3e2f5e0 commit 389cef1

File tree

14 files changed

+28
-4
lines changed

14 files changed

+28
-4
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#Fri May 27 12:53:37 EEST 2016
1+
#Fri May 27 13:41:19 EEST 2016

samples/webrtc-cordova/platforms/android/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@
1111
</activity>
1212
</application>
1313
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
14+
<uses-permission android:name="android.permission.CAMERA" />
15+
<uses-feature android:name="android.hardware.camera" />
1416
</manifest>

samples/webrtc-cordova/platforms/android/android.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
}
1919
]
2020
}
21+
},
22+
"AndroidManifest.xml": {
23+
"parents": {
24+
"/*": []
25+
}
2126
}
2227
}
2328
},

samples/webrtc-cordova/platforms/ios/QB VideoChat.xcodeproj/project.pbxproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
};
66
objectVersion = 46;
77
objects = {
8-
98
/* Begin PBXBuildFile section */
109
0207DA581B56EA530066E2B4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0207DA571B56EA530066E2B4 /* Images.xcassets */; };
1110
06BC01E5D0A441E2B8F8B726 /* PluginUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C1963E6D6764233BF7006CE /* PluginUtils.swift */; };
@@ -43,6 +42,7 @@
4342
D27E6326E6FB4092AAB4B589 /* PluginEnumerateDevices.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0C800750B4B4A468EDAF931 /* PluginEnumerateDevices.swift */; };
4443
E3B8C16046C3441181A92B20 /* PluginMediaStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E472DBC855446C92FA0B09 /* PluginMediaStream.swift */; };
4544
FBF9B30A0574444C997FAB6B /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8F325464F44307B6F43846 /* AudioToolbox.framework */; };
45+
978FC87734FF48FB951E6BF8 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C99F9BE778140B38968F567 /* ImageIO.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
4646
/* End PBXBuildFile section */
4747

4848
/* Begin PBXContainerItemProxy section */
@@ -141,6 +141,7 @@
141141
F840E1F0165FE0F500CFE078 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = config.xml; path = "QB VideoChat/config.xml"; sourceTree = "<group>"; };
142142
FA3B1198BCEB437B90A02A6C /* CoreVideo.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
143143
FB8F325464F44307B6F43846 /* AudioToolbox.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
144+
5C99F9BE778140B38968F567 /* ImageIO.framework */ = {isa = PBXFileReference; name = "ImageIO.framework"; path = "System/Library/Frameworks/ImageIO.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };
144145
/* End PBXFileReference section */
145146

146147
/* Begin PBXFrameworksBuildPhase section */
@@ -163,6 +164,7 @@
163164
537F89BD240F43F9B806C1F6 /* libstdc++.dylib in Frameworks */,
164165
B28906365017467784DF0F5F /* libsqlite3.0.dylib in Frameworks */,
165166
BA55193FEC264FF58C496944 /* VideoToolbox.framework in Frameworks */,
167+
978FC87734FF48FB951E6BF8 /* ImageIO.framework in Frameworks */,
166168
);
167169
runOnlyForDeploymentPostprocessing = 0;
168170
};
@@ -246,6 +248,7 @@
246248
EC3A6BEE9D634219841169A3 /* libstdc++.dylib */,
247249
CF9112701D7C48CC8E082595 /* libsqlite3.0.dylib */,
248250
10AF764B2EEA4E49A11DDA05 /* VideoToolbox.framework */,
251+
5C99F9BE778140B38968F567 /* ImageIO.framework */,
249252
);
250253
name = Frameworks;
251254
sourceTree = "<group>";
@@ -358,7 +361,7 @@
358361
29B97313FDCFA39411CA2CEA /* Project object */ = {
359362
isa = PBXProject;
360363
attributes = {
361-
LastSwiftUpdateCheck = 0730;
364+
LastSwiftUpdateCheck = 730;
362365
LastUpgradeCheck = 510;
363366
};
364367
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "QB VideoChat" */;

samples/webrtc-cordova/platforms/ios/frameworks.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
"libc++.dylib": 1,
1212
"libstdc++.dylib": 1,
1313
"libsqlite3.0.dylib": 1,
14-
"VideoToolbox.framework": 1
14+
"VideoToolbox.framework": 1,
15+
"ImageIO.framework": 1
1516
}

samples/webrtc-cordova/platforms/ios/ios.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
}
1919
]
2020
}
21+
},
22+
"*-Info.plist": {
23+
"parents": {
24+
"NSLocationWhenInUseUsageDescription": []
25+
}
2126
}
2227
}
2328
},

samples/webrtc-cordova/plugins/fetch.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,13 @@
2222
},
2323
"is_top_level": true,
2424
"variables": {}
25+
},
26+
"cordova-plugin-compat": {
27+
"source": {
28+
"type": "registry",
29+
"id": "cordova-plugin-compat"
30+
},
31+
"is_top_level": false,
32+
"variables": {}
2533
}
2634
}

0 commit comments

Comments
 (0)