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

Allow multiple pending fake contacts at the same time

Browse Source
This commit is contained in:
Torsten Grote
2018-09-26 15:24:54 -03:00
parent 47a2238c65
commit 82a493ee80
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactInviteInputActivity.java
View File

@@ -26,6 +26,7 @@ import static android.app.AlarmManager.ELAPSED_REALTIME;
import static android.content.Intent.ACTION_SEND; import static android.content.Intent.ACTION_SEND;
import static android.content.Intent.ACTION_VIEW; import static android.content.Intent.ACTION_VIEW;
import static android.content.Intent.EXTRA_TEXT; import static android.content.Intent.EXTRA_TEXT;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.os.SystemClock.elapsedRealtime; import static android.os.SystemClock.elapsedRealtime;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -129,9 +130,11 @@ public class ContactInviteInputActivity extends BriarActivity implements
Intent i = new Intent(this, ContactInviteInputActivity.class); Intent i = new Intent(this, ContactInviteInputActivity.class);
i.setAction("addContact"); i.setAction("addContact");
i.setFlags(FLAG_ACTIVITY_NEW_TASK);
i.putExtra("name", name); i.putExtra("name", name);
i.putExtra("timestamp", timestamp); 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); alarmManager.set(ELAPSED_REALTIME, triggerAt, pendingIntent);
Log.e("TEST", "Setting Alarm in " + MILLISECONDS.toSeconds(fromNow) + Log.e("TEST", "Setting Alarm in " + MILLISECONDS.toSeconds(fromNow) +

2
briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsViewHolder.java
View File

@@ -28,7 +28,7 @@ public class PendingRequestsViewHolder extends ViewHolder {
public void bind(PendingContact item) { public void bind(PendingContact item) {
avatar.setText(item.getName()); avatar.setText(item.getName());
avatar.setBackgroundBytes(toUtf8(item.getName())); avatar.setBackgroundBytes(toUtf8(item.getName() + item.getTimestamp()));
name.setText(item.getName()); name.setText(item.getName());
time.setText(formatDate(time.getContext(), item.getTimestamp())); time.setText(formatDate(time.getContext(), item.getTimestamp()));
} }