anwser to xmpp: style uris. fixed open conversations from android address book
This commit is contained in:
parent
6e77343407
commit
8fb0fb0c0d
|
@ -63,6 +63,14 @@
|
||||||
<data android:scheme="imto" />
|
<data android:scheme="imto" />
|
||||||
<data android:host="jabber" />
|
<data android:host="jabber" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.VIEW" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
|
|
||||||
|
<data android:scheme="xmpp" />
|
||||||
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name="eu.siacs.conversations.ui.SettingsActivity"
|
android:name="eu.siacs.conversations.ui.SettingsActivity"
|
||||||
|
|
|
@ -14,9 +14,14 @@ public class Roster {
|
||||||
this.account = account;
|
this.account = account;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasContact(String jid) {
|
public Contact getContactAsShownInRoster(String jid) {
|
||||||
String cleanJid = jid.split("/", 2)[0];
|
String cleanJid = jid.split("/", 2)[0];
|
||||||
return contacts.containsKey(cleanJid);
|
Contact contact = contacts.get(cleanJid);
|
||||||
|
if (contact != null && contact.showInRoster()) {
|
||||||
|
return contact;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Contact getContact(String jid) {
|
public Contact getContact(String jid) {
|
||||||
|
|
|
@ -851,8 +851,9 @@ public class XmppConnectionService extends Service {
|
||||||
public Conversation find(List<Conversation> haystack, Account account,
|
public Conversation find(List<Conversation> haystack, Account account,
|
||||||
String jid) {
|
String jid) {
|
||||||
for (Conversation conversation : haystack) {
|
for (Conversation conversation : haystack) {
|
||||||
if ((conversation.getAccount().equals(account))
|
if ((account == null || conversation.getAccount().equals(account))
|
||||||
&& (conversation.getContactJid().split("/",2)[0].equals(jid))) {
|
&& (conversation.getContactJid().split("/", 2)[0]
|
||||||
|
.equals(jid))) {
|
||||||
return conversation;
|
return conversation;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1742,4 +1743,18 @@ public class XmppConnectionService extends Service {
|
||||||
public interface OnRosterUpdate {
|
public interface OnRosterUpdate {
|
||||||
public void onRosterUpdate();
|
public void onRosterUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<Contact> findContacts(String jid) {
|
||||||
|
ArrayList<Contact> contacts = new ArrayList<Contact>();
|
||||||
|
for (Account account : getAccounts()) {
|
||||||
|
if (!account.isOptionSet(Account.OPTION_DISABLED)) {
|
||||||
|
Contact contact = account.getRoster()
|
||||||
|
.getContactAsShownInRoster(jid);
|
||||||
|
if (contact != null) {
|
||||||
|
contacts.add(contact);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return contacts;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package eu.siacs.conversations.ui;
|
package eu.siacs.conversations.ui;
|
||||||
|
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.net.URLDecoder;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -14,6 +16,8 @@ import android.app.ListFragment;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.content.DialogInterface.OnClickListener;
|
import android.content.DialogInterface.OnClickListener;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v13.app.FragmentPagerAdapter;
|
import android.support.v13.app.FragmentPagerAdapter;
|
||||||
import android.support.v4.view.ViewPager;
|
import android.support.v4.view.ViewPager;
|
||||||
|
@ -157,6 +161,8 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
private MenuItem mMenuSearchView;
|
||||||
|
private String mInitialJid;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
@ -308,7 +314,7 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void showCreateContactDialog() {
|
protected void showCreateContactDialog(String prefilledJid) {
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||||
builder.setTitle(R.string.create_contact);
|
builder.setTitle(R.string.create_contact);
|
||||||
View dialogView = getLayoutInflater().inflate(
|
View dialogView = getLayoutInflater().inflate(
|
||||||
|
@ -318,6 +324,9 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
.findViewById(R.id.jid);
|
.findViewById(R.id.jid);
|
||||||
jid.setAdapter(new KnownHostsAdapter(this,
|
jid.setAdapter(new KnownHostsAdapter(this,
|
||||||
android.R.layout.simple_list_item_1, mKnownHosts));
|
android.R.layout.simple_list_item_1, mKnownHosts));
|
||||||
|
if (prefilledJid!=null) {
|
||||||
|
jid.append(prefilledJid);
|
||||||
|
}
|
||||||
populateAccountSpinner(spinner);
|
populateAccountSpinner(spinner);
|
||||||
builder.setView(dialogView);
|
builder.setView(dialogView);
|
||||||
builder.setNegativeButton(R.string.cancel, null);
|
builder.setNegativeButton(R.string.cancel, null);
|
||||||
|
@ -449,9 +458,9 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
.findItem(R.id.action_create_contact);
|
.findItem(R.id.action_create_contact);
|
||||||
MenuItem menuCreateConference = (MenuItem) menu
|
MenuItem menuCreateConference = (MenuItem) menu
|
||||||
.findItem(R.id.action_join_conference);
|
.findItem(R.id.action_join_conference);
|
||||||
MenuItem menuSearchView = (MenuItem) menu.findItem(R.id.action_search);
|
mMenuSearchView = (MenuItem) menu.findItem(R.id.action_search);
|
||||||
menuSearchView.setOnActionExpandListener(mOnActionExpandListener);
|
mMenuSearchView.setOnActionExpandListener(mOnActionExpandListener);
|
||||||
View mSearchView = menuSearchView.getActionView();
|
View mSearchView = mMenuSearchView.getActionView();
|
||||||
mSearchEditText = (EditText) mSearchView
|
mSearchEditText = (EditText) mSearchView
|
||||||
.findViewById(R.id.search_field);
|
.findViewById(R.id.search_field);
|
||||||
mSearchEditText.addTextChangedListener(mSearchTextWatcher);
|
mSearchEditText.addTextChangedListener(mSearchTextWatcher);
|
||||||
|
@ -460,6 +469,11 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
} else {
|
} else {
|
||||||
menuCreateContact.setVisible(false);
|
menuCreateContact.setVisible(false);
|
||||||
}
|
}
|
||||||
|
if (mInitialJid != null) {
|
||||||
|
mMenuSearchView.expandActionView();
|
||||||
|
mSearchEditText.append(mInitialJid);
|
||||||
|
filter(mInitialJid);
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -467,7 +481,7 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
case R.id.action_create_contact:
|
case R.id.action_create_contact:
|
||||||
showCreateContactDialog();
|
showCreateContactDialog(null);
|
||||||
break;
|
break;
|
||||||
case R.id.action_join_conference:
|
case R.id.action_join_conference:
|
||||||
showJoinConferenceDialog();
|
showJoinConferenceDialog();
|
||||||
|
@ -486,13 +500,8 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void onBackendConnected() {
|
protected void onBackendConnected() {
|
||||||
xmppConnectionService.setOnRosterUpdateListener(this.onRosterUpdate);
|
xmppConnectionService.setOnRosterUpdateListener(this.onRosterUpdate);
|
||||||
if (mSearchEditText != null) {
|
|
||||||
filter(mSearchEditText.getText().toString());
|
|
||||||
} else {
|
|
||||||
filter(null);
|
|
||||||
}
|
|
||||||
this.mActivatedAccounts.clear();
|
this.mActivatedAccounts.clear();
|
||||||
for (Account account : xmppConnectionService.getAccounts()) {
|
for (Account account : xmppConnectionService.getAccounts()) {
|
||||||
if (account.getStatus() != Account.STATUS_DISABLED) {
|
if (account.getStatus() != Account.STATUS_DISABLED) {
|
||||||
|
@ -502,6 +511,55 @@ public class StartConversationActivity extends XmppActivity {
|
||||||
this.mKnownHosts = xmppConnectionService.getKnownHosts();
|
this.mKnownHosts = xmppConnectionService.getKnownHosts();
|
||||||
this.mKnownConferenceHosts = xmppConnectionService
|
this.mKnownConferenceHosts = xmppConnectionService
|
||||||
.getKnownConferenceHosts();
|
.getKnownConferenceHosts();
|
||||||
|
if (!startByIntent()) {
|
||||||
|
if (mSearchEditText != null) {
|
||||||
|
filter(mSearchEditText.getText().toString());
|
||||||
|
} else {
|
||||||
|
filter(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected boolean startByIntent() {
|
||||||
|
if (getIntent() != null
|
||||||
|
&& Intent.ACTION_SENDTO.equals(getIntent().getAction())) {
|
||||||
|
try {
|
||||||
|
String jid = URLDecoder.decode(
|
||||||
|
getIntent().getData().getEncodedPath(), "UTF-8").split(
|
||||||
|
"/")[1];
|
||||||
|
setIntent(null);
|
||||||
|
return handleJid(jid);
|
||||||
|
} catch (UnsupportedEncodingException e) {
|
||||||
|
setIntent(null);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else if (getIntent() != null && Intent.ACTION_VIEW.equals(getIntent().getAction())) {
|
||||||
|
Uri uri = getIntent().getData();
|
||||||
|
String jid = uri.getSchemeSpecificPart().split("\\?")[0];
|
||||||
|
return handleJid(jid);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean handleJid(String jid) {
|
||||||
|
List<Contact> contacts = xmppConnectionService
|
||||||
|
.findContacts(jid);
|
||||||
|
if (contacts.size() == 0) {
|
||||||
|
showCreateContactDialog(jid);
|
||||||
|
return false;
|
||||||
|
} else if (contacts.size() == 1) {
|
||||||
|
switchToConversation(contacts.get(0));
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
if (mMenuSearchView != null) {
|
||||||
|
mMenuSearchView.expandActionView();
|
||||||
|
mSearchEditText.setText(jid);
|
||||||
|
filter(jid);
|
||||||
|
} else {
|
||||||
|
mInitialJid = jid;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void filter(String needle) {
|
protected void filter(String needle) {
|
||||||
|
|
|
@ -245,6 +245,7 @@ public abstract class XmppActivity extends Activity {
|
||||||
| Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
| Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||||
}
|
}
|
||||||
startActivity(viewConversationIntent);
|
startActivity(viewConversationIntent);
|
||||||
|
finish();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void switchToContactDetails(Contact contact) {
|
public void switchToContactDetails(Contact contact) {
|
||||||
|
|
Loading…
Reference in a new issue