Skip to content
Snippets Groups Projects
Unverified Commit 4ba9513a authored by Chad Pilkey's avatar Chad Pilkey Committed by GitHub
Browse files

Merge pull request #5302 from ritzalam/mobile-https

 - have client bind also to bigbluebuttons://
parents 08cc947e 45478c81
No related branches found
No related tags found
No related merge requests found
......@@ -101,7 +101,7 @@ You must have the BigBlueButton mobile client installed on your device for this
<%
} else if (joinURL.startsWith("https://")) {
joinURL = joinURL.replace("https", "bigbluebutton");
joinURL = joinURL.replace("https", "bigbluebuttons");
%>
<script language="javascript" type="text/javascript">
......
......@@ -316,8 +316,16 @@
<category android:name="android.intent.category.BROWSABLE" />
<!-- <data android:scheme="http" android:host="bbb.mobi" android:pathPattern=".*" />-->
<data android:scheme="bigbluebutton" />
<data android:scheme="bigbluebuttons" />
</intent-filter>
<!-- End Test for URL scheme -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="bigbluebuttons" />
</intent-filter>
</activity>
<service android:name="com.juankpro.ane.localnotif.LocalNotificationIntentService"/>
<receiver android:name="com.juankpro.ane.localnotif.AlarmIntentService" />
......@@ -347,6 +355,7 @@
<key>CFBundleURLSchemes</key>
<array>
<string>bigbluebutton</string>
<string>bigbluebuttons</string>
</array>
<key>CFBundleURLName</key>
<string>org.bigbluebutton</string>
......
......@@ -47,7 +47,7 @@ package org.bigbluebutton.air.main.views {
private function onInvokeEvent(invocation:InvokeEvent):void {
if (invocation.arguments.length > 0 && !Capabilities.isDebugger) {
var url:String = invocation.arguments[0].toString();
var url:String = invocation.arguments[0].toString();
if (url.lastIndexOf("://") != -1) {
if (userSession.mainConnection)
userSession.mainConnection.disconnect(true);
......@@ -91,6 +91,7 @@ package org.bigbluebutton.air.main.views {
if (url.lastIndexOf("://") != -1) {
url = getEndURL(url);
}
joinMeetingSignal.dispatch(url);
}
......@@ -98,7 +99,7 @@ package org.bigbluebutton.air.main.views {
* Replace the schema with "http"
*/
protected function getEndURL(origin:String):String {
return origin.replace('bigbluebutton://', 'http://');
return origin.replace('bigbluebutton://', 'http://').replace('bigbluebuttons://', 'https://');
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment