Merge pull request #725 from pedrobmarin/pedrobmarin-development-auto-reconnect

loading bar and webrtc phone button

bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml

@@ -24,6 +24,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	
 	<mate:Listener type="{ModuleLoadEvent.MODULE_LOADING_STARTED}" method="moduleLoadingStarted" />
 	<mate:Listener type="{ModuleLoadEvent.MODULE_LOAD_PROGRESS}" method="moduleLoadProgress" />
+	<mate:Listener type="{ModuleLoadEvent.ALL_MODULES_LOADED}" method="allModulesLoaded" />
 	<mate:Listener type="{PortTestEvent.TEST_RTMP}" method="testRTMP" />
 	<mate:Listener type="{PortTestEvent.PORT_TEST_UPDATE}" method="testRTMPupdate" />
 	<mate:Listener type="{PortTestEvent.TUNNELING_FAILED}" method="tunnelingFailed" />
@@ -70,6 +71,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         //LogUtil.debug("Progress: " + totalProgress);
         this.setProgress(totalProgress/numModules, 100);
       }
+
+      private function allModulesLoaded(e:ModuleLoadEvent):void{
+        if (parent != null) parent.removeChild(this);
+      }
 						
       private function testRTMP(e:PortTestEvent):void{
         //- Cannot get locale string this early in loading process

bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as

@@ -419,5 +419,12 @@
       usingFlash = true;
       startCall(true);
     }
+
+    public function handleFlashLeftVoiceConference():void {
+      if (isConnected()) {
+        streamManager.stopStreams();
+        connectionManager.disconnect(true);
+      }
+    }
   }
 }

bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml

@@ -33,6 +33,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			import org.bigbluebutton.modules.phone.events.FlashCallDisconnectedEvent;
 			import org.bigbluebutton.modules.phone.events.FlashEchoTestHasAudioEvent;
 			import org.bigbluebutton.modules.phone.events.FlashEchoTestNoAudioEvent;
+			import org.bigbluebutton.modules.phone.events.FlashLeftVoiceConferenceEvent;
 			import org.bigbluebutton.modules.phone.events.FlashStartEchoTestCommand;
 			import org.bigbluebutton.modules.phone.events.FlashStopEchoTestCommand;
 			import org.bigbluebutton.modules.phone.events.FlashVoiceConnectionStatusEvent;
@@ -106,7 +107,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
   <EventHandlers type="{LeaveVoiceConferenceCommand.LEAVE_VOICE_CONF}">        
     <MethodInvoker generator="{FlashCallManager}" method="handleLeaveVoiceConferenceCommand" arguments="{event}"/>
   </EventHandlers>   
-  
+
+  <EventHandlers type="{FlashLeftVoiceConferenceEvent.LEFT_VOICE_CONFERENCE}">
+    <MethodInvoker generator="{FlashCallManager}" method="handleFlashLeftVoiceConference"/>
+  </EventHandlers>
+
   <EventHandlers type="{UseFlashModeCommand.USE_FLASH_MODE}">        
     <MethodInvoker generator="{FlashCallManager}" method="handleUseFlashModeCommand"/>
   </EventHandlers>