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

Merge branch 'issue756' of https://github.com/SamWhited/Conversations into SamWhited-issue756

This commit is contained in:
iNPUTmice 2014-12-17 07:00:42 +01:00
parent 3f6638cb64 6659339eff
commit fd4cf499a2
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/AndroidManifest.xml
View File

@ -114,7 +114,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" /> <data android:mimeType="*/*" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity

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

@ -1,17 +1,5 @@
package eu.siacs.conversations.ui; package eu.siacs.conversations.ui;
import java.util.ArrayList;
import java.util.List;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.ui.adapter.ConversationAdapter;
import eu.siacs.conversations.xmpp.jid.InvalidJidException;
import eu.siacs.conversations.xmpp.jid.Jid;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
@ -25,6 +13,19 @@ import android.widget.AdapterView.OnItemClickListener;
import android.widget.ListView; import android.widget.ListView;
import android.widget.Toast; import android.widget.Toast;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.ui.adapter.ConversationAdapter;
import eu.siacs.conversations.xmpp.jid.InvalidJidException;
import eu.siacs.conversations.xmpp.jid.Jid;
public class ShareWithActivity extends XmppActivity { public class ShareWithActivity extends XmppActivity {
private class Share { private class Share {
@ -38,9 +39,9 @@ public class ShareWithActivity extends XmppActivity {
private static final int REQUEST_START_NEW_CONVERSATION = 0x0501; private static final int REQUEST_START_NEW_CONVERSATION = 0x0501;
private ListView mListView; private ListView mListView;
private List<Conversation> mConversations = new ArrayList<Conversation>(); private List<Conversation> mConversations = new ArrayList<>();
private UiCallback<Message> attachImageCallback = new UiCallback<Message>() { private UiCallback<Message> attachFileCallback = new UiCallback<Message>() {
@Override @Override
public void userInputRequried(PendingIntent pi, Message object) { public void userInputRequried(PendingIntent pi, Message object) {
@ -78,11 +79,12 @@ public class ShareWithActivity extends XmppActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getActionBar().setDisplayHomeAsUpEnabled(false); if (getActionBar() != null) {
getActionBar().setHomeButtonEnabled(false); getActionBar().setDisplayHomeAsUpEnabled(false);
getActionBar().setHomeButtonEnabled(false);
}
setContentView(R.layout.share_with); setContentView(R.layout.share_with);
setTitle(getString(R.string.title_activity_sharewith)); setTitle(getString(R.string.title_activity_sharewith));
@ -128,7 +130,7 @@ public class ShareWithActivity extends XmppActivity {
@Override @Override
public void onStart() { public void onStart() {
if (getIntent().getType() != null if (getIntent().getType() != null
&& getIntent().getType().startsWith("image/")) { && !getIntent().getType().startsWith("text/")) {
this.share.uri = (Uri) getIntent().getParcelableExtra( this.share.uri = (Uri) getIntent().getParcelableExtra(
Intent.EXTRA_STREAM); Intent.EXTRA_STREAM);
} else { } else {
@ -177,12 +179,22 @@ public class ShareWithActivity extends XmppActivity {
selectPresence(conversation, new OnPresenceSelected() { selectPresence(conversation, new OnPresenceSelected() {
@Override @Override
public void onPresenceSelected() { public void onPresenceSelected() {
Toast.makeText(getApplicationContext(), final String type = URLConnection.guessContentTypeFromName(share.uri.getPath());
getText(R.string.preparing_image), if (type != null && type.startsWith("image/")) {
Toast.LENGTH_LONG).show(); Toast.makeText(getApplicationContext(),
ShareWithActivity.this.xmppConnectionService getText(R.string.preparing_image),
Toast.LENGTH_LONG).show();
ShareWithActivity.this.xmppConnectionService
.attachImageToConversation(conversation, share.uri, .attachImageToConversation(conversation, share.uri,
attachImageCallback); attachFileCallback);
} else {
Toast.makeText(getApplicationContext(),
getText(R.string.preparing_file),
Toast.LENGTH_LONG).show();
ShareWithActivity.this.xmppConnectionService
.attachFileToConversation(conversation, share.uri,
attachFileCallback);
}
switchToConversation(conversation, null, true); switchToConversation(conversation, null, true);
finish(); finish();
} }