sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed image sharing with contacts that have multiple presences

This commit is contained in:
iNPUTmice 2014-07-01 12:57:28 +02:00
parent 09f488a7e2
commit 4070c33605
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/eu/siacs/conversations/ui/ShareWithActivity.java
View File

@ -26,6 +26,7 @@ import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
public class ShareWithActivity extends XmppActivity {
@ -81,8 +82,8 @@ public class ShareWithActivity extends XmppActivity {
@Override
void onBackendConnected() {
this.isImage = (getIntent().getType() != null && getIntent()
.getType().startsWith("image/"));
this.isImage = (getIntent().getType() != null && getIntent().getType()
.startsWith("image/"));
SharedPreferences preferences = PreferenceManager
.getDefaultSharedPreferences(this);
boolean useSubject = preferences.getBoolean("use_subject_in_muc", true);
@ -158,20 +159,28 @@ public class ShareWithActivity extends XmppActivity {
private void share(final Conversation conversation) {
String sharedText = null;
if (isImage) {
final Uri uri = (Uri) getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
final Uri uri = (Uri) getIntent().getParcelableExtra(
Intent.EXTRA_STREAM);
selectPresence(conversation, new OnPresenceSelected() {
@Override
public void onPresenceSelected() {
ShareWithActivity.this.xmppConnectionService.attachImageToConversation(conversation, uri,attachImageCallback);
Toast.makeText(getApplicationContext(),
getText(R.string.preparing_image),
Toast.LENGTH_LONG).show();
ShareWithActivity.this.xmppConnectionService
.attachImageToConversation(conversation, uri,
attachImageCallback);
switchToConversation(conversation, null, true);
finish();
}
});
} else {
sharedText = getIntent().getStringExtra(
Intent.EXTRA_TEXT);
}
sharedText = getIntent().getStringExtra(Intent.EXTRA_TEXT);
switchToConversation(conversation, sharedText, true);
finish();
}
}
}