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

Updated forum toasts and renamed delete icon.

Browse Source
This commit is contained in:
akwizgran
2016-05-03 16:10:11 +01:00
parent da60e567e0
commit 5fab9c383d
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/org/briarproject/android/forum/AvailableForumsActivity.java
View File

@@ -83,8 +83,7 @@ implements EventListener, OnItemClickListener {
runOnDbThread(new Runnable() {
public void run() {
try {
Collection<ForumContacts> available =
new ArrayList<ForumContacts>();
Collection<ForumContacts> available = new ArrayList<>();
long now = System.currentTimeMillis();
for (Forum f : forumSharingManager.getAvailableForums()) {
try {
@@ -160,11 +159,11 @@ implements EventListener, OnItemClickListener {
public void onItemClick(AdapterView<?> parent, View view, int position,
long id) {
AvailableForumsItem item = adapter.getItem(position);
Collection<ContactId> shared = new ArrayList<ContactId>();
Collection<ContactId> shared = new ArrayList<>();
for (Contact c : item.getContacts()) shared.add(c.getId());
subscribe(item.getForum(), shared);
String subscribed = getString(R.string.subscribed_toast);
Toast.makeText(this, subscribed, LENGTH_SHORT).show();
String joined = getString(R.string.forum_joined_toast);
Toast.makeText(this, joined, LENGTH_SHORT).show();
}
private void subscribe(final Forum f, final Collection<ContactId> shared) {

6
briar-android/src/org/briarproject/android/forum/ForumActivity.java
View File

@@ -403,9 +403,9 @@ public class ForumActivity extends BriarActivity implements EventListener,
AlertDialog.Builder builder =
new AlertDialog.Builder(ForumActivity.this,
R.style.BriarDialogTheme);
builder.setTitle(getString(R.string.dialog_title_remove_forum));
builder.setMessage(getString(R.string.dialog_message_remove_forum));
builder.setPositiveButton(R.string.dialog_button_remove, okListener);
builder.setTitle(getString(R.string.dialog_title_leave_forum));
builder.setMessage(getString(R.string.dialog_message_leave_forum));
builder.setPositiveButton(R.string.dialog_button_leave, okListener);
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
}