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

Merge branch '535-formatexception-when-loading-contact-list-after-receiving-invitation' into 'master'

Browse Source 
Use Client Layer Events in ContactListFragment

This prevents trying to access the same group metadata in different groups.
Also, the conversation does not need to be reloaded once introduction messages arrive.

Closes #535

See merge request !254
This commit is contained in:
akwizgran
2016-08-01 10:21:31 +00:00
parent 0ffbc28792 3d22d43868
commit 32578e2cab
5 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-api/src/org/briarproject/api/event/ForumInvitationReceivedEvent.java
View File

@@ -2,7 +2,6 @@ package org.briarproject.api.event;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.forum.Forum;
import org.briarproject.api.introduction.IntroductionRequest;
public class ForumInvitationReceivedEvent extends InvitationReceivedEvent {

3
briar-api/src/org/briarproject/api/event/InvitationReceivedEvent.java
View File

@@ -1,13 +1,12 @@
package org.briarproject.api.event;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.forum.Forum;
public abstract class InvitationReceivedEvent extends Event {
private final ContactId contactId;
public InvitationReceivedEvent(ContactId contactId) {
InvitationReceivedEvent(ContactId contactId) {
this.contactId = contactId;
}

2
briar-api/src/org/briarproject/api/sharing/SharingMessage.java
View File

@@ -22,7 +22,7 @@ public interface SharingMessage {
private final GroupId groupId;
private final SessionId sessionId;
public BaseMessage(GroupId groupId, SessionId sessionId) {
BaseMessage(GroupId groupId, SessionId sessionId) {
this.groupId = groupId;
this.sessionId = sessionId;