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

Merge branch '1537-contact-manager-pending-contacts' into 'master'

Browse Source 
Implement contact manager methods for pending contacts

Closes #1537

See merge request briar/briar!1081
This commit is contained in:
Torsten Grote
2019-05-10 15:06:08 +00:00
parent 33fdca4aa1 71d8fb2083
commit 5880479987
18 changed files with 476 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.api.contact.ContactManager.LINK_REGEX;
import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.LINK_REGEX;
import static org.briarproject.bramble.util.LogUtils.logException;
@NotNullByDefault
@@ -105,7 +105,7 @@ public class AddContactViewModel extends AndroidViewModel {
});
}
public LiveData<Boolean> getAddContactResult() {
LiveData<Boolean> getAddContactResult() {
return addContactResult;
}

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

@@ -29,7 +29,7 @@ import javax.inject.Inject;
import static android.content.Context.CLIPBOARD_SERVICE;
import static android.widget.Toast.LENGTH_SHORT;
import static java.util.Objects.requireNonNull;
import static org.briarproject.bramble.api.contact.ContactManager.LINK_REGEX;
import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.LINK_REGEX;
import static org.briarproject.briar.android.util.UiUtils.observeOnce;
@MethodsNotNullByDefault

2
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java
View File

@@ -15,6 +15,7 @@ import android.widget.Toast;
import com.google.zxing.Result;
import org.briarproject.bramble.api.UnsupportedVersionException;
import org.briarproject.bramble.api.event.Event;
import org.briarproject.bramble.api.event.EventBus;
import org.briarproject.bramble.api.keyagreement.KeyAgreementResult;
@@ -22,7 +23,6 @@ import org.briarproject.bramble.api.keyagreement.KeyAgreementTask;
import org.briarproject.bramble.api.keyagreement.Payload;
import org.briarproject.bramble.api.keyagreement.PayloadEncoder;
import org.briarproject.bramble.api.keyagreement.PayloadParser;
import org.briarproject.bramble.api.keyagreement.UnsupportedVersionException;
import org.briarproject.bramble.api.keyagreement.event.KeyAgreementAbortedEvent;
import org.briarproject.bramble.api.keyagreement.event.KeyAgreementFailedEvent;
import org.briarproject.bramble.api.keyagreement.event.KeyAgreementFinishedEvent;