Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
681
Issues
681
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
fbe375cc
Verified
Commit
fbe375cc
authored
May 09, 2019
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use event instead of CommitAction to handle removed PendingContacts
parent
19bc73ac
Pipeline
#3273
passed with stage
in 10 minutes and 29 seconds
Changes
7
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
45 additions
and
16 deletions
+45
-16
bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
.../org/briarproject/bramble/api/contact/ContactManager.java
+1
-3
bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java
...bramble/api/contact/event/PendingContactRemovedEvent.java
+26
-0
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java
.../org/briarproject/bramble/contact/ContactManagerImpl.java
+4
-3
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
...iarproject/briar/android/contact/ContactListFragment.java
+3
-1
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java
...ndroid/contact/add/remote/PendingContactListActivity.java
+1
-2
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java
...droid/contact/add/remote/PendingContactListViewModel.java
+5
-5
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java
.../android/contact/add/remote/PendingContactViewHolder.java
+5
-2
No files found.
bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
View file @
fbe375cc
...
...
@@ -80,10 +80,8 @@ public interface ContactManager {
/**
* Removes a {@link PendingContact} that is in state
* {@link PendingContactState FAILED}.
* @param commitAction an action to run on the main thread after removing.
*/
void
removePendingContact
(
PendingContactId
pendingContact
,
Runnable
commitAction
)
throws
DbException
;
void
removePendingContact
(
PendingContactId
pendingContact
)
throws
DbException
;
/**
* Returns the contact with the given ID.
...
...
bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java
0 → 100644
View file @
fbe375cc
package
org.briarproject.bramble.api.contact.event
;
import
org.briarproject.bramble.api.contact.PendingContactId
;
import
org.briarproject.bramble.api.event.Event
;
import
org.briarproject.bramble.api.nullsafety.NotNullByDefault
;
import
javax.annotation.concurrent.Immutable
;
/**
* An event that is broadcast when a pending contact is removed.
*/
@Immutable
@NotNullByDefault
public
class
PendingContactRemovedEvent
extends
Event
{
private
final
PendingContactId
id
;
public
PendingContactRemovedEvent
(
PendingContactId
id
)
{
this
.
id
=
id
;
}
public
PendingContactId
getId
()
{
return
id
;
}
}
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java
View file @
fbe375cc
...
...
@@ -6,6 +6,7 @@ import org.briarproject.bramble.api.contact.ContactManager;
import
org.briarproject.bramble.api.contact.PendingContact
;
import
org.briarproject.bramble.api.contact.PendingContactId
;
import
org.briarproject.bramble.api.contact.event.ContactAddedRemotelyEvent
;
import
org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent
;
import
org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent
;
import
org.briarproject.bramble.api.crypto.SecretKey
;
import
org.briarproject.bramble.api.db.DatabaseComponent
;
...
...
@@ -218,8 +219,7 @@ class ContactManagerImpl implements ContactManager {
}
@Override
public
void
removePendingContact
(
PendingContactId
id
,
Runnable
commitAction
)
throws
DbException
{
public
void
removePendingContact
(
PendingContactId
id
)
throws
DbException
{
// TODO replace with real implementation
for
(
PendingContact
pc
:
pendingContacts
)
{
if
(
pc
.
getId
().
equals
(
id
))
{
...
...
@@ -231,7 +231,8 @@ class ContactManagerImpl implements ContactManager {
Thread
.
sleep
(
250
);
}
catch
(
InterruptedException
ignored
)
{
}
db
.
transaction
(
true
,
txn
->
txn
.
attach
(
commitAction
));
db
.
transaction
(
true
,
txn
->
txn
.
attach
(
new
PendingContactRemovedEvent
(
id
)));
}
@Override
...
...
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
View file @
fbe375cc
...
...
@@ -20,6 +20,7 @@ import org.briarproject.bramble.api.contact.ContactManager;
import
org.briarproject.bramble.api.contact.event.ContactAddedEvent
;
import
org.briarproject.bramble.api.contact.event.ContactAddedRemotelyEvent
;
import
org.briarproject.bramble.api.contact.event.ContactRemovedEvent
;
import
org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent
;
import
org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent
;
import
org.briarproject.bramble.api.db.DbException
;
import
org.briarproject.bramble.api.db.NoSuchContactException
;
...
...
@@ -299,7 +300,8 @@ public class ContactListFragment extends BaseFragment implements EventListener,
if
(
pe
.
getPendingContactState
()
==
WAITING_FOR_CONNECTION
)
{
checkForPendingContacts
();
}
}
else
if
(
e
instanceof
ContactAddedRemotelyEvent
)
{
}
else
if
(
e
instanceof
PendingContactRemovedEvent
||
e
instanceof
ContactAddedRemotelyEvent
)
{
checkForPendingContacts
();
}
}
...
...
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java
View file @
fbe375cc
...
...
@@ -86,8 +86,7 @@ public class PendingContactListActivity extends BriarActivity
@Override
public
void
onFailedPendingContactRemoved
(
PendingContact
pendingContact
)
{
viewModel
.
removePendingContact
(
pendingContact
.
getId
(),
()
->
adapter
.
remove
(
pendingContact
));
viewModel
.
removePendingContact
(
pendingContact
.
getId
());
}
private
void
onPendingContactsChanged
(
Collection
<
PendingContact
>
contacts
)
{
...
...
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java
View file @
fbe375cc
...
...
@@ -9,6 +9,7 @@ import org.briarproject.bramble.api.contact.ContactManager;
import
org.briarproject.bramble.api.contact.PendingContact
;
import
org.briarproject.bramble.api.contact.PendingContactId
;
import
org.briarproject.bramble.api.contact.event.ContactAddedRemotelyEvent
;
import
org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent
;
import
org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent
;
import
org.briarproject.bramble.api.db.DatabaseExecutor
;
import
org.briarproject.bramble.api.db.DbException
;
...
...
@@ -63,7 +64,8 @@ public class PendingContactListViewModel extends AndroidViewModel
@Override
public
void
eventOccurred
(
Event
e
)
{
if
(
e
instanceof
ContactAddedRemotelyEvent
||
e
instanceof
PendingContactStateChangedEvent
)
{
e
instanceof
PendingContactStateChangedEvent
||
e
instanceof
PendingContactRemovedEvent
)
{
loadPendingContacts
();
}
}
...
...
@@ -82,16 +84,14 @@ public class PendingContactListViewModel extends AndroidViewModel
return
pendingContacts
;
}
void
removePendingContact
(
PendingContactId
id
,
Runnable
commitAction
)
{
void
removePendingContact
(
PendingContactId
id
)
{
dbExecutor
.
execute
(()
->
{
try
{
contactManager
.
removePendingContact
(
id
,
commitAction
);
contactManager
.
removePendingContact
(
id
);
}
catch
(
DbException
e
)
{
logException
(
LOG
,
WARNING
,
e
);
}
});
loadPendingContacts
();
}
}
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java
View file @
fbe375cc
...
...
@@ -40,8 +40,10 @@ class PendingContactViewHolder extends ViewHolder {
avatar
.
setBackgroundBytes
(
item
.
getId
().
getBytes
());
name
.
setText
(
item
.
getAlias
());
time
.
setText
(
formatDate
(
time
.
getContext
(),
item
.
getTimestamp
()));
removeButton
.
setOnClickListener
(
v
->
listener
.
onFailedPendingContactRemoved
(
item
));
removeButton
.
setOnClickListener
(
v
->
{
listener
.
onFailedPendingContactRemoved
(
item
);
removeButton
.
setEnabled
(
false
);
});
int
color
=
ContextCompat
.
getColor
(
status
.
getContext
(),
R
.
color
.
briar_green
);
...
...
@@ -69,6 +71,7 @@ class PendingContactViewHolder extends ViewHolder {
}
status
.
setTextColor
(
color
);
removeButton
.
setVisibility
(
buttonVisibility
);
removeButton
.
setEnabled
(
true
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment