aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-09-28 15:21:56 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-09-28 15:21:56 +0200
commitbff23c2e232e8f9a4e64553215130079b7fc5a4f (patch)
treefec9608b615334ff065399b03fb747c4a7bf4d94 /src/eu/siacs/conversations/ui/ConversationActivity.java
parent1ae9338fc9d5f8e1f6505445f07f4476efd8f139 (diff)
new notification service. first draft
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index b6b6aa722..3accafe84 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -167,8 +167,6 @@ public class ConversationActivity extends XmppActivity implements
if (!getSelectedConversation().isRead()) {
xmppConnectionService
.markRead(getSelectedConversation());
- UIHelper.updateNotification(getApplicationContext(),
- getConversationList(), null, false);
listView.invalidateViews();
}
}
@@ -297,7 +295,8 @@ public class ConversationActivity extends XmppActivity implements
int which) {
conversation
.setNextEncryption(Message.ENCRYPTION_NONE);
- xmppConnectionService.databaseBackend.updateConversation(conversation);
+ xmppConnectionService.databaseBackend
+ .updateConversation(conversation);
selectPresenceToAttachFile(attachmentChoice);
}
});
@@ -402,7 +401,7 @@ public class ConversationActivity extends XmppActivity implements
});
builder.create().show();
}
-
+
protected void attachFileDialog() {
View menuAttachFile = findViewById(R.id.action_attach_file);
if (menuAttachFile == null) {
@@ -473,7 +472,8 @@ public class ConversationActivity extends XmppActivity implements
conversation.setNextEncryption(Message.ENCRYPTION_NONE);
break;
}
- xmppConnectionService.databaseBackend.updateConversation(conversation);
+ xmppConnectionService.databaseBackend
+ .updateConversation(conversation);
fragment.updateChatMsgHint();
return true;
}