From 953fccba16a9c14cf096f6ba4e96744996a54543 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 24 May 2019 15:57:24 +0100
Subject: [PATCH] Update PendingContactListener to use PendingContactItem.

---
 .../contact/add/remote/PendingContactListActivity.java   | 9 ++++-----
 .../contact/add/remote/PendingContactListener.java       | 4 +---
 .../contact/add/remote/PendingContactViewHolder.java     | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java
index aea76ace9..eff4cbff2 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java
@@ -9,7 +9,6 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.MenuItem;
 
-import org.briarproject.bramble.api.contact.PendingContact;
 import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -89,15 +88,15 @@ public class PendingContactListActivity extends BriarActivity
 	}
 
 	@Override
-	public void onFailedPendingContactRemoved(PendingContact pendingContact) {
+	public void onPendingContactItemRemoved(PendingContactItem item) {
 		// no need to show warning dialog for failed pending contacts
-		if (pendingContact.getState() == FAILED) {
-			removePendingContact(pendingContact.getId());
+		if (item.getState() == FAILED) {
+			removePendingContact(item.getPendingContact().getId());
 			return;
 		}
 		// show warning dialog
 		OnClickListener removeListener = (dialog, which) ->
-				removePendingContact(pendingContact.getId());
+				removePendingContact(item.getPendingContact().getId());
 		AlertDialog.Builder builder = new AlertDialog.Builder(
 				PendingContactListActivity.this, R.style.BriarDialogTheme);
 		builder.setTitle(
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListener.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListener.java
index b9090224a..a7c8e99a1 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListener.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListener.java
@@ -1,9 +1,7 @@
 package org.briarproject.briar.android.contact.add.remote;
 
-import org.briarproject.bramble.api.contact.PendingContact;
-
 interface PendingContactListener {
 
-	void onFailedPendingContactRemoved(PendingContact pendingContact);
+	void onPendingContactItemRemoved(PendingContactItem item);
 
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java
index 6104b75a2..3bf020fea 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java
@@ -40,7 +40,7 @@ class PendingContactViewHolder extends ViewHolder {
 		name.setText(p.getAlias());
 		time.setText(formatDate(time.getContext(), p.getTimestamp()));
 		removeButton.setOnClickListener(v -> {
-			listener.onFailedPendingContactRemoved(p);
+			listener.onPendingContactItemRemoved(item);
 			removeButton.setEnabled(false);
 		});