moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 03:32:15 -05:00
Code Issues Releases Wiki Activity

fixed bug when sharing files from google drive

Browse Source
This commit is contained in:
iNPUTmice 2015-01-18 20:27:16 +01:00
parent 149a6716b8
commit fc2e458053
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
View File

@ -135,14 +135,9 @@ public class ShareWithActivity extends XmppActivity {
public void onStart() { public void onStart() {
final String type = getIntent().getType(); final String type = getIntent().getType();
final Uri uri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM); final Uri uri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
if (type != null && uri != null && !type.startsWith("text/")) { if (type != null && uri != null && !type.equalsIgnoreCase("text/plain")) {
this.share.uri = uri; this.share.uri = uri;
try { this.share.image = type.startsWith("image/") || isImage(uri);
String guess = URLConnection.guessContentTypeFromName(uri.toString());
this.share.image = type.startsWith("image/") || (guess != null && guess.startsWith("image/"));
} catch (final StringIndexOutOfBoundsException ignored) {
this.share.image = false;
}
} else { } else {
this.share.text = getIntent().getStringExtra(Intent.EXTRA_TEXT); this.share.text = getIntent().getStringExtra(Intent.EXTRA_TEXT);
} }
@ -152,6 +147,15 @@ public class ShareWithActivity extends XmppActivity {
super.onStart(); super.onStart();
} }
protected boolean isImage(Uri uri) {
try {
String guess = URLConnection.guessContentTypeFromName(uri.toString());
return (guess != null && guess.startsWith("image/"));
} catch (final StringIndexOutOfBoundsException ignored) {
return false;
}
}
@Override @Override
void onBackendConnected() { void onBackendConnected() {
if (xmppConnectionServiceBound && share != null if (xmppConnectionServiceBound && share != null