From 686d5fd206b5f7f5c4f42800bf7abf3d37a4f671 Mon Sep 17 00:00:00 2001
From: Abraham Kiggundu <akiggund@thoughtworks.com>
Date: Thu, 8 Jan 2015 00:37:10 +0300
Subject: [PATCH] bug#49 Fixed by ensuring that intents for different
contacts/groups can be distinguished from each other when resolving
PendingIntent refs
---
.gitignore | 2 ++
.../briarproject/android/AndroidNotificationManagerImpl.java | 3 +++
2 files changed, 5 insertions(+)
diff --git a/.gitignore b/.gitignore
index 91ea7410d8..8fd308ba79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
build
.gradle
+.metadata
+*.tmp
diff --git a/briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java b/briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java
index 597988cf90..39d532e3c4 100644
--- a/briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java
+++ b/briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java
@@ -143,6 +143,7 @@ Service, EventListener {
Intent i = new Intent(appContext, ConversationActivity.class);
ContactId c = contactCounts.keySet().iterator().next();
i.putExtra("briar.CONTACT_ID", c.getInt());
+ i.setData(Uri.parse(String.format("content://contact/%s", c.getInt())));
i.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
TaskStackBuilder t = TaskStackBuilder.create(appContext);
t.addParentStack(ConversationActivity.class);
@@ -219,6 +220,8 @@ Service, EventListener {
Intent i = new Intent(appContext, GroupActivity.class);
GroupId g = groupCounts.keySet().iterator().next();
i.putExtra("briar.GROUP_ID", g.getBytes());
+ String groupIdString = new String(g.getBytes());
+ i.setData(Uri.parse(String.format("content://org.brairproject.group/%s", groupIdString)));
i.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
TaskStackBuilder t = TaskStackBuilder.create(appContext);
t.addParentStack(GroupActivity.class);
--
GitLab