aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-14 23:32:48 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-14 23:32:48 +0100
commitb0d57d01c4b3c9e37fdb4786ccc123f5de866f9c (patch)
tree83fbd7c69dcf796cfb73ad37f54f6f2d46e34eb3 /src
parentb1a3d09ca6a4be59b57e2f7b1cdc8a245d60a858 (diff)
renaming conferences over conference details
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java15
-rw-r--r--src/eu/siacs/conversations/ui/MucDetailsActivity.java24
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 17a2d76f0..99fc961a8 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 390978950..adc44d51a 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());