diff options
Diffstat (limited to 'src/eu')
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 15 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/MucDetailsActivity.java | 24 |
2 files changed, 36 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 17a2d76f..99fc961a 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -1231,4 +1231,19 @@ public class XmppConnectionService extends Service { convChangedListener.onConversationListChanged(); } } + + public void sendConversationSubject(Conversation conversation, + String subject) { + MessagePacket packet = new MessagePacket(); + packet.setType(MessagePacket.TYPE_GROUPCHAT); + packet.setTo(conversation.getContactJid().split("/")[0]); + Element subjectChild = new Element("subject"); + subjectChild.setContent(subject); + packet.addChild(subjectChild); + packet.setFrom(conversation.getAccount().getJid()); + Account account = conversation.getAccount(); + if (account.getStatus() == Account.STATUS_ONLINE) { + account.getXmppConnection().sendMessagePacket(packet); + } + } }
\ No newline at end of file diff --git a/src/eu/siacs/conversations/ui/MucDetailsActivity.java b/src/eu/siacs/conversations/ui/MucDetailsActivity.java index 39097895..adc44d51 100644 --- a/src/eu/siacs/conversations/ui/MucDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/MucDetailsActivity.java @@ -30,12 +30,12 @@ public class MucDetailsActivity extends XmppActivity { public static final String ACTION_VIEW_MUC = "view_muc"; private Conversation conversation; private EditText mYourNick; + private EditText mSubject; private TextView mRoleAffiliaton; private TextView mFullJid; private LinearLayout membersView; private LinearLayout mMoreDetails; private String uuid = null; - private ArrayAdapter<User> contactsAdapter; private OnClickListener changeNickListener = new OnClickListener() { @Override @@ -50,6 +50,20 @@ public class MucDetailsActivity extends XmppActivity { } } }; + + private OnClickListener changeSubjectListener = new OnClickListener() { + + @Override + public void onClick(View arg0) { + String subject = mSubject.getText().toString(); + MucOptions options = conversation.getMucOptions(); + if (!subject.equals(options.getSubject())) { + xmppConnectionService.sendConversationSubject(conversation,subject); + finish(); + } + } + }; + private List<User> users = new ArrayList<MucOptions.User>(); @Override @@ -61,11 +75,14 @@ public class MucDetailsActivity extends XmppActivity { setContentView(R.layout.activity_muc_details); mYourNick = (EditText) findViewById(R.id.muc_your_nick); mFullJid = (TextView) findViewById(R.id.muc_jabberid); - ImageButton imageButton = (ImageButton) findViewById(R.id.muc_edit_nick); - imageButton.setOnClickListener(this.changeNickListener); + ImageButton editNickButton = (ImageButton) findViewById(R.id.muc_edit_nick); + editNickButton.setOnClickListener(this.changeNickListener); + ImageButton editSubjectButton = (ImageButton) findViewById(R.id.muc_edit_subject); + editSubjectButton.setOnClickListener(this.changeSubjectListener); membersView = (LinearLayout) findViewById(R.id.muc_members); mMoreDetails = (LinearLayout) findViewById(R.id.muc_more_details); mMoreDetails.setVisibility(View.GONE); + mSubject = (EditText) findViewById(R.id.muc_subject); getActionBar().setHomeButtonEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true); @@ -110,6 +127,7 @@ public class MucDetailsActivity extends XmppActivity { } } if (this.conversation != null) { + mSubject.setText(conversation.getMucOptions().getSubject()); setTitle(conversation.getName(useSubject)); mFullJid.setText(conversation.getContactJid().split("/")[0]); mYourNick.setText(conversation.getMucOptions().getNick()); |