Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Update PendingContactListener to use PendingContactItem.

Browse Source
This commit is contained in:
akwizgran
2019-05-24 15:57:24 +01:00
parent eca82e2888
commit 953fccba16
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java
View File

@@ -9,7 +9,6 @@ import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.view.MenuItem; import android.view.MenuItem;
import org.briarproject.bramble.api.contact.PendingContact;
import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.contact.PendingContactId;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -89,15 +88,15 @@ public class PendingContactListActivity extends BriarActivity
} }
@Override @Override
public void onFailedPendingContactRemoved(PendingContact pendingContact) { public void onPendingContactItemRemoved(PendingContactItem item) {
// no need to show warning dialog for failed pending contacts // no need to show warning dialog for failed pending contacts
if (pendingContact.getState() == FAILED) { if (item.getState() == FAILED) {
removePendingContact(pendingContact.getId()); removePendingContact(item.getPendingContact().getId());
return; return;
} }
// show warning dialog // show warning dialog
OnClickListener removeListener = (dialog, which) -> OnClickListener removeListener = (dialog, which) ->
removePendingContact(pendingContact.getId()); removePendingContact(item.getPendingContact().getId());
AlertDialog.Builder builder = new AlertDialog.Builder( AlertDialog.Builder builder = new AlertDialog.Builder(
PendingContactListActivity.this, R.style.BriarDialogTheme); PendingContactListActivity.this, R.style.BriarDialogTheme);
builder.setTitle( builder.setTitle(

4
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListener.java
View File

@@ -1,9 +1,7 @@
package org.briarproject.briar.android.contact.add.remote; package org.briarproject.briar.android.contact.add.remote;
import org.briarproject.bramble.api.contact.PendingContact;
interface PendingContactListener { interface PendingContactListener {
void onFailedPendingContactRemoved(PendingContact pendingContact); void onPendingContactItemRemoved(PendingContactItem item);
} }

2
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java
View File

@@ -40,7 +40,7 @@ class PendingContactViewHolder extends ViewHolder {
name.setText(p.getAlias()); name.setText(p.getAlias());
time.setText(formatDate(time.getContext(), p.getTimestamp())); time.setText(formatDate(time.getContext(), p.getTimestamp()));
removeButton.setOnClickListener(v -> { removeButton.setOnClickListener(v -> {
listener.onFailedPendingContactRemoved(p); listener.onPendingContactItemRemoved(item);
removeButton.setEnabled(false); removeButton.setEnabled(false);
}); });