Merge pull request mailru#271 from im-saxo/hotfixes

flash fixes for #177, #199, #265

Author: RubaXa

dist/FileAPI.flash.camera.swf

@@ -1,14 +1,14 @@
 package
 {
-import flash.display.Bitmap;
 import flash.display.BitmapData;
 import flash.display.Sprite;
 import flash.display.StageAlign;
 import flash.display.StageScaleMode;
-import flash.events.*;
+import flash.events.Event;
+import flash.events.StatusEvent;
 import flash.media.Camera;
 import flash.media.Video;
-import flash.text.TextField;
+import flash.utils.setTimeout;
 
 public class FileAPI_flash_camera extends Sprite
 {
@@ -39,38 +39,20 @@ package
 // we need to show settings dialog, so we attach camera to a video
 video = new Video();
 video.attachCamera(camera);
+if (!camera.muted) {
+onCameraStatus(new StatusEvent(StatusEvent.STATUS, false, false, 'Camera.Unmuted'));
+}
+else {
+setTimeout(function ():void {
+if (securityPanelIsClosed()) {
+onCameraStatus(new StatusEvent(StatusEvent.STATUS, false, false, 'Camera.Muted'));
+}
+}, 1000);
+}
+
 } else {
 // callback with error
 }
-
-
-// test
-/*var tf:TextField = new TextField();
-tf.text = 'on';
-tf.x = 10;
-tf.width = 30;
-tf.addEventListener(MouseEvent.CLICK, function(event:MouseEvent):void {
-toggleCamera(true);
-});
-addChild(tf);
-
-tf = new TextField();
-tf.text = 'off';
-tf.x = 50;
-tf.width = 30;
-tf.addEventListener(MouseEvent.CLICK, function(event:MouseEvent):void {
-toggleCamera(false);
-});
-addChild(tf);
-
-tf = new TextField();
-tf.text = 'photo';
-tf.x = 100;
-tf.width = 30;
-tf.addEventListener(MouseEvent.CLICK, function(event:MouseEvent):void {
-shot();
-});
-addChild(tf);*/
 }
 
 public function toggleCamera(on:Boolean):void {
@@ -121,5 +103,31 @@ package
 // redispatch
 dispatchEvent(event.clone());
 }
+
+/**
+ * This code checks one time if the security panel is closed.
+ * When you open the security panel, you should run this test
+ * repeatedly with a timer (every 500ms seems to work well).
+ * If the security panel is closed, you can then clean up your timers
+ */
+private function securityPanelIsClosed():Boolean
+{
+// Why not just wait for an event from the SettingsPanel to know that it's closed? Because there isn't one.
+// See http://bugs.adobe.com/jira/browse/FP-41
+var closed:Boolean = true;
+var hack:BitmapData = new BitmapData(1,1);
+try
+{
+// Trying to capture the stage triggers a Security error when the settings dialog box is open. 
+hack.draw(stage);
+}
+catch (error:Error)
+{
+closed = false;
+}
+hack.dispose();
+hack = null;
+return (closed);
+}
 }
-}
+}

dist/FileAPI.flash.swf

@@ -481,6 +481,7 @@
 
 private function removeListener(): void
 {
+if (!_loader) return;
 _loader.removeEventListener( Event.COMPLETE, onComplete );
 _loader.removeEventListener( ProgressEvent.PROGRESS, onProgress );
 _loader.removeEventListener( IOErrorEvent.IO_ERROR, onIOError );
@@ -562,16 +563,17 @@
 
 }
 }
+import flash.utils.ByteArray;
 
 internal class FilePart
 {
 
-public var fileContent:flash.utils.ByteArray;
+public var fileContent:ByteArray;
 public var fileName:String;
 public var dataField:String;
 public var contentType:String;
 
-public function FilePart(fileContent:flash.utils.ByteArray, fileName:String, dataField:String = 'Filedata', contentType:String = 'application/octet-stream')
+public function FilePart(fileContent:ByteArray, fileName:String, dataField:String = 'Filedata', contentType:String = 'application/octet-stream')
 {
 this.fileContent = fileContent;
 this.fileName = fileName;

flash/camera/src/FileAPI_flash_camera.as

@@ -130,8 +130,8 @@ package ru.mail.commands
 }
 else 
 {
-//currentImageMap = fullImageMap.clone();
- currentImageMap = fullImageMap;
+currentImageMap = fullImageMap.clone();
+// currentImageMap = fullImageMap; // #199 #265 вернул обратно clone(), т.к. ниже есть currentImageMap.dispose() 
 }
 
 // ==============

flash/core/src/net/inspirit/MultipartURLLoader.as

@@ -514,19 +514,16 @@ package ru.mail.controller
  */
 public function getFileInfo(fileID:String, callback:String):void 
 {
-trace ("getFileInfo");
 LoggerJS.log('getFileInfo, fileID: '+fileID+', callback: '+callback );
 var file:BaseFileVO = _model.filesBuilder.getFileByID(fileID);
 if (!file) {
-trace ("file with id "+ fileID +" doen't exist"); 
 LoggerJS.log("getFileInfo, file with id "+ fileID +" doen't exist" );
 return;
 }
 
 var imageFactory:IImageFactory = file.imageFactory;
 (imageFactory as EventDispatcher).addEventListener(ImageTransformCompleteEvent.TYPE,function (event:ImageTransformCompleteEvent):void {
 event.currentTarget.removeEventListener(event.type, arguments.callee);
-trace("getfileinfo complete", event.isSuccess);
 LoggerJS.log("getFileInfo complete, success = "+ event.isSuccess );
 if (event.isSuccess && (file as IFileVO).imageData) 
 {

flash/core/src/ru/mail/commands/ResizeFileCommand.as

@@ -202,13 +202,10 @@ package ru.mail.data
 trace ("bitmap created, isSuccess", event.isSuccess);
 LoggerJS.log('ImageFactory bitmap created, success '+ event.isSuccess);
 if (event.isSuccess) {
- file.imageData = event.decodedBitmap.bitmapData;
-/*
 file.imageData = new BitmapData( event.decodedBitmap.width, event.decodedBitmap.height );
 file.imageData.copyPixels( event.decodedBitmap.bitmapData
 , new Rectangle( 0, 0, event.decodedBitmap.width, event.decodedBitmap.height ), new Point( 0, 0 ));
 event.decodedBitmap.bitmapData.dispose();
-*/
 
 createImageFromSource(imageTransform);
 }