diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogControllerImpl.java index 414420dbd..21d0856c2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogControllerImpl.java @@ -106,7 +106,7 @@ class BlogControllerImpl extends BaseControllerImpl BlogInvitationResponseReceivedEvent b = (BlogInvitationResponseReceivedEvent) e; InvitationResponse r = b.getResponse(); - if (r.getGroupId().equals(groupId) && r.wasAccepted()) { + if (r.getShareableId().equals(groupId) && r.wasAccepted()) { LOG.info("Blog invitation accepted"); onBlogInvitationAccepted(b.getContactId()); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java index 8c78445c0..44087e109 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/CreateForumActivity.java @@ -2,6 +2,7 @@ package org.briarproject.briar.android.forum; import android.content.Intent; import android.os.Bundle; +import android.support.design.widget.TextInputLayout; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -43,10 +44,10 @@ public class CreateForumActivity extends BriarActivity { private static final Logger LOG = Logger.getLogger(CreateForumActivity.class.getName()); + private TextInputLayout nameEntryLayout; private EditText nameEntry; private Button createForumButton; private ProgressBar progress; - private TextView feedback; // Fields that are accessed from background threads must be volatile @Inject @@ -58,6 +59,8 @@ public class CreateForumActivity extends BriarActivity { setContentView(R.layout.activity_create_forum); + nameEntryLayout = + (TextInputLayout) findViewById(R.id.createForumNameLayout); nameEntry = (EditText) findViewById(R.id.createForumNameEntry); nameEntry.addTextChangedListener(new TextWatcher() { @@ -85,8 +88,6 @@ public class CreateForumActivity extends BriarActivity { } }); - feedback = (TextView) findViewById(R.id.createForumFeedback); - createForumButton = (Button) findViewById(R.id.createForumButton); createForumButton.setOnClickListener(new OnClickListener() { @Override @@ -118,10 +119,10 @@ public class CreateForumActivity extends BriarActivity { String name = nameEntry.getText().toString(); int length = StringUtils.toUtf8(name).length; if (length > MAX_FORUM_NAME_LENGTH) { - feedback.setText(R.string.name_too_long); + nameEntryLayout.setError(getString(R.string.name_too_long)); return false; } - feedback.setText(""); + nameEntryLayout.setError(null); return length > 0; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java index 8d97e7810..f218f4393 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java @@ -85,7 +85,7 @@ class ForumControllerImpl extends (ForumInvitationResponseReceivedEvent) e; ForumInvitationResponse r = (ForumInvitationResponse) f.getResponse(); - if (r.getGroupId().equals(getGroupId()) && r.wasAccepted()) { + if (r.getShareableId().equals(getGroupId()) && r.wasAccepted()) { LOG.info("Forum invitation was accepted"); onForumInvitationAccepted(r.getContactId()); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java index db6029e57..ebd41767c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java @@ -108,7 +108,7 @@ class GroupControllerImpl extends (GroupInvitationResponseReceivedEvent) e; final GroupInvitationResponse r = (GroupInvitationResponse) g.getResponse(); - if (getGroupId().equals(r.getGroupId()) && r.wasAccepted()) { + if (getGroupId().equals(r.getShareableId()) && r.wasAccepted()) { listener.runOnUiThreadUnlessDestroyed(new Runnable() { @Override public void run() { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java index aea42e265..f89db336b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java @@ -2,6 +2,7 @@ package org.briarproject.briar.android.privategroup.creation; import android.content.Context; import android.os.Bundle; +import android.support.design.widget.TextInputLayout; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -11,6 +12,7 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; +import android.widget.ProgressBar; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; @@ -19,6 +21,8 @@ import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; +import static android.view.View.GONE; +import static android.view.View.VISIBLE; import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_NAME_LENGTH; public class CreateGroupFragment extends BaseFragment { @@ -28,7 +32,8 @@ public class CreateGroupFragment extends BaseFragment { private CreateGroupListener listener; private EditText nameEntry; private Button createGroupButton; - private TextView feedback; + private TextInputLayout nameLayout; + private ProgressBar progress; @Override public void onAttach(Context context) { @@ -69,7 +74,7 @@ public class CreateGroupFragment extends BaseFragment { } }); - feedback = (TextView) v.findViewById(R.id.feedback); + nameLayout = (TextInputLayout) v.findViewById(R.id.nameLayout); createGroupButton = (Button) v.findViewById(R.id.button); createGroupButton.setOnClickListener(new OnClickListener() { @@ -79,6 +84,8 @@ public class CreateGroupFragment extends BaseFragment { } }); + progress = (ProgressBar) v.findViewById(R.id.progressBar); + return v; } @@ -107,16 +114,18 @@ public class CreateGroupFragment extends BaseFragment { String name = nameEntry.getText().toString(); int length = StringUtils.toUtf8(name).length; if (length > MAX_GROUP_NAME_LENGTH) { - feedback.setText(R.string.name_too_long); + nameLayout.setError(getString(R.string.name_too_long)); return false; } - feedback.setText(""); + nameLayout.setError(null); return length > 0; } private void createGroup() { if (!validateName()) return; listener.hideSoftKeyboard(nameEntry); + createGroupButton.setVisibility(GONE); + progress.setVisibility(VISIBLE); listener.onGroupNameChosen(nameEntry.getText().toString()); } } diff --git a/briar-android/src/main/res/layout/activity_create_forum.xml b/briar-android/src/main/res/layout/activity_create_forum.xml index da0a85875..6b2317689 100644 --- a/briar-android/src/main/res/layout/activity_create_forum.xml +++ b/briar-android/src/main/res/layout/activity_create_forum.xml @@ -1,37 +1,42 @@ + android:padding="@dimen/margin_large"> - + app:errorEnabled="true"> - + + +