From c021bfd9aa94061fe63cb4976916d8a35b985478 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 27 Feb 2014 11:57:51 +0000
Subject: [PATCH] Update unread message count when returning from
conversation/group.
Fixes bug #42.
---
.../src/org/briarproject/android/BriarActivity.java | 2 +-
.../android/contact/ConversationActivity.java | 9 ++++-----
.../org/briarproject/android/groups/GroupActivity.java | 5 -----
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java
index 162660d8f6..57e9804f55 100644
--- a/briar-android/src/org/briarproject/android/BriarActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarActivity.java
@@ -19,7 +19,7 @@ import android.os.IBinder;
public class BriarActivity extends RoboFragmentActivity {
- private static final int REQUEST_PASSWORD = 1;
+ public static final int REQUEST_PASSWORD = 1;
private static final Logger LOG =
Logger.getLogger(BriarActivity.class.getName());
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
index 57aed2a519..1eee142849 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
@@ -118,6 +118,10 @@ implements EventListener, OnClickListener, OnItemClickListener {
if(b == null) throw new IllegalStateException();
localAuthorId = new AuthorId(b);
+ Intent data = new Intent();
+ data.putExtra("briar.CONTACT_ID", id);
+ setResult(RESULT_OK, data);
+
LinearLayout layout = new LinearLayout(this);
layout.setLayoutParams(MATCH_MATCH);
layout.setOrientation(VERTICAL);
@@ -297,11 +301,6 @@ implements EventListener, OnClickListener, OnItemClickListener {
public void onPause() {
super.onPause();
db.removeListener(this);
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
if(isFinishing()) markMessagesRead();
}
diff --git a/briar-android/src/org/briarproject/android/groups/GroupActivity.java b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
index d4d7a64de7..5f21731f6c 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
@@ -232,11 +232,6 @@ OnClickListener, OnItemClickListener {
public void onPause() {
super.onPause();
db.removeListener(this);
- }
-
- @Override
- public void onDestroy() {
- super.onDestroy();
if(isFinishing()) markMessagesRead();
}
--
GitLab