narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

added very basic, very untested gui on the receiving side

Browse source
This commit is contained in:
Daniel Gultsch 2014-04-14 21:21:13 +02:00
parent 18c3333271
commit 513f3c47b2
2 changed files with 60 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -209,7 +209,6 @@ public class ConversationFragment extends Fragment {
.findViewById(R.id.message_photo); .findViewById(R.id.message_photo);
viewHolder.imageView.setImageBitmap(selfBitmap); viewHolder.imageView.setImageBitmap(selfBitmap);
viewHolder.indicator = (ImageView) view.findViewById(R.id.security_indicator); viewHolder.indicator = (ImageView) view.findViewById(R.id.security_indicator);
viewHolder.image = (ImageView) view.findViewById(R.id.message_image);
break; break;
case RECIEVED: case RECIEVED:
view = (View) inflater.inflate( view = (View) inflater.inflate(
@ -231,6 +230,7 @@ public class ConversationFragment extends Fragment {
viewHolder = null; viewHolder = null;
break; break;
} }
viewHolder.image = (ImageView) view.findViewById(R.id.message_image);
viewHolder.messageBody = (TextView) view viewHolder.messageBody = (TextView) view
.findViewById(R.id.message_body); .findViewById(R.id.message_body);
viewHolder.time = (TextView) view viewHolder.time = (TextView) view
@ -256,8 +256,13 @@ public class ConversationFragment extends Fragment {
} }
if (item.getType() == Message.TYPE_IMAGE) { if (item.getType() == Message.TYPE_IMAGE) {
viewHolder.image.setVisibility(View.VISIBLE); viewHolder.image.setVisibility(View.VISIBLE);
if (item.getStatus() != Message.STATUS_RECIEVING) {
viewHolder.image.setImageBitmap(activity.xmppConnectionService.getFileBackend().getThumbnailFromMessage(item,(int) (metrics.density * 288))); viewHolder.image.setImageBitmap(activity.xmppConnectionService.getFileBackend().getThumbnailFromMessage(item,(int) (metrics.density * 288)));
viewHolder.messageBody.setVisibility(View.GONE); viewHolder.messageBody.setVisibility(View.GONE);
} else {
viewHolder.messageBody.setVisibility(View.VISIBLE);
viewHolder.messageBody.setText("receiving image file");
}
} else { } else {
if (viewHolder.image != null) viewHolder.image.setVisibility(View.GONE); if (viewHolder.image != null) viewHolder.image.setVisibility(View.GONE);
viewHolder.messageBody.setVisibility(View.VISIBLE); viewHolder.messageBody.setVisibility(View.VISIBLE);

37
src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

@ -133,6 +133,11 @@ public class JingleConnection {
Element fileSize = fileOffer.findChild("size"); Element fileSize = fileOffer.findChild("size");
Element fileName = fileOffer.findChild("name"); Element fileName = fileOffer.findChild("name");
this.file.setExpectedSize(Long.parseLong(fileSize.getContent())); this.file.setExpectedSize(Long.parseLong(fileSize.getContent()));
conversation.getMessages().add(message);
this.mXmppConnectionService.databaseBackend.createMessage(message);
if (this.mXmppConnectionService.convChangedListener!=null) {
this.mXmppConnectionService.convChangedListener.onConversationListChanged();
}
if (this.file.getExpectedSize()>=this.mJingleConnectionManager.getAutoAcceptFileSize()) { if (this.file.getExpectedSize()>=this.mJingleConnectionManager.getAutoAcceptFileSize()) {
Log.d("xmppService","auto accepting file from "+packet.getFrom()); Log.d("xmppService","auto accepting file from "+packet.getFrom());
this.sendAccept(); this.sendAccept();
@ -181,7 +186,7 @@ public class JingleConnection {
public void onIqPacketReceived(Account account, IqPacket packet) { public void onIqPacketReceived(Account account, IqPacket packet) {
if (packet.getType() != IqPacket.TYPE_ERROR) { if (packet.getType() != IqPacket.TYPE_ERROR) {
status = STATUS_ACCEPTED; status = STATUS_ACCEPTED;
connectWithCandidates(); connectNextCandidate();
} }
} }
}); });
@ -204,7 +209,7 @@ public class JingleConnection {
Content content = packet.getJingleContent(); Content content = packet.getJingleContent();
mergeCandidates(content.getCanditates()); mergeCandidates(content.getCanditates());
this.status = STATUS_ACCEPTED; this.status = STATUS_ACCEPTED;
this.connectWithCandidates(); this.connectNextCandidate();
IqPacket response = packet.generateRespone(IqPacket.TYPE_RESULT); IqPacket response = packet.generateRespone(IqPacket.TYPE_RESULT);
account.getXmppConnection().sendIqPacket(response, null); account.getXmppConnection().sendIqPacket(response, null);
} }
@ -240,6 +245,11 @@ public class JingleConnection {
@Override @Override
public void onFileTransmitted(JingleFile file) { public void onFileTransmitted(JingleFile file) {
if (initiator.equals(account.getFullJid())) {
mXmppConnectionService.markMessage(message, Message.STATUS_SEND);
} else {
mXmppConnectionService.markMessage(message, Message.STATUS_RECIEVED);
}
Log.d("xmppService","sucessfully transmitted file. sha1:"+file.getSha1Sum()); Log.d("xmppService","sucessfully transmitted file. sha1:"+file.getSha1Sum());
} }
}; };
@ -286,15 +296,24 @@ public class JingleConnection {
this.mXmppConnectionService.markMessage(this.message, Message.STATUS_SEND_REJECTED); this.mXmppConnectionService.markMessage(this.message, Message.STATUS_SEND_REJECTED);
} }
private void connectWithCandidates() { private void connectNextCandidate() {
for(Element candidate : this.candidates) { for(Element candidate : this.candidates) {
String cid = candidate.getAttribute("cid");
if (!connections.containsKey(cid)) {
this.connectWithCandidate(candidate);
break;
}
}
}
private void connectWithCandidate(Element candidate) {
final SocksConnection socksConnection = new SocksConnection(this,candidate); final SocksConnection socksConnection = new SocksConnection(this,candidate);
connections.put(socksConnection.getCid(), socksConnection); connections.put(socksConnection.getCid(), socksConnection);
socksConnection.connect(new OnSocksConnection() { socksConnection.connect(new OnSocksConnection() {
@Override @Override
public void failed() { public void failed() {
Log.d("xmppService","socks5 failed"); connectNextCandidate();
} }
@Override @Override
@ -311,7 +330,6 @@ public class JingleConnection {
} }
}); });
} }
}
private void disconnect() { private void disconnect() {
Iterator<Entry<String, SocksConnection>> it = this.connections.entrySet().iterator(); Iterator<Entry<String, SocksConnection>> it = this.connections.entrySet().iterator();
@ -378,4 +396,13 @@ public class JingleConnection {
mergeCandidate(c); mergeCandidate(c);
} }
} }
private Element getCandidate(String cid) {
for(Element c : this.candidates) {
if (c.getAttribute("cid").equals(cid)) {
return c;
}
}
return null;
}
} }