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

error msg on offline subscription changes

This commit is contained in:
Daniel Gultsch 2014-05-24 11:17:55 +02:00
parent 03854f30c9
commit 7f825f8027
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@ -213,4 +213,5 @@
<string name="muc_details_conference_subject">Conference Subject</string> <string name="muc_details_conference_subject">Conference Subject</string>
<string name="muc_details_your_nickname">Your nickname</string> <string name="muc_details_your_nickname">Your nickname</string>
<string name="muc_details_other_members">Other Members</string> <string name="muc_details_other_members">Other Members</string>
<string name="subscription_not_updated_offline">Account offline. Could not update subscription</string>
</resources> </resources>

41
src/eu/siacs/conversations/ui/ContactDetailsActivity.java
View File

@ -301,52 +301,69 @@ public class ContactDetailsActivity extends XmppActivity {
protected void onStop() { protected void onStop() {
super.onStop(); super.onStop();
boolean updated = false; boolean updated = false;
boolean online = contact.getAccount().getStatus() == Account.STATUS_ONLINE;
if (contact.getOption(Contact.Options.FROM)) { if (contact.getOption(Contact.Options.FROM)) {
if (!send.isChecked()) { if (!send.isChecked()) {
contact.resetOption(Contact.Options.FROM); if (online) {
contact.resetOption(Contact.Options.PREEMPTIVE_GRANT); contact.resetOption(Contact.Options.FROM);
activity.xmppConnectionService.stopPresenceUpdatesTo(contact); contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
activity.xmppConnectionService.stopPresenceUpdatesTo(contact);
}
updated = true; updated = true;
} }
} else { } else {
if (contact if (contact
.getOption(Contact.Options.PREEMPTIVE_GRANT)) { .getOption(Contact.Options.PREEMPTIVE_GRANT)) {
if (!send.isChecked()) { if (!send.isChecked()) {
contact.resetOption(Contact.Options.PREEMPTIVE_GRANT); if (online) {
contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
}
updated = true; updated = true;
} }
} else { } else {
if (send.isChecked()) { if (send.isChecked()) {
contact.setOption(Contact.Options.PREEMPTIVE_GRANT); if (online) {
contact.setOption(Contact.Options.PREEMPTIVE_GRANT);
}
updated = true; updated = true;
} }
} }
} }
if (contact.getOption(Contact.Options.TO)) { if (contact.getOption(Contact.Options.TO)) {
if (!receive.isChecked()) { if (!receive.isChecked()) {
contact.resetOption(Contact.Options.TO); if (online) {
activity.xmppConnectionService.stopPresenceUpdatesFrom(contact); contact.resetOption(Contact.Options.TO);
activity.xmppConnectionService.stopPresenceUpdatesFrom(contact);
}
updated = true; updated = true;
} }
} else { } else {
if (contact.getOption(Contact.Options.ASKING)) { if (contact.getOption(Contact.Options.ASKING)) {
if (!receive.isChecked()) { if (!receive.isChecked()) {
contact.resetOption(Contact.Options.ASKING); if (online) {
activity.xmppConnectionService contact.resetOption(Contact.Options.ASKING);
activity.xmppConnectionService
.stopPresenceUpdatesFrom(contact); .stopPresenceUpdatesFrom(contact);
}
updated = true; updated = true;
} }
} else { } else {
if (receive.isChecked()) { if (receive.isChecked()) {
contact.setOption(Contact.Options.ASKING); if (online) {
activity.xmppConnectionService contact.setOption(Contact.Options.ASKING);
activity.xmppConnectionService
.requestPresenceUpdatesFrom(contact); .requestPresenceUpdatesFrom(contact);
}
updated = true; updated = true;
} }
} }
} }
if (updated) { if (updated) {
Toast.makeText(getApplicationContext(), getString(R.string.subscription_updated), Toast.LENGTH_SHORT).show(); if (online) {
Toast.makeText(getApplicationContext(), getString(R.string.subscription_updated), Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getApplicationContext(), getString(R.string.subscription_not_updated_offline), Toast.LENGTH_SHORT).show();
}
} }
} }