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

Remove forum invitations from list instead of reloading

Browse Source 
Closes #543
This commit is contained in:
Torsten Grote
2016-07-28 15:18:56 -03:00
parent 04d2ede2e1
commit cf6aa01905
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/org/briarproject/android/forum/ForumInvitationAdapter.java
View File

@@ -12,6 +12,7 @@ import android.widget.TextView;
import org.briarproject.R; import org.briarproject.R;
import org.briarproject.android.util.TextAvatarView; import org.briarproject.android.util.TextAvatarView;
import org.briarproject.api.contact.Contact; import org.briarproject.api.contact.Contact;
import org.briarproject.api.forum.ForumSharingMessage;
import org.briarproject.util.StringUtils; import org.briarproject.util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
@@ -94,6 +95,10 @@ class ForumInvitationAdapter extends
forums.addAll(list); forums.addAll(list);
} }
public void remove(ForumInvitationItem item) {
forums.remove(item);
}
public void clear() { public void clear() {
forums.clear(); forums.clear();
} }
@@ -154,7 +159,7 @@ class ForumInvitationAdapter extends
@Override @Override
public boolean areContentsTheSame(ForumInvitationItem oldItem, public boolean areContentsTheSame(ForumInvitationItem oldItem,
ForumInvitationItem newItem) { ForumInvitationItem newItem) {
return oldItem.getForum().equals(newItem.getForum()) && return oldItem.isSubscribed() == newItem.isSubscribed() &&
oldItem.getContacts().equals(newItem.getContacts()); oldItem.getContacts().equals(newItem.getContacts());
} }

8
briar-android/src/org/briarproject/android/forum/ForumInvitationsActivity.java
View File

@@ -114,7 +114,6 @@ public class ForumInvitationsActivity extends BriarActivity
LOG.info("No forums available, finishing"); LOG.info("No forums available, finishing");
finish(); finish();
} else { } else {
adapter.clear();
adapter.addAll(forums); adapter.addAll(forums);
} }
} }
@@ -158,6 +157,12 @@ public class ForumInvitationsActivity extends BriarActivity
int res = R.string.forum_declined_toast; int res = R.string.forum_declined_toast;
if (accept) res = R.string.forum_joined_toast; if (accept) res = R.string.forum_joined_toast;
Toast.makeText(this, res, LENGTH_SHORT).show(); Toast.makeText(this, res, LENGTH_SHORT).show();
// remove item and finish if it was the last
adapter.remove(item);
if (adapter.getItemCount() == 0) {
supportFinishAfterTransition();
}
} }
private void respondToInvitation(final ForumInvitationItem item, private void respondToInvitation(final ForumInvitationItem item,
@@ -174,7 +179,6 @@ public class ForumInvitationsActivity extends BriarActivity
if (LOG.isLoggable(WARNING)) if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e); LOG.log(WARNING, e.toString(), e);
} }
loadForums();
} }
}); });
} }