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

Notifications were leading to wrong conversations/groups. Bug #49.

Browse Source
This commit is contained in:
akwizgran
2014-03-10 19:55:33 +00:00
parent a2b3ef9e62
commit c3b5418f53
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java
View File

@@ -2,9 +2,8 @@ package org.briarproject.android;
import static android.app.Notification.DEFAULT_LIGHTS; import static android.app.Notification.DEFAULT_LIGHTS;
import static android.app.Notification.DEFAULT_SOUND; import static android.app.Notification.DEFAULT_SOUND;
import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
import static android.content.Context.NOTIFICATION_SERVICE; import static android.content.Context.NOTIFICATION_SERVICE;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
@@ -58,6 +57,7 @@ Service, EventListener {
new HashMap<GroupId, Integer>(); // Locking: this new HashMap<GroupId, Integer>(); // Locking: this
private int privateTotal = 0, groupTotal = 0; // Locking: this private int privateTotal = 0, groupTotal = 0; // Locking: this
private int nextRequestId = 0; // Locking: this
private volatile Settings settings = new Settings(); private volatile Settings settings = new Settings();
@@ -128,22 +128,23 @@ Service, EventListener {
privateTotal)); privateTotal));
b.setDefaults(getDefaults()); b.setDefaults(getDefaults());
b.setOnlyAlertOnce(true); b.setOnlyAlertOnce(true);
b.setAutoCancel(true);
if(contactCounts.size() == 1) { if(contactCounts.size() == 1) {
Intent i = new Intent(appContext, ConversationActivity.class); Intent i = new Intent(appContext, ConversationActivity.class);
ContactId c = contactCounts.keySet().iterator().next(); ContactId c = contactCounts.keySet().iterator().next();
i.putExtra("briar.CONTACT_ID", c.getInt()); i.putExtra("briar.CONTACT_ID", c.getInt());
i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_SINGLE_TOP); i.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
TaskStackBuilder t = TaskStackBuilder.create(appContext); TaskStackBuilder t = TaskStackBuilder.create(appContext);
t.addParentStack(ConversationActivity.class); t.addParentStack(ConversationActivity.class);
t.addNextIntent(i); t.addNextIntent(i);
b.setContentIntent(t.getPendingIntent(0, FLAG_UPDATE_CURRENT)); b.setContentIntent(t.getPendingIntent(nextRequestId++, 0));
} else { } else {
Intent i = new Intent(appContext, ContactListActivity.class); Intent i = new Intent(appContext, ContactListActivity.class);
i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_SINGLE_TOP); i.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
TaskStackBuilder t = TaskStackBuilder.create(appContext); TaskStackBuilder t = TaskStackBuilder.create(appContext);
t.addParentStack(ContactListActivity.class); t.addParentStack(ContactListActivity.class);
t.addNextIntent(i); t.addNextIntent(i);
b.setContentIntent(t.getPendingIntent(0, FLAG_UPDATE_CURRENT)); b.setContentIntent(t.getPendingIntent(nextRequestId++, 0));
} }
Object o = appContext.getSystemService(NOTIFICATION_SERVICE); Object o = appContext.getSystemService(NOTIFICATION_SERVICE);
NotificationManager nm = (NotificationManager) o; NotificationManager nm = (NotificationManager) o;
@@ -198,22 +199,23 @@ Service, EventListener {
groupTotal)); groupTotal));
b.setDefaults(getDefaults()); b.setDefaults(getDefaults());
b.setOnlyAlertOnce(true); b.setOnlyAlertOnce(true);
b.setAutoCancel(true);
if(groupCounts.size() == 1) { if(groupCounts.size() == 1) {
Intent i = new Intent(appContext, GroupActivity.class); Intent i = new Intent(appContext, GroupActivity.class);
GroupId g = groupCounts.keySet().iterator().next(); GroupId g = groupCounts.keySet().iterator().next();
i.putExtra("briar.GROUP_ID", g.getBytes()); i.putExtra("briar.GROUP_ID", g.getBytes());
i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_SINGLE_TOP); i.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
TaskStackBuilder t = TaskStackBuilder.create(appContext); TaskStackBuilder t = TaskStackBuilder.create(appContext);
t.addParentStack(GroupActivity.class); t.addParentStack(GroupActivity.class);
t.addNextIntent(i); t.addNextIntent(i);
b.setContentIntent(t.getPendingIntent(0, FLAG_UPDATE_CURRENT)); b.setContentIntent(t.getPendingIntent(nextRequestId++, 0));
} else { } else {
Intent i = new Intent(appContext, GroupListActivity.class); Intent i = new Intent(appContext, GroupListActivity.class);
i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_SINGLE_TOP); i.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
TaskStackBuilder t = TaskStackBuilder.create(appContext); TaskStackBuilder t = TaskStackBuilder.create(appContext);
t.addParentStack(GroupListActivity.class); t.addParentStack(GroupListActivity.class);
t.addNextIntent(i); t.addNextIntent(i);
b.setContentIntent(t.getPendingIntent(0, FLAG_UPDATE_CURRENT)); b.setContentIntent(t.getPendingIntent(nextRequestId++, 0));
} }
Object o = appContext.getSystemService(NOTIFICATION_SERVICE); Object o = appContext.getSystemService(NOTIFICATION_SERVICE);
NotificationManager nm = (NotificationManager) o; NotificationManager nm = (NotificationManager) o;