diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-07 15:18:09 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-07 15:18:09 +0200 |
| commit | 919c98207bb317e2283084dcbaa34a5216997d85 (patch) | |
| tree | 170d7ca434756cbe679fe89154b56b4c321bfb34 /src/eu/siacs/conversations/ui | |
| parent | d5227e5c253658eb9d6bc1f7bf85397f072125d4 (diff) | |
made disabled notifications permanent across restarts
Diffstat (limited to 'src/eu/siacs/conversations/ui')
3 files changed, 9 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index 6817a3865..f3db8cb43 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -585,6 +585,8 @@ public class ConversationActivity extends XmppActivity implements + (durations[which] * 1000); } conversation.setMutedTill(till); + activity.xmppConnectionService.databaseBackend + .updateConversation(conversation); ConversationFragment selectedFragment = (ConversationFragment) getFragmentManager() .findFragmentByTag("conversation"); if (selectedFragment != null) { diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index 928bb6f39..cdaa71522 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -131,9 +131,9 @@ public class ConversationFragment extends Fragment { activity.endConversation(conversation); } }; - + private OnClickListener joinMuc = new OnClickListener() { - + @Override public void onClick(View v) { activity.xmppConnectionService.joinMuc(conversation); @@ -438,6 +438,8 @@ public class ConversationFragment extends Fragment { @Override public void onClick(View v) { conversation.setMutedTill(0); + activity.xmppConnectionService.databaseBackend + .updateConversation(conversation); updateMessages(); } }); @@ -502,8 +504,8 @@ public class ConversationFragment extends Fragment { R.string.leave, leaveMuc); break; case MucOptions.KICKED_FROM_ROOM: - showSnackbar(R.string.conference_kicked, - R.string.join, joinMuc); + showSnackbar(R.string.conference_kicked, R.string.join, + joinMuc); break; default: break; diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 25df83966..2671cf50d 100644 --- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -425,7 +425,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { view.getLayoutParams().height = 1; } else { view.getLayoutParams().height = 0; - + } view.setLayoutParams(view.getLayoutParams()); return view; |