aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2009-08-27 12:03:08 +0000
committerDamian Minkov <damencho@jitsi.org>2009-08-27 12:03:08 +0000
commit73e587302c49e4e0c2d137b3ba99213f6a0f0bd6 (patch)
tree54bc2c444a1ba4880a9e88e1191d3482674ef18f /src/net/java
parenta9846ca1adaaa4d4d08fa84bc54b21786f2899ba (diff)
downloadjitsi-73e587302c49e4e0c2d137b3ba99213f6a0f0bd6.zip
jitsi-73e587302c49e4e0c2d137b3ba99213f6a0f0bd6.tar.gz
jitsi-73e587302c49e4e0c2d137b3ba99213f6a0f0bd6.tar.bz2
Enable filetransfer for aim. Fix compile errors.
Diffstat (limited to 'src/net/java')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java9
-rw-r--r--src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java5
-rw-r--r--src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java9
-rw-r--r--src/net/java/sip/communicator/impl/protocol/ssh/OperationSetFileTransferSSHImpl.java9
4 files changed, 30 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java
index 8debb9f..752eb43 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatTransport.java
@@ -179,6 +179,15 @@ public class ConferenceChatTransport
}
/**
+ * Returns the maximum file length supported by the protocol in bytes.
+ * @return the file length that is supported.
+ */
+ public long getMaximumFileLength()
+ {
+ return -1;
+ }
+
+ /**
* Invites the given contact in this chat conference.
*
* @param contactAddress the address of the contact to invite
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java
index 87d4ef9..140b9b8 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderServiceIcqImpl.java
@@ -532,12 +532,13 @@ public class ProtocolProviderServiceIcqImpl
OperationSetExtendedAuthorizations.class.getName(),
extendedAuth);
- OperationSetFileTransferIcqImpl fileTransferOpSet =
+ }
+
+ OperationSetFileTransferIcqImpl fileTransferOpSet =
new OperationSetFileTransferIcqImpl(this);
supportedOperationSets.put(
OperationSetFileTransfer.class.getName(),
fileTransferOpSet);
- }
isInitialized = true;
}
diff --git a/src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java b/src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java
index 82170da..49d8671 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java
+++ b/src/net/java/sip/communicator/impl/protocol/mock/MockOperationSetFileTransfer.java
@@ -236,4 +236,13 @@ public class MockOperationSetFileTransfer
listener.fileTransferCreated(event);
}
}
+
+ /**
+ * Returns the maximum file length supported by the protocol in bytes.
+ * @return the file length that is supported.
+ */
+ public long getMaximumFileLength()
+ {
+ return 2048*1024*1024;
+ }
}
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetFileTransferSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetFileTransferSSHImpl.java
index 828fcd6..985019e 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetFileTransferSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/OperationSetFileTransferSSHImpl.java
@@ -143,4 +143,13 @@ public class OperationSetFileTransferSSHImpl
logger.error("we should not be here !");
return null;
}
+
+ /**
+ * Returns the maximum file length supported by the protocol in bytes.
+ * @return the file length that is supported.
+ */
+ public long getMaximumFileLength()
+ {
+ return 2048*1024*1024;
+ }
}