Merge pull request mailru#99 from im-saxo/dev

flash abort timeout

Author: RubaXa

FileAPI.flash.swf

@@ -14,6 +14,7 @@ package ru.mail.controller
 import flash.net.URLRequest;
 import flash.system.Security;
 import flash.utils.Timer;
+import flash.utils.setTimeout;
 
 import ru.mail.commands.LoadFileCommand;
 import ru.mail.commands.UploadCommand;
@@ -97,6 +98,9 @@ package ru.mail.controller
 if (options["flashId"]) {
 JSCaller.flashId = options["flashId"];
 }
+// abort timeout
+_model.timeout = options["timeout"];
+LoggerJS.log("timeout="+_model.timeout);
 
 setupChain();
 configureListeners();
@@ -630,25 +634,36 @@ package ru.mail.controller
  * @param fileID
  * 
  */
-public function cancelFile(fileID:String):void
+public function cancelFile(fileID:String, force:Boolean = false):void
 {
 trace ("{AppController} - cancelFile", fileID);
 
 var file:BaseFileVO = _model.filesBuilder.getFileByID(fileID);
 if (!file) {
+LoggerJS.log("abort: file with id "+ fileID +" doen't exist");
 trace ("file with id "+ fileID +" doen't exist"); 
 return;
 }
 
 if (file.uploadCommand) {
 (file.uploadCommand as UploadCommand).cancel();
+file.uploadCommand = null;
 }
 if (file.loadCommand) {
 (file.loadCommand as LoadFileCommand).cancel();
+file.loadCommand = null;
+}
+if (_model.timeout && !force) {
+LoggerJS.log("abort remove set timeout");
+file.timeout = setTimeout(function(_model:AttachmentsModel, file:BaseFileVO):void {
+LoggerJS.log("abort remove on timeout");
+_model.filesBuilder.removeFile(file);
+},_model.timeout, _model, file);
+} else {
+LoggerJS.log("abort remove immediately");
+_model.filesBuilder.removeFile(file);
+file = null;
 }
-_model.filesBuilder.removeFile(file);
-file = null;
-LoggerJS.log("abort complete");
 }
 
 /**
@@ -660,7 +675,7 @@ package ru.mail.controller
 var files:Vector.<BaseFileVO> = _model.filesBuilder.items;
 
 for each (var file:BaseFileVO in files) {
-cancelFile(file.fileID);
+cancelFile(file.fileID, true);
 }
 _model.filesBuilder.removeAllFiles();
 }

flash/src/ru/mail/controller/AppController.as

@@ -80,6 +80,25 @@ package ru.mail.data
 _hasError = false;
 }
 
+private var _timeout:int = 0;
+/**
+ * timeout for removing file
+ * When calling cmd.abort(), do not delete file immediately, but wait for some time.
+ * If file is called for upload or something, cancel timeout and do not remove file 
+ * @return
+ *
+ */
+public function get timeout():int
+{
+return _timeout;
+}
+
+public function set timeout(value:int):void
+{
+_timeout = int(value) || 0;
+}
+
+
 /**
  * @private Constructor 
  */

flash/src/ru/mail/data/AttachmentsModel.as

@@ -1,6 +1,7 @@
 package ru.mail.data.builder
 {
 import flash.events.EventDispatcher;
+import flash.utils.clearTimeout;
 
 import ru.mail.data.vo.BaseFileVO;
 
@@ -59,6 +60,9 @@ package ru.mail.data.builder
 {
 if (_items[i].fileID == fileID) {
 result = _items[i];
+if (result.timeout) {
+clearTimeout(result.timeout); // cancel file remove
+}
 break;
 }
 }
@@ -123,6 +127,9 @@ package ru.mail.data.builder
 result = _items.splice(index, 1)[0];
 result.loadCommand = null;
 result.uploadCommand = null;
+if(result.timeout) {
+clearTimeout(result.timeout);
+}
 }
 
 return result;
@@ -134,6 +141,11 @@ package ru.mail.data.builder
  */
 public function removeAllFiles():void
 {
+for (var i:uint = 0; i < _items.length; i++) { // for garbage collector
+if (_items[i].timeout) {
+clearTimeout(_items[i].timeout);
+}
+}
 _items.length = 0;
 }
 

flash/src/ru/mail/data/builder/AbstractDataBuilder.as

@@ -37,6 +37,8 @@ package ru.mail.data.vo
 public var loadCommand:Object;
 public var uploadCommand:Object;
 
+public var timeout:uint = 0; // timeout that can remove file
+
 private var _abstractImageFactory:AbstractImageFactory;
 
 public function set abstractImageFactory(value:AbstractImageFactory):void

flash/src/ru/mail/data/vo/BaseFileVO.as

@@ -86,6 +86,7 @@
 + '&flashId='+ id
 + '&storeKey='+ navigator.userAgent.match(/\d/ig).join('') +'_'+ api.version
 + (flash.isReady || (api.pingUrl ? '&ping='+api.pingUrl : ''))
++ '&timeout='+api.flashAbortTimeout
 });
 },