From 030036bceb300ec08844eff1bea853cfd073633e Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 26 Sep 2018 15:24:54 -0300 Subject: [PATCH] Allow multiple pending fake contacts at the same time --- .../briar/android/contact/ContactInviteInputActivity.java | 5 ++++- .../briar/android/contact/PendingRequestsViewHolder.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactInviteInputActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactInviteInputActivity.java index 802e43c2b..532b0946e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactInviteInputActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactInviteInputActivity.java @@ -26,6 +26,7 @@ import static android.app.AlarmManager.ELAPSED_REALTIME; import static android.content.Intent.ACTION_SEND; import static android.content.Intent.ACTION_VIEW; import static android.content.Intent.EXTRA_TEXT; +import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.os.SystemClock.elapsedRealtime; import static java.util.Objects.requireNonNull; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -129,9 +130,11 @@ public class ContactInviteInputActivity extends BriarActivity implements Intent i = new Intent(this, ContactInviteInputActivity.class); i.setAction("addContact"); + i.setFlags(FLAG_ACTIVITY_NEW_TASK); i.putExtra("name", name); i.putExtra("timestamp", timestamp); - PendingIntent pendingIntent = PendingIntent.getActivity(this, 42, i, 0); + PendingIntent pendingIntent = PendingIntent + .getActivity(this, (int) timestamp / 1000, i, 0); alarmManager.set(ELAPSED_REALTIME, triggerAt, pendingIntent); Log.e("TEST", "Setting Alarm in " + MILLISECONDS.toSeconds(fromNow) + diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsViewHolder.java index 4dd8ba964..8d283524e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsViewHolder.java @@ -28,7 +28,7 @@ public class PendingRequestsViewHolder extends ViewHolder { public void bind(PendingContact item) { avatar.setText(item.getName()); - avatar.setBackgroundBytes(toUtf8(item.getName())); + avatar.setBackgroundBytes(toUtf8(item.getName() + item.getTimestamp())); name.setText(item.getName()); time.setText(formatDate(time.getContext(), item.getTimestamp())); }