Actually add fake contact ~1 minute after entering link

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkInputActivity.java

@@ -1,5 +1,7 @@
 package org.briarproject.briar.android.contact;
 
+import android.app.AlarmManager;
+import android.app.PendingIntent;
 import android.content.ClipboardManager;
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,25 +9,41 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog.Builder;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.MenuItem;
 import android.widget.Button;
 import android.widget.EditText;
 
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
+import org.briarproject.briar.api.messaging.MessagingManager;
+
+import java.util.Random;
 
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 
+import static android.app.AlarmManager.ELAPSED_REALTIME;
 import static android.content.ClipDescription.MIMETYPE_TEXT_PLAIN;
 import static android.content.Intent.ACTION_SEND;
 import static android.content.Intent.EXTRA_TEXT;
+import static android.os.SystemClock.elapsedRealtime;
 import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
 
 public class ContactLinkInputActivity extends BriarActivity
 		implements TextWatcher {
 
+	@Inject
+	MessagingManager messagingManager;
+	@Inject
+	Clock clock;
+
 	private ClipboardManager clipboard;
 	private EditText linkInput;
 	private Button pasteButton;
@@ -67,6 +85,10 @@ public class ContactLinkInputActivity extends BriarActivity
 		if (i != null && ACTION_SEND.equals(i.getAction())) {
 			String text = i.getStringExtra(EXTRA_TEXT);
 			if (text != null) linkInput.setText(text);
+		} else if (i != null && "addContact".equals(i.getAction())) {
+			removeFakeRequest(i.getStringExtra("name"),
+					i.getLongExtra("timestamp", 0));
+			finish();
 		}
 	}
 
@@ -139,7 +161,38 @@ public class ContactLinkInputActivity extends BriarActivity
 	}
 
 	private void addFakeRequest() {
-		// TODO
+		String name = contactNameInput.getText().toString();
+		long timestamp = clock.currentTimeMillis();
+		try {
+			messagingManager.addNewPendingContact(name, timestamp);
+		} catch (DbException e) {
+			e.printStackTrace();
+		}
+
+		AlarmManager alarmManager =
+				(AlarmManager) requireNonNull(getSystemService(ALARM_SERVICE));
+		long m = MINUTES.toMillis(1);
+		long fromNow = (long) (-m * Math.log(new Random().nextDouble()));
+		long triggerAt = elapsedRealtime() + fromNow;
+
+		Intent i = new Intent(this, ContactLinkInputActivity.class);
+		i.setAction("addContact");
+		i.putExtra("name", name);
+		i.putExtra("timestamp", timestamp);
+		PendingIntent pendingIntent = PendingIntent.getActivity(this, 42, i, 0);
+		alarmManager.set(ELAPSED_REALTIME, triggerAt, pendingIntent);
+
+		Log.e("TEST", "Setting Alarm in " + MILLISECONDS.toSeconds(fromNow) + " seconds");
+		Log.e("TEST", "with contact: " + name);
+	}
+
+	private void removeFakeRequest(String name, long timestamp) {
+		Log.e("TEST", "Adding Contact " + name);
+		try {
+			messagingManager.removePendingContact(name, timestamp);
+		} catch (DbException e) {
+			e.printStackTrace();
+		}
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java

@@ -21,6 +21,7 @@ import com.leinardi.android.speeddial.SpeedDialView;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
+import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
 import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
 import org.briarproject.bramble.api.contact.event.ContactStatusChangedEvent;
 import org.briarproject.bramble.api.db.DbException;
@@ -42,10 +43,13 @@ import org.briarproject.briar.android.view.BriarRecyclerView;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
 import org.briarproject.briar.api.messaging.ConversationManager;
+import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.logging.Logger;
 
@@ -77,6 +81,10 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 	@Inject
 	AndroidNotificationManager notificationManager;
 
+	// TODO remove
+	@Inject
+	MessagingManager messagingManager;
+
 	private ContactListAdapter adapter;
 	private BriarRecyclerView list;
 	private Snackbar snackbar;
@@ -216,7 +224,25 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 		loadContacts();
 		list.startPeriodicUpdate();
 
-		snackbar.show();
+		// TODO remove
+		checkForPendingContacts();
+	}
+
+	// TODO remove
+	private void checkForPendingContacts() {
+		listener.runOnDbThread(() -> {
+			try {
+				Collection<PendingContact> contacts =
+						messagingManager.getPendingContacts();
+				if (contacts.isEmpty()) {
+					runOnUiThreadUnlessDestroyed(() -> snackbar.dismiss());
+				} else {
+					runOnUiThreadUnlessDestroyed(() -> snackbar.show());
+				}
+			} catch (DbException e) {
+				e.printStackTrace();
+			}
+		});
 	}
 
 	@Override
@@ -291,6 +317,11 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 			PrivateMessageHeader h = p.getMessageHeader();
 			updateItem(p.getContactId(), h);
 		}
+
+		// TODO remove
+		else if (e instanceof ContactAddedEvent) {
+			checkForPendingContacts();
+		}
 	}
 
 	private void updateItem(ContactId c, PrivateMessageHeader h) {

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsActivity.java

@@ -5,14 +5,34 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.MenuItem;
 
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactManager;
+import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.view.BriarRecyclerView;
+import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
+
+import java.util.Collection;
 
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 
-public class PendingRequestsActivity extends BriarActivity {
+public class PendingRequestsActivity extends BriarActivity
+		implements EventListener {
+
+	@Inject
+	MessagingManager messagingManager;
+	@Inject
+	ContactManager contactManager;
+	@Inject
+	EventBus eventBus;
 
 	private PendingRequestsAdapter adapter;
 	private BriarRecyclerView list;
@@ -33,12 +53,31 @@ public class PendingRequestsActivity extends BriarActivity {
 			ab.setDisplayHomeAsUpEnabled(true);
 		}
 
-		adapter = new PendingRequestsAdapter(this, PendingRequestsItem.class);
+		adapter = new PendingRequestsAdapter(this, PendingContact.class);
 		list = findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(this));
 		list.setAdapter(adapter);
+	}
 
-		adapter.add(new PendingRequestsItem("test", System.currentTimeMillis() - 50000));
+	@Override
+	public void onStart() {
+		super.onStart();
+		eventBus.addListener(this);
+		runOnDbThread(() -> {
+			try {
+				Collection<PendingContact> contacts =
+						messagingManager.getPendingContacts();
+				addPendingContacts(contacts);
+			} catch (DbException e) {
+				e.printStackTrace();
+			}
+		});
+	}
+
+	@Override
+	protected void onStop() {
+		super.onStop();
+		adapter.clear();
 	}
 
 	@Override
@@ -52,4 +91,32 @@ public class PendingRequestsActivity extends BriarActivity {
 		}
 	}
 
+	@Override
+	public void eventOccurred(Event e) {
+		if (e instanceof ContactAddedEvent) {
+			runOnDbThread(() -> {
+				try {
+					Contact contact = contactManager
+							.getContact(((ContactAddedEvent) e).getContactId());
+					runOnUiThreadUnlessDestroyed(() -> {
+						adapter.remove(contact);
+						if (adapter.isEmpty()) finish();
+					});
+				} catch (DbException e1) {
+					e1.printStackTrace();
+				}
+			});
+		}
+	}
+
+	private void addPendingContacts(Collection<PendingContact> contacts) {
+		runOnUiThreadUnlessDestroyed(() -> {
+			if (contacts.isEmpty()) {
+				list.showData();
+			} else {
+				adapter.addAll(contacts);
+			}
+		});
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsAdapter.java

@@ -6,15 +6,17 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.util.BriarAdapter;
+import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
 
 @NotNullByDefault
 public class PendingRequestsAdapter extends
-		BriarAdapter<PendingRequestsItem, PendingRequestsViewHolder> {
+		BriarAdapter<PendingContact, PendingRequestsViewHolder> {
 
-	public PendingRequestsAdapter(Context ctx, Class<PendingRequestsItem> c) {
+	public PendingRequestsAdapter(Context ctx, Class<PendingContact> c) {
 		super(ctx, c);
 	}
 
@@ -34,22 +36,32 @@ public class PendingRequestsAdapter extends
 	}
 
 	@Override
-	public int compare(PendingRequestsItem item1, PendingRequestsItem item2) {
+	public int compare(PendingContact item1, PendingContact item2) {
 		return (int) (item1.getTimestamp() - item2.getTimestamp());
 	}
 
 	@Override
-	public boolean areContentsTheSame(PendingRequestsItem item1,
-			PendingRequestsItem item2) {
+	public boolean areContentsTheSame(PendingContact item1,
+			PendingContact item2) {
 		return item1.getName().equals(item2.getName()) &&
 				item1.getTimestamp() == item2.getTimestamp();
 	}
 
 	@Override
-	public boolean areItemsTheSame(PendingRequestsItem item1,
-			PendingRequestsItem item2) {
+	public boolean areItemsTheSame(PendingContact item1,
+			PendingContact item2) {
 		return item1.getName().equals(item2.getName()) &&
 				item1.getTimestamp() == item2.getTimestamp();
 	}
 
+	// TODO remove
+	public void remove(Contact contact) {
+		for (int i = 0; i < items.size(); i++) {
+			if (items.get(i).getName().equals(contact.getAuthor().getName())) {
+				items.removeItemAt(i);
+				return;
+			}
+		}
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsItem.java

@@ -1,27 +0,0 @@
-package org.briarproject.briar.android.contact;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class PendingRequestsItem {
-
-	private final String name;
-	private final long timestamp;
-
-	public PendingRequestsItem(String name, long timestamp) {
-		this.name = name;
-		this.timestamp = timestamp;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public long getTimestamp() {
-		return timestamp;
-	}
-
-}

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

@@ -6,22 +6,29 @@ import android.widget.TextView;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.view.TextAvatarView;
+import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
 
+import static org.briarproject.bramble.util.StringUtils.toUtf8;
 import static org.briarproject.briar.android.util.UiUtils.formatDate;
 
 @NotNullByDefault
 public class PendingRequestsViewHolder extends ViewHolder {
 
+	private final TextAvatarView avatar;
 	private final TextView name;
 	private final TextView time;
 
 	public PendingRequestsViewHolder(View v) {
 		super(v);
+		avatar = v.findViewById(R.id.avatar);
 		name = v.findViewById(R.id.name);
 		time = v.findViewById(R.id.time);
 	}
 
-	public void bind(PendingRequestsItem item) {
+	public void bind(PendingContact item) {
+		avatar.setText(item.getName());
+		avatar.setBackgroundBytes(toUtf8(item.getName()));
 		name.setText(item.getName());
 		time.setText(formatDate(time.getContext(), item.getTimestamp()));
 	}

briar-android/src/main/res/layout/list_item_pending_contact.xml

@@ -7,40 +7,75 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
 
+	<org.briarproject.briar.android.view.TextAvatarView
+		android:id="@+id/avatar"
+		android:layout_width="@dimen/listitem_picture_frame_size"
+		android:layout_height="@dimen/listitem_picture_frame_size"
+		android:layout_marginBottom="8dp"
+		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginTop="8dp"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"/>
+
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/name"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_large"
+		android:layout_marginEnd="@dimen/margin_large"
+		android:layout_marginStart="@dimen/margin_large"
+		android:layout_marginTop="@dimen/margin_large"
 		android:textColor="?android:attr/textColorPrimary"
 		android:textSize="@dimen/text_size_medium"
-		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constrainedWidth="true"
+		app:layout_constraintBottom_toTopOf="@+id/status"
 		app:layout_constraintEnd_toStartOf="@+id/time"
+		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintHorizontal_chainStyle="spread_inside"
-		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/avatar"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_chainStyle="packed"
 		tools:text="This is a name of a contact"/>
 
+	<TextView
+		android:id="@+id/status"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="16dp"
+		android:layout_marginEnd="16dp"
+		android:layout_marginRight="16dp"
+		android:layout_marginTop="8dp"
+		android:text="@string/add_contact_remote_connecting"
+		app:layout_constraintBottom_toTopOf="@+id/divider"
+		app:layout_constraintEnd_toStartOf="@+id/time"
+		app:layout_constraintHorizontal_bias="0.0"
+		app:layout_constraintStart_toStartOf="@+id/name"
+		app:layout_constraintTop_toBottomOf="@+id/name"/>
+
 	<TextView
 		android:id="@+id/time"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_margin="@dimen/margin_large"
+		android:layout_marginBottom="8dp"
+		android:layout_marginTop="8dp"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
-		app:layout_constraintBottom_toBottomOf="@+id/name"
+		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/name"
-		app:layout_constraintTop_toTopOf="@+id/name"
+		app:layout_constraintTop_toTopOf="parent"
 		tools:text="Dec 24"/>
 
 	<View
 		android:id="@+id/divider"
 		style="@style/Divider.ContactList"
 		android:layout_width="0dp"
+		android:layout_marginLeft="8dp"
+		android:layout_marginStart="8dp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"/>
+		app:layout_constraintStart_toEndOf="@+id/avatar"/>
 
-</android.support.constraint.ConstraintLayout>
+</android.support.constraint.ConstraintLayout>

briar-android/src/main/res/values/strings.xml

@@ -167,6 +167,7 @@
 	<string name="add_contact_link_question">Did you send your link already?</string>
 	<string name="yes">Yes</string>
 	<string name="no">No</string>
+	<string name="add_contact_remote_connecting">Connecting…</string>
 
 	<!-- Introductions -->
 	<string name="introduction_onboarding_title">Introduce your contacts</string>