[Zerofile-svn] SF.net SVN: zerofile: [72] trunk/src/XMPPLinkLocalChatSession.java

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 72
          http://zerofile.svn.sourceforge.net/zerofile/?rev=72&view=rev
Author:   karl-bengtsson
Date:     2007-12-04 07:19:07 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
now we try to send the file transfer stanza

Modified Paths:
--------------
    trunk/src/XMPPLinkLocalChatSession.java

Modified: trunk/src/XMPPLinkLocalChatSession.java
===================================================================

--- trunk/src/XMPPLinkLocalChatSession.java	2007-12-04 14:52:16 UTC (rev 71)
+++ trunk/src/XMPPLinkLocalChatSession.java	2007-12-04 15:19:07 UTC (rev 72)
@@ -51,22 +51,15 @@
 	
 	public void offerFileTransfer(String localFileNameAndPath)
 	{
-		System.out.println(localFileNameAndPath);
-		int lastSlashIndex = localFileNameAndPath.lastIndexOf('/');
-		if (!(lastSlashIndex >= 0 && lastSlashIndex < localFileNameAndPath.length() - 1))
-		{
-			System.out.println("blaaargh, felaktigt filnamn");
-		}
-		else
-		{
-			File filen = new File(localFileNameAndPath);
-			long sizeOfFile = filen.length();
-			String filnamn = localFileNameAndPath.substring(lastSlashIndex + 1);
-			String fileTransferStanza = "<message to=\""+_chatPartner.getServiceName()+"\" from=\""+ZeroconfRegistration.getMyServiceName()+"\"><body></body></message>";
-			fileTransferStanza += "<x xmlns=\"jabber:x:oob\">";
-			fileTransferStanza += "<url type=\"file\" size=\""+String.valueOf(sizeOfFile)+"\">";
-			fileTransferStanza += "http://10.100.46.243:5297/25E8656B83FBA3A2/"+filnamn+"</url></x></message>";
-		}
+		File filen = new File(localFileNameAndPath);
+		long sizeOfFile = filen.length();
+		String filnamn = filen.getName();
+		String fileTransferStanza = "<message to=\""+_chatPartner.getServiceName()+"\" from=\""+ZeroconfRegistration.getMyServiceName()+"\"><body></body></message>";
+		fileTransferStanza += "<x xmlns=\"jabber:x:oob\">";
+		fileTransferStanza += "<url type=\"file\" size=\""+String.valueOf(sizeOfFile)+"\">";
+		fileTransferStanza += "http://10.100.46.243:5297/25E8656B83FBA3A2/"+filnamn+"</url></x></message>";
+		_toRemoteHost.print(fileTransferStanza);
+		_toRemoteHost.flush();
 	}
 	
 	public XMPPLinkLocalChatSession(XMPPLinkLocalHost hostToChatWith)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


