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

made shareing text with conferences possible again

Browse source
This commit is contained in:
iNPUTmice 2014-09-07 13:01:09 +02:00
parent b334ebd0fa
commit d9990e6cd8
1 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/eu/siacs/conversations/ui/ShareWithActivity.java
View file

@ -64,9 +64,11 @@ public class ShareWithActivity extends XmppActivity {
&& resultCode == RESULT_OK) { && resultCode == RESULT_OK) {
share.contact = data.getStringExtra("contact"); share.contact = data.getStringExtra("contact");
share.account = data.getStringExtra("account"); share.account = data.getStringExtra("account");
Log.d(Config.LOGTAG,"contact: "+share.contact+" account:"+share.account); Log.d(Config.LOGTAG, "contact: " + share.contact + " account:"
+ share.account);
} }
if (xmppConnectionServiceBound && share != null && share.contact != null && share.account != null) { if (xmppConnectionServiceBound && share != null
&& share.contact != null && share.account != null) {
share(); share();
} }
} }
@ -92,7 +94,8 @@ public class ShareWithActivity extends XmppActivity {
public void onItemClick(AdapterView<?> arg0, View arg1, public void onItemClick(AdapterView<?> arg0, View arg1,
int position, long arg3) { int position, long arg3) {
Conversation conversation = mConversations.get(position); Conversation conversation = mConversations.get(position);
if (conversation.getMode() == Conversation.MODE_SINGLE) { if (conversation.getMode() == Conversation.MODE_SINGLE
|| share.uri == null) {
share(mConversations.get(position)); share(mConversations.get(position));
} }
} }
@ -121,37 +124,38 @@ public class ShareWithActivity extends XmppActivity {
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); if (getIntent().getType() != null
if (getIntent().getType() != null && getIntent().getType() && getIntent().getType().startsWith("image/")) {
.startsWith("image/")) {
this.share.uri = (Uri) getIntent().getParcelableExtra( this.share.uri = (Uri) getIntent().getParcelableExtra(
Intent.EXTRA_STREAM); Intent.EXTRA_STREAM);
} else { } else {
this.share.text = getIntent().getStringExtra(Intent.EXTRA_TEXT); this.share.text = getIntent().getStringExtra(Intent.EXTRA_TEXT);
} }
if (xmppConnectionServiceBound) {
xmppConnectionService.populateWithOrderedConversations(
mConversations, this.share.uri == null);
}
super.onStart();
} }
@Override @Override
void onBackendConnected() { void onBackendConnected() {
if (xmppConnectionServiceBound && share != null && share.contact != null && share.account != null) { if (xmppConnectionServiceBound && share != null
&& share.contact != null && share.account != null) {
share(); share();
return; return;
} }
xmppConnectionService.populateWithOrderedConversations(mConversations, xmppConnectionService.populateWithOrderedConversations(mConversations,
false); this.share != null && this.share.uri == null);
for (Conversation conversation : mConversations) {
if (conversation.getMode() == Conversation.MODE_MULTI) {
mConversations.remove(conversation);
}
}
} }
private void share() { private void share() {
Account account = xmppConnectionService.findAccountByJid(share.account); Account account = xmppConnectionService.findAccountByJid(share.account);
if (account==null) { if (account == null) {
return; return;
} }
Conversation conversation = xmppConnectionService.findOrCreateConversation(account, share.contact, false); Conversation conversation = xmppConnectionService
.findOrCreateConversation(account, share.contact, false);
share(conversation); share(conversation);
} }
@ -172,7 +176,7 @@ public class ShareWithActivity extends XmppActivity {
}); });
} else { } else {
switchToConversation(conversation,this.share.text, true); switchToConversation(conversation, this.share.text, true);
finish(); finish();
} }