Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 04:18:53 +01:00
Code Issues Projects Releases Wiki Activity

Update unread message count when returning from conversation/group.

Browse Source 
Fixes bug #42.
This commit is contained in:
akwizgran
2014-02-27 11:57:51 +00:00
parent 094cda8573
commit c021bfd9aa
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/org/briarproject/android/BriarActivity.java
View File

@@ -19,7 +19,7 @@ import android.os.IBinder;
public class BriarActivity extends RoboFragmentActivity { public class BriarActivity extends RoboFragmentActivity {
private static final int REQUEST_PASSWORD = 1; public static final int REQUEST_PASSWORD = 1;
private static final Logger LOG = private static final Logger LOG =
Logger.getLogger(BriarActivity.class.getName()); Logger.getLogger(BriarActivity.class.getName());

9
briar-android/src/org/briarproject/android/contact/ConversationActivity.java
View File

@@ -118,6 +118,10 @@ implements EventListener, OnClickListener, OnItemClickListener {
if(b == null) throw new IllegalStateException(); if(b == null) throw new IllegalStateException();
localAuthorId = new AuthorId(b); localAuthorId = new AuthorId(b);
Intent data = new Intent();
data.putExtra("briar.CONTACT_ID", id);
setResult(RESULT_OK, data);
LinearLayout layout = new LinearLayout(this); LinearLayout layout = new LinearLayout(this);
layout.setLayoutParams(MATCH_MATCH); layout.setLayoutParams(MATCH_MATCH);
layout.setOrientation(VERTICAL); layout.setOrientation(VERTICAL);
@@ -297,11 +301,6 @@ implements EventListener, OnClickListener, OnItemClickListener {
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
db.removeListener(this); db.removeListener(this);
}
@Override
public void onDestroy() {
super.onDestroy();
if(isFinishing()) markMessagesRead(); if(isFinishing()) markMessagesRead();
} }

5
briar-android/src/org/briarproject/android/groups/GroupActivity.java
View File

@@ -232,11 +232,6 @@ OnClickListener, OnItemClickListener {
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
db.removeListener(this); db.removeListener(this);
}
@Override
public void onDestroy() {
super.onDestroy();
if(isFinishing()) markMessagesRead(); if(isFinishing()) markMessagesRead();
} }